From e4de05547abd0fb8ec50faabb0a24bcf794fb88e Mon Sep 17 00:00:00 2001 From: Marco Date: Mon, 24 Feb 2025 19:57:10 +0100 Subject: [PATCH] CRT effect for intro --- Scenes/Cutscenes/Intro.tscn | 64 +++++++++++++++++++++++++++++++---- Scenes/test.tscn | 23 +++++++++++-- Sprites/Chest.aseprite | 4 +-- Sprites/Chest.png | 4 +-- Tilesets/factory.aseprite | 4 +-- Tilesets/factory.png | 4 +-- Tilesets/factory_tileset.tres | 4 +++ 7 files changed, 90 insertions(+), 17 deletions(-) diff --git a/Scenes/Cutscenes/Intro.tscn b/Scenes/Cutscenes/Intro.tscn index 76d535bf..9b25eb23 100644 --- a/Scenes/Cutscenes/Intro.tscn +++ b/Scenes/Cutscenes/Intro.tscn @@ -1,18 +1,68 @@ -[gd_scene load_steps=5 format=3 uid="uid://oaxftu6lytvv"] +[gd_scene load_steps=12 format=3 uid="uid://oaxftu6lytvv"] [ext_resource type="Script" uid="uid://d1cxthcj2fc10" path="res://Scripts/UI/IntroScenePlayer.cs" id="1_jtu71"] [ext_resource type="Texture2D" uid="uid://4skj5ik6qpu4" path="res://Sprites/Briefing/Intro1small.png" id="2_6u3to"] [ext_resource type="Texture2D" uid="uid://bpbygf3mi6tlf" path="res://Sprites/Briefing/Intro2small.png" id="3_5hqyp"] [ext_resource type="Texture2D" uid="uid://cupm3ruhaj6d7" path="res://Sprites/Briefing/Intro3small.png" id="4_845v1"] +[ext_resource type="Texture2D" uid="uid://dxe00kftq3xd1" path="res://Sprites/Briefing/RefinerySmall.png" id="6_k5r5b"] +[ext_resource type="Shader" uid="uid://iw1ujgfir2li" path="res://Shaders/CRT.gdshader" id="6_xs4jm"] + +[sub_resource type="Gradient" id="Gradient_k5r5b"] +colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1) + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_xs4jm"] +gradient = SubResource("Gradient_k5r5b") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_mf5e4"] +shader = ExtResource("6_xs4jm") +shader_parameter/screen_width = 1024.0 +shader_parameter/screen_height = 600.0 +shader_parameter/BarrelPower = 1.0 +shader_parameter/color_bleeding = 0.265 +shader_parameter/bleeding_range_x = 2.845 +shader_parameter/bleeding_range_y = 2.64 +shader_parameter/lines_distance = 4.0 +shader_parameter/scan_size = 2.0 +shader_parameter/scanline_alpha = 0.9 +shader_parameter/lines_velocity = 30.0 + +[sub_resource type="Gradient" id="Gradient_mp1dh"] +colors = PackedColorArray(1, 0.984314, 1, 1, 1, 1, 1, 1) + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_bnr5y"] +gradient = SubResource("Gradient_mp1dh") [node name="Intro" type="CanvasLayer" node_paths=PackedStringArray("PanelsHolder")] script = ExtResource("1_jtu71") -PanelsHolder = NodePath("PanelContainer") +PanelsHolder = NodePath("MarginContainer/ImagesContainer") Images = Array[Texture2D]([ExtResource("2_6u3to"), ExtResource("3_5hqyp"), ExtResource("4_845v1")]) NextSceneName = "res://Scripts/MainMenu.cs" -[node name="PanelContainer" type="PanelContainer" parent="."] -offset_left = 92.0 -offset_top = 13.0 -offset_right = 232.0 -offset_bottom = 119.0 +[node name="MarginContainer" type="MarginContainer" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="BlackGround" type="TextureRect" parent="MarginContainer"] +layout_mode = 2 +texture = SubResource("GradientTexture2D_xs4jm") + +[node name="ImagesContainer" type="Control" parent="MarginContainer"] +layout_mode = 2 + +[node name="TextureRect" type="TextureRect" parent="MarginContainer/ImagesContainer"] +layout_mode = 2 +offset_left = 80.0 +offset_top = 8.0 +offset_right = 240.0 +offset_bottom = 152.0 +size_flags_horizontal = 4 +size_flags_vertical = 4 +texture = ExtResource("6_k5r5b") + +[node name="CRT" type="TextureRect" parent="MarginContainer"] +material = SubResource("ShaderMaterial_mf5e4") +layout_mode = 2 +texture = SubResource("GradientTexture2D_bnr5y") diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 488cd1dd..096b6921 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=108 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=109 format=4 uid="uid://bv451a8wgty4u"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_8tmoj"] [ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_8mh54"] @@ -70,6 +70,7 @@ [ext_resource type="PackedScene" uid="uid://bqjcwxene73l2" path="res://Scenes/Actors/ActorEnemyTest.tscn" id="55_chha6"] [ext_resource type="Script" uid="uid://v57xjmhi28kw" path="res://Scripts/Resources/Events/ControlActorEvent.cs" id="64_rphi8"] [ext_resource type="PackedScene" uid="uid://b0gpbkxdfbnjh" path="res://Scenes/Actors/ForceField_Horizontal.tscn" id="66_nxn3h"] +[ext_resource type="PackedScene" uid="uid://cjsnhyl0nqbau" path="res://Scenes/Props/ICCTv.tscn" id="71_ji7au"] [ext_resource type="Resource" uid="uid://bj331rcsq65es" path="res://Resources/Bullets/EmitterTestBullet.tres" id="72_uit7r"] [ext_resource type="PackedScene" uid="uid://bc054js8ep2b" path="res://Scenes/Actors/FairyGuard_New.tscn" id="73_cfpaq"] [ext_resource type="PackedScene" uid="uid://bdvj4cxnyr3w4" path="res://Scenes/Actors/Thermathron.tscn" id="73_ier4h"] @@ -460,7 +461,7 @@ metadata/_edit_lock_ = true [node name="Props" type="TileMapLayer" parent="Factory Tilemaps"] y_sort_enabled = true -tile_map_data = PackedByteArray("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") +tile_map_data = PackedByteArray("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") tile_set = ExtResource("3_kgs2x") metadata/_edit_lock_ = true @@ -1020,6 +1021,24 @@ position = Vector2(-885, -219) [node name="Chest" parent="Factory Tilemaps" instance=ExtResource("25_4b2ed")] position = Vector2(-679, -408) +[node name="Ammo1" parent="Factory Tilemaps" instance=ExtResource("34_17pjh")] +position = Vector2(-936, 68) + +[node name="Ammo2" parent="Factory Tilemaps" instance=ExtResource("34_17pjh")] +position = Vector2(-921, 68) + +[node name="Ammo3" parent="Factory Tilemaps" instance=ExtResource("34_17pjh")] +position = Vector2(-872, 104) + +[node name="Ammo4" parent="Factory Tilemaps" instance=ExtResource("34_17pjh")] +position = Vector2(-872, 115) + +[node name="ICCTv" parent="Factory Tilemaps" instance=ExtResource("71_ji7au")] +position = Vector2(-1136, -445) + +[node name="ICCTv2" parent="Factory Tilemaps" instance=ExtResource("71_ji7au")] +position = Vector2(-1072, -445) + [node name="CameraController" type="Camera2D" parent="."] process_mode = 1 script = ExtResource("6_t8ide") diff --git a/Sprites/Chest.aseprite b/Sprites/Chest.aseprite index 11b303c1..32d846a4 100644 --- a/Sprites/Chest.aseprite +++ b/Sprites/Chest.aseprite @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7172b3ef80e3b9caf55551209b9456b928e7264711f7a80249aa1697f646b1e9 -size 1059 +oid sha256:c950d988f8aa7c52fd55c02318d3ae117eed5e9c42ac93ea347e67926b3c9b78 +size 1066 diff --git a/Sprites/Chest.png b/Sprites/Chest.png index 83fca0a5..86888ba3 100644 --- a/Sprites/Chest.png +++ b/Sprites/Chest.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4777a3ccbac0a748a29762c5339f69a32404bbb00c052a7decf540b8f86fe294 -size 313 +oid sha256:a285b3f4c425b109b8b41aa8c84ddc06d4ec3f686c450b5422a4b8c23a477ee8 +size 331 diff --git a/Tilesets/factory.aseprite b/Tilesets/factory.aseprite index e473e565..6aeb2dc6 100644 --- a/Tilesets/factory.aseprite +++ b/Tilesets/factory.aseprite @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c70fb7c900ab5d28a96a92b8775674e28d81ecf4f9dfba1f4d212dd5876dac42 -size 6609 +oid sha256:e49f193703baa8bdd0ee4272efe1aaf5040f3a7f1d14aad3a0355a347d246dbb +size 7559 diff --git a/Tilesets/factory.png b/Tilesets/factory.png index bd143e52..9d69b829 100644 --- a/Tilesets/factory.png +++ b/Tilesets/factory.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c49fcb4117ba86bab1ac55e9f4a7630dd99424ea9184e4b5e344210d21d2f1d -size 9322 +oid sha256:c5c8b9eeaacf9a8dfa16fa6620eabbaead61b56d4cd65eb3656640957301e387 +size 9979 diff --git a/Tilesets/factory_tileset.tres b/Tilesets/factory_tileset.tres index 7bd6c488..d1621bc3 100644 --- a/Tilesets/factory_tileset.tres +++ b/Tilesets/factory_tileset.tres @@ -935,6 +935,10 @@ texture = ExtResource("1_70kxh") 7:15/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:15/0 = 0 6:15/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) +11:8/0 = 0 +12:8/0 = 0 +12:9/0 = 0 +11:9/0 = 0 [sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_qg3vu"] resource_name = "Props"