From 1219dbfe58043616aa6b3cfa4783200b6d02813b Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Thu, 30 Jan 2020 13:38:06 +1100 Subject: Converted project files for Godot 3.2 compatibility --- ...TFrame.png-96837578d803d46c371247267c1fa407.md5 | 3 +++ ...Frame.png-96837578d803d46c371247267c1fa407.stex | Bin 18732 -> 18745 bytes .../icon.png-487276ed1e3a0c39cad0279d744ee560.md5 | 3 +++ .../icon.png-487276ed1e3a0c39cad0279d744ee560.stex | Bin 3533 -> 3546 bytes ...sample.png-e83d904df67be35a3470a03c20e2b3c2.md5 | 3 +++ ...ample.png-e83d904df67be35a3470a03c20e2b3c2.stex | Bin 254985 -> 254998 bytes .../white.png-d8533361663a5f8fe5200e5b5262a62d.md5 | 3 +++ ...white.png-d8533361663a5f8fe5200e5b5262a62d.stex | Bin 185 -> 198 bytes godot3/CRTFrame.png.import | 8 +++++--- godot3/icon.png.import | 8 +++++--- godot3/project.godot | 7 ++++++- godot3/sample.png.import | 8 +++++--- godot3/white.png.import | 8 +++++--- 13 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 godot3/.import/CRTFrame.png-96837578d803d46c371247267c1fa407.md5 create mode 100644 godot3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 create mode 100644 godot3/.import/sample.png-e83d904df67be35a3470a03c20e2b3c2.md5 create mode 100644 godot3/.import/white.png-d8533361663a5f8fe5200e5b5262a62d.md5 diff --git a/godot3/.import/CRTFrame.png-96837578d803d46c371247267c1fa407.md5 b/godot3/.import/CRTFrame.png-96837578d803d46c371247267c1fa407.md5 new file mode 100644 index 0000000..fd23a82 --- /dev/null +++ b/godot3/.import/CRTFrame.png-96837578d803d46c371247267c1fa407.md5 @@ -0,0 +1,3 @@ +source_md5="df84d0e7c378fc804ee71ab344da073a" +dest_md5="ff93b8ffac84374a8b5a1f9fdddc4633" + diff --git a/godot3/.import/CRTFrame.png-96837578d803d46c371247267c1fa407.stex b/godot3/.import/CRTFrame.png-96837578d803d46c371247267c1fa407.stex index 821c0b6..c5c7555 100644 Binary files a/godot3/.import/CRTFrame.png-96837578d803d46c371247267c1fa407.stex and b/godot3/.import/CRTFrame.png-96837578d803d46c371247267c1fa407.stex differ diff --git a/godot3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 b/godot3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 new file mode 100644 index 0000000..1f3b6a6 --- /dev/null +++ b/godot3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 @@ -0,0 +1,3 @@ +source_md5="ae7e641067601e2184afcade49abd283" +dest_md5="666d00497ab80edb9a199bfa253dc2f5" + diff --git a/godot3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex b/godot3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex index 1f08a3c..35d087e 100644 Binary files a/godot3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex and b/godot3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex differ diff --git a/godot3/.import/sample.png-e83d904df67be35a3470a03c20e2b3c2.md5 b/godot3/.import/sample.png-e83d904df67be35a3470a03c20e2b3c2.md5 new file mode 100644 index 0000000..e44a2dc --- /dev/null +++ b/godot3/.import/sample.png-e83d904df67be35a3470a03c20e2b3c2.md5 @@ -0,0 +1,3 @@ +source_md5="03ef0b3e4f811b7b8aeb5aa43211853b" +dest_md5="a97ab23e304573a67635b93f016d376c" + diff --git a/godot3/.import/sample.png-e83d904df67be35a3470a03c20e2b3c2.stex b/godot3/.import/sample.png-e83d904df67be35a3470a03c20e2b3c2.stex index 47ee8a5..bb2cbef 100644 Binary files a/godot3/.import/sample.png-e83d904df67be35a3470a03c20e2b3c2.stex and b/godot3/.import/sample.png-e83d904df67be35a3470a03c20e2b3c2.stex differ diff --git a/godot3/.import/white.png-d8533361663a5f8fe5200e5b5262a62d.md5 b/godot3/.import/white.png-d8533361663a5f8fe5200e5b5262a62d.md5 new file mode 100644 index 0000000..8d1ed0a --- /dev/null +++ b/godot3/.import/white.png-d8533361663a5f8fe5200e5b5262a62d.md5 @@ -0,0 +1,3 @@ +source_md5="b68844373120b3795a9b80a7922d0c76" +dest_md5="822a4e0b0b5fd90160b4255670a4f4b5" + diff --git a/godot3/.import/white.png-d8533361663a5f8fe5200e5b5262a62d.stex b/godot3/.import/white.png-d8533361663a5f8fe5200e5b5262a62d.stex index 8efe585..fb1c958 100644 Binary files a/godot3/.import/white.png-d8533361663a5f8fe5200e5b5262a62d.stex and b/godot3/.import/white.png-d8533361663a5f8fe5200e5b5262a62d.stex differ diff --git a/godot3/CRTFrame.png.import b/godot3/CRTFrame.png.import index 23593e8..73baf73 100644 --- a/godot3/CRTFrame.png.import +++ b/godot3/CRTFrame.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/CRTFrame.png-96837578d803d46c371247267c1fa407.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://CRTFrame.png" -source_md5="df84d0e7c378fc804ee71ab344da073a" - dest_files=[ "res://.import/CRTFrame.png-96837578d803d46c371247267c1fa407.stex" ] -dest_md5="1a94df3d4e5bfe9a966b0b9368f408a8" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/godot3/icon.png.import b/godot3/icon.png.import index 7e34d87..96cbf46 100644 --- a/godot3/icon.png.import +++ b/godot3/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="ae7e641067601e2184afcade49abd283" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="84511021bbc8c9d37c7f0f4d181de883" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/godot3/project.godot b/godot3/project.godot index 403539f..78aa4cf 100644 --- a/godot3/project.godot +++ b/godot3/project.godot @@ -6,7 +6,12 @@ ; [section] ; section goes between [] ; param=value ; assign values to parameters -config_version=3 +config_version=4 + +_global_script_classes=[ ] +_global_script_class_icons={ + +} [application] diff --git a/godot3/sample.png.import b/godot3/sample.png.import index f21cd63..30ae8b5 100644 --- a/godot3/sample.png.import +++ b/godot3/sample.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/sample.png-e83d904df67be35a3470a03c20e2b3c2.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://sample.png" -source_md5="03ef0b3e4f811b7b8aeb5aa43211853b" - dest_files=[ "res://.import/sample.png-e83d904df67be35a3470a03c20e2b3c2.stex" ] -dest_md5="99120c8fe78b2b814e2068903e4a4f0e" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/godot3/white.png.import b/godot3/white.png.import index b1e0205..b7b4631 100644 --- a/godot3/white.png.import +++ b/godot3/white.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/white.png-d8533361663a5f8fe5200e5b5262a62d.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://white.png" -source_md5="b68844373120b3795a9b80a7922d0c76" - dest_files=[ "res://.import/white.png-d8533361663a5f8fe5200e5b5262a62d.stex" ] -dest_md5="f17f3e225bc88873851ebd43ba696987" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true -- cgit v1.2.3 From 3a73a96c38b6b23c6c6681f0cc73c388b413b1f6 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Thu, 30 Jan 2020 13:46:39 +1100 Subject: Updated CRT and ScanLine shaders to avoid redefinition of TIME shader variable --- godot3/ShaderTestScreen.tscn | 168 +++++++++---------------------------------- godot3/default_env.tres | 83 --------------------- 2 files changed, 32 insertions(+), 219 deletions(-) diff --git a/godot3/ShaderTestScreen.tscn b/godot3/ShaderTestScreen.tscn index 5440580..f4b1257 100644 --- a/godot3/ShaderTestScreen.tscn +++ b/godot3/ShaderTestScreen.tscn @@ -5,7 +5,6 @@ [ext_resource path="res://CRTFrame.png" type="Texture" id=3] [sub_resource type="Shader" id=1] - code = "shader_type canvas_item; uniform float BarrelPower =1.1; @@ -44,14 +43,10 @@ COLOR = texture(SCREEN_TEXTURE,xy); " [sub_resource type="ShaderMaterial" id=2] - -render_priority = 0 shader = SubResource( 1 ) shader_param/BarrelPower = 1.1 -_sections_unfolded = [ "Resource", "shader_param" ] [sub_resource type="Shader" id=3] - code = "shader_type canvas_item; uniform float color_bleeding = 0.9; @@ -68,15 +63,12 @@ void fragment() }" [sub_resource type="ShaderMaterial" id=4] - -render_priority = 0 shader = SubResource( 3 ) -shader_param/color_bleeding = null -shader_param/bleeding_range = null -shader_param/screen_width = null +shader_param/color_bleeding = 0.9 +shader_param/bleeding_range = 2.0 +shader_param/screen_width = 1024.0 [sub_resource type="Shader" id=5] - code = "shader_type canvas_item; uniform float lines_distance = 4.0; @@ -98,17 +90,14 @@ COLOR = c; }" [sub_resource type="ShaderMaterial" id=6] - -render_priority = 0 shader = SubResource( 5 ) -shader_param/lines_distance = null -shader_param/pixel_size = null -shader_param/size_screen = null -shader_param/scanline_alpha = null -shader_param/lines_velocity = null +shader_param/lines_distance = 4.0 +shader_param/pixel_size = 2.0 +shader_param/size_screen = 600.0 +shader_param/scanline_alpha = 0.9 +shader_param/lines_velocity = 30.0 [sub_resource type="Shader" id=7] - code = "shader_type canvas_item; uniform float screen_width = 1024; @@ -144,8 +133,8 @@ void get_color_bleeding(inout vec4 current_color,inout vec4 color_left){ color_left = color_left*vec4(0.25,0.5,color_bleeding,1); } -void get_color_scanline(vec2 uv,inout vec4 c,float TIME){ - float line_row = floor((uv.y * screen_height/scan_size) + mod(TIME*lines_velocity, lines_distance)); +void get_color_scanline(vec2 uv,inout vec4 c,float time){ + float line_row = floor((uv.y * screen_height/scan_size) + mod(time*lines_velocity, lines_distance)); float n = 1.0 - ceil((mod(line_row,lines_distance)/lines_distance)); @@ -180,161 +169,68 @@ COLOR = c; } " -_sections_unfolded = [ "Resource" ] [sub_resource type="ShaderMaterial" id=8] - -render_priority = 0 shader = SubResource( 7 ) -shader_param/screen_width = null -shader_param/screen_height = null -shader_param/BarrelPower = null -shader_param/color_bleeding = null -shader_param/bleeding_range_x = null -shader_param/bleeding_range_y = null -shader_param/lines_distance = null -shader_param/scan_size = null -shader_param/scanline_alpha = null -shader_param/lines_velocity = null -_sections_unfolded = [ "shader_param" ] - -[node name="Control" type="Control" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +shader_param/screen_width = 1024.0 +shader_param/screen_height = 600.0 +shader_param/BarrelPower = 1.1 +shader_param/color_bleeding = 1.2 +shader_param/bleeding_range_x = 3.0 +shader_param/bleeding_range_y = 3.0 +shader_param/lines_distance = 4.0 +shader_param/scan_size = 2.0 +shader_param/scanline_alpha = 0.9 +shader_param/lines_velocity = 30.0 + +[node name="Control" type="Control"] margin_right = 40.0 margin_bottom = 40.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 -_sections_unfolded = [ "Rect" ] - -[node name="Sprite" type="Sprite" parent="." index="0"] +[node name="Sprite" type="Sprite" parent="."] texture = ExtResource( 1 ) centered = false -_sections_unfolded = [ "Offset" ] -[node name="Shaders" type="Control" parent="." index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="Shaders" type="Control" parent="."] margin_right = 40.0 margin_bottom = 40.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 - -[node name="Curvature" type="TextureRect" parent="Shaders" index="0"] +[node name="Curvature" type="TextureRect" parent="Shaders"] visible = false material = SubResource( 2 ) -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 margin_right = 1024.0 margin_bottom = 600.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 1 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 texture = ExtResource( 2 ) expand = true -stretch_mode = 0 -_sections_unfolded = [ "Material", "Mouse", "Rect" ] - -[node name="ColorBleeding" type="TextureRect" parent="Shaders" index="1"] +[node name="ColorBleeding" type="TextureRect" parent="Shaders"] visible = false material = SubResource( 4 ) -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 margin_right = 1024.0 margin_bottom = 600.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 1 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 texture = ExtResource( 2 ) expand = true -stretch_mode = 0 -_sections_unfolded = [ "Material", "Rect" ] - -[node name="ScanLine" type="TextureRect" parent="Shaders" index="2"] +[node name="ScanLine" type="TextureRect" parent="Shaders"] visible = false material = SubResource( 6 ) -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 margin_right = 1024.0 margin_bottom = 600.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 1 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 texture = ExtResource( 2 ) expand = true -stretch_mode = 0 -_sections_unfolded = [ "Material", "Rect" ] - -[node name="CRT" type="TextureRect" parent="Shaders" index="3"] +[node name="CRT" type="TextureRect" parent="Shaders"] material = SubResource( 8 ) -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 margin_right = 1024.0 margin_bottom = 600.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 1 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 texture = ExtResource( 2 ) expand = true -stretch_mode = 0 -_sections_unfolded = [ "Material", "Rect" ] - -[node name="CRTFrame" type="TextureRect" parent="." index="2"] +__meta__ = { +"_edit_use_anchors_": false +} -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="CRTFrame" type="TextureRect" parent="."] margin_right = 1082.0 margin_bottom = 812.0 rect_scale = Vector2( 0.946396, 0.738916 ) -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 1 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 texture = ExtResource( 3 ) -stretch_mode = 0 -_sections_unfolded = [ "Rect" ] - - diff --git a/godot3/default_env.tres b/godot3/default_env.tres index ad86b72..0f8c712 100644 --- a/godot3/default_env.tres +++ b/godot3/default_env.tres @@ -1,101 +1,18 @@ [gd_resource type="Environment" load_steps=2 format=2] [sub_resource type="ProceduralSky" id=1] - radiance_size = 4 sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) sky_curve = 0.25 -sky_energy = 1.0 ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) ground_curve = 0.01 -ground_energy = 1.0 -sun_color = Color( 1, 1, 1, 1 ) -sun_latitude = 35.0 -sun_longitude = 0.0 -sun_angle_min = 1.0 -sun_angle_max = 100.0 -sun_curve = 0.05 sun_energy = 16.0 -texture_size = 2 [resource] - background_mode = 2 background_sky = SubResource( 1 ) -background_sky_custom_fov = 0.0 -background_color = Color( 0, 0, 0, 1 ) -background_energy = 1.0 -background_canvas_max_layer = 0 -ambient_light_color = Color( 0, 0, 0, 1 ) -ambient_light_energy = 1.0 -ambient_light_sky_contribution = 1.0 -fog_enabled = false -fog_color = Color( 0.5, 0.6, 0.7, 1 ) -fog_sun_color = Color( 1, 0.9, 0.7, 1 ) -fog_sun_amount = 0.0 -fog_depth_enabled = true -fog_depth_begin = 10.0 -fog_depth_curve = 1.0 -fog_transmit_enabled = false -fog_transmit_curve = 1.0 -fog_height_enabled = false fog_height_min = 0.0 fog_height_max = 100.0 -fog_height_curve = 1.0 -tonemap_mode = 0 -tonemap_exposure = 1.0 -tonemap_white = 1.0 -auto_exposure_enabled = false -auto_exposure_scale = 0.4 -auto_exposure_min_luma = 0.05 -auto_exposure_max_luma = 8.0 -auto_exposure_speed = 0.5 -ss_reflections_enabled = false -ss_reflections_max_steps = 64 -ss_reflections_fade_in = 0.15 -ss_reflections_fade_out = 2.0 -ss_reflections_depth_tolerance = 0.2 -ss_reflections_roughness = true -ssao_enabled = false -ssao_radius = 1.0 -ssao_intensity = 1.0 -ssao_radius2 = 0.0 -ssao_intensity2 = 1.0 -ssao_bias = 0.01 -ssao_light_affect = 0.0 -ssao_color = Color( 0, 0, 0, 1 ) ssao_quality = 0 -ssao_blur = 3 -ssao_edge_sharpness = 4.0 -dof_blur_far_enabled = false -dof_blur_far_distance = 10.0 -dof_blur_far_transition = 5.0 -dof_blur_far_amount = 0.1 -dof_blur_far_quality = 1 -dof_blur_near_enabled = false -dof_blur_near_distance = 2.0 -dof_blur_near_transition = 1.0 -dof_blur_near_amount = 0.1 -dof_blur_near_quality = 1 -glow_enabled = false -glow_levels/1 = false -glow_levels/2 = false -glow_levels/3 = true -glow_levels/4 = false -glow_levels/5 = true -glow_levels/6 = false -glow_levels/7 = false -glow_intensity = 0.8 -glow_strength = 1.0 -glow_bloom = 0.0 -glow_blend_mode = 2 -glow_hdr_threshold = 1.0 -glow_hdr_scale = 2.0 -glow_bicubic_upscale = false -adjustment_enabled = false -adjustment_brightness = 1.0 -adjustment_contrast = 1.0 -adjustment_saturation = 1.0 - -- cgit v1.2.3