Skip to content

Commit

Permalink
Fixed several visual errors that only appeared under Linux (godotengi…
Browse files Browse the repository at this point in the history
…ne#184)

* Fixed the font under Linux appearing crazy thin
* Fixed Material 001 failing to compile under Linux
* Fixed the god ray materials appearing incorrectly in Linux
* Fixed spark FX not displaying as intended on Linux
* Fixed the Red Robots laser displaying incorrectly under Linux
* Fixed the Blast Material from the player weapon displaying as a opaque card under Linux
  • Loading branch information
johnlogostini authored Jan 24, 2024
1 parent 241b450 commit 518df67
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 26 deletions.
Binary file modified enemies/red_robot/laser/LaserCenter.material
100644 → 100755
Binary file not shown.
8 changes: 4 additions & 4 deletions enemies/red_robot/laser/LaserMaterial.tres
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://cfq45e1sfaycm"]

[ext_resource type="Texture2D" uid="uid://cp4djbb113s3h" path="res://enemies/red_robot/laser/LaserBodyNoise.tres" id="1"]
[ext_resource type="Shader" path="res://enemies/red_robot/laser/LaserShader.gdshader" id="2"]
[ext_resource type="Shader" path="res://enemies/red_robot/laser/LaserShader.gdshader" id="1_b3x6l"]
[ext_resource type="Texture2D" uid="uid://cp4djbb113s3h" path="res://enemies/red_robot/laser/LaserBodyNoise.tres" id="2_dvjar"]

[resource]
render_priority = 0
shader = ExtResource("2")
shader = ExtResource("1_b3x6l")
shader_parameter/uv_scale = Vector2(15, 0.5)
shader_parameter/offset_uv_x = 0.0
shader_parameter/cutoff_value = 1.0
shader_parameter/traversal_scale = 0.0
shader_parameter/energy = 1.0
shader_parameter/clip = 8.0
shader_parameter/color1 = Color(1, 0, 0, 1)
shader_parameter/laser_body_noise = ExtResource("1")
shader_parameter/laser_body_noise = ExtResource("2_dvjar")
5 changes: 3 additions & 2 deletions enemies/red_robot/parts/sparks_effect/SparkMaterial.tres
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://b0yi1uf4xb6ex"]

[ext_resource type="Shader" path="res://enemies/red_robot/parts/sparks_effect/SparkShader.gdshader" id="2"]
[ext_resource type="Shader" path="res://enemies/red_robot/parts/sparks_effect/SparkShader.gdshader" id="1_y7bvi"]

[resource]
render_priority = 0
shader = ExtResource("2")
shader = ExtResource("1_y7bvi")
shader_parameter/emission_factor = 3.0
Binary file modified level/textures/structure/Core/Material_001.material
100644 → 100755
Binary file not shown.
19 changes: 9 additions & 10 deletions menu/button_font.tres
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[gd_resource type="FontFile" load_steps=2 format=2]
[gd_resource type="FontFile" load_steps=2 format=3 uid="uid://b8tvpu085c6v4"]

[ext_resource path="res://menu/font/PT_Sans-Web-Bold.ttf" type="FontFile" id=1]
[ext_resource type="FontFile" uid="uid://fevb61otyhrn" path="res://menu/font/PT_Sans-Web-Bold.ttf" id="1"]

[resource]

size = 40
outline_size = 0
outline_color = Color( 1, 1, 1, 1 )
use_mipmaps = false
use_filter = false
font_data = ExtResource( 1 )

fallbacks = Array[Font]([ExtResource("1")])
cache/0/16/0/ascent = 0.0
cache/0/16/0/descent = 0.0
cache/0/16/0/underline_position = 0.0
cache/0/16/0/underline_thickness = 0.0
cache/0/16/0/scale = 1.0
cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0)
7 changes: 6 additions & 1 deletion menu/font/PT_Sans-Web-Bold.ttf.import
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[]
preload=[{
"chars": [],
"glyphs": [],
"name": "New Configuration",
"size": Vector2i(16, 0)
}]
language_support={}
script_support={}
opentype_features={}
4 changes: 2 additions & 2 deletions player/bullet/effect/BlastMaterial.tres
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://bxjcw6j767jtn"]

[ext_resource type="Texture2D" uid="uid://bpm6frbylo5an" path="res://effects_shared/BlastTexture.png" id="1"]
[ext_resource type="Texture2D" uid="uid://bpm6frbylo5an" path="res://effects_shared/BlastTexture.png" id="1_1ujtj"]

[sub_resource type="Shader" id="1"]
code = "shader_type spatial;
Expand Down Expand Up @@ -56,4 +56,4 @@ shader_parameter/uv1_scale = Vector3(1, 1, 1)
shader_parameter/uv1_offset = Vector3(0, 0, 0)
shader_parameter/uv2_scale = Vector3(1, 1, 1)
shader_parameter/uv2_offset = Vector3(0, 0, 0)
shader_parameter/texture_albedo = ExtResource("1")
shader_parameter/texture_albedo = ExtResource("1_1ujtj")
14 changes: 7 additions & 7 deletions player/bullet/effect/light_rays_material.tres
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[gd_resource type="StandardMaterial3D" load_steps=2 format=2]
[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://d1hp4xsnvqyn8"]

[ext_resource path="res://player/bullet/effect/FlarePolar.png" type="Texture2D" id=1]
[ext_resource type="Texture2D" uid="uid://dj46di0ip66q5" path="res://player/bullet/effect/FlarePolar.png" id="1_pqdsu"]

[resource]
flags_transparent = true
flags_unshaded = true
transparency = 1
shading_mode = 0
vertex_color_use_as_albedo = true
params_billboard_mode = 1
params_billboard_keep_scale = true
albedo_texture = ExtResource( 1 )
albedo_texture = ExtResource("1_pqdsu")
billboard_mode = 1
billboard_keep_scale = true

0 comments on commit 518df67

Please sign in to comment.