From 48d4916168844ffcbec7d3bcefac596ab9962617 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Sun, 23 Mar 2025 22:40:25 +0100 Subject: [PATCH] Readded tileset texture --- Scenes/Cutscenes/Intro.tscn | 4 +-- Scenes/Maps/Intro_Briefing.tscn | 36 +++++++++++++++++++++++++- Scenes/Maps/Level1_End_Cutscene.tscn | 38 ++++++++++++++++++++++++++-- 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/Scenes/Cutscenes/Intro.tscn b/Scenes/Cutscenes/Intro.tscn index 5eefb9e4..2bbdb3ff 100644 --- a/Scenes/Cutscenes/Intro.tscn +++ b/Scenes/Cutscenes/Intro.tscn @@ -321,11 +321,11 @@ 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"] +[sub_resource type="Gradient" id="Gradient_dgmlk"] colors = PackedColorArray(1, 0.984314, 1, 1, 1, 1, 1, 1) [sub_resource type="GradientTexture2D" id="GradientTexture2D_bnr5y"] -gradient = SubResource("Gradient_mp1dh") +gradient = SubResource("Gradient_dgmlk") [sub_resource type="Animation" id="Animation_8r24y"] length = 40.0 diff --git a/Scenes/Maps/Intro_Briefing.tscn b/Scenes/Maps/Intro_Briefing.tscn index 8c5a066b..1a50d57f 100644 --- a/Scenes/Maps/Intro_Briefing.tscn +++ b/Scenes/Maps/Intro_Briefing.tscn @@ -1,7 +1,27 @@ -[gd_scene load_steps=3 format=3 uid="uid://dcn2o6hllas78"] +[gd_scene load_steps=7 format=3 uid="uid://dcn2o6hllas78"] [ext_resource type="Script" uid="uid://bf0tnhnwttrim" path="res://Scripts/Misc/DialogueAutoStarter.cs" id="1_qu5kv"] [ext_resource type="PackedScene" uid="uid://cpgrmlc0c1ssj" path="res://3D/BriefingRoom3D.tscn" id="2_qxk7q"] +[ext_resource type="Shader" uid="uid://iw1ujgfir2li" path="res://Shaders/CRT.gdshader" id="3_2oo0e"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_pa17m"] +shader = ExtResource("3_2oo0e") +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_mvptm"] +gradient = SubResource("Gradient_mp1dh") [node name="IntroBriefing" type="Node2D"] script = ExtResource("1_qu5kv") @@ -19,3 +39,17 @@ render_target_update_mode = 4 [node name="BriefingRoom3d" parent="SubViewportContainer/SubViewport" instance=ExtResource("2_qxk7q")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00209835, -0.0137185, 0.00361562) + +[node name="CRT" type="TextureRect" parent="."] +top_level = true +material = SubResource("ShaderMaterial_pa17m") +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = -7.0 +offset_top = -4.0 +offset_right = 339.0 +offset_bottom = 167.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = SubResource("GradientTexture2D_mvptm") diff --git a/Scenes/Maps/Level1_End_Cutscene.tscn b/Scenes/Maps/Level1_End_Cutscene.tscn index 44d647b6..5051bee2 100644 --- a/Scenes/Maps/Level1_End_Cutscene.tscn +++ b/Scenes/Maps/Level1_End_Cutscene.tscn @@ -1,9 +1,31 @@ -[gd_scene load_steps=3 format=3 uid="uid://dwwf0fjtbrn5g"] +[gd_scene load_steps=7 format=3 uid="uid://dwwf0fjtbrn5g"] [ext_resource type="Script" uid="uid://bf0tnhnwttrim" path="res://Scripts/Misc/DialogueAutoStarter.cs" id="1_d3qhx"] [ext_resource type="PackedScene" uid="uid://chcfi75y8wmhy" path="res://3D/ICCOffice3D.tscn" id="2_d3qhx"] +[ext_resource type="Shader" uid="uid://iw1ujgfir2li" path="res://Shaders/CRT.gdshader" id="3_usrds"] -[node name="Level1EndCutscene" type="Node2D"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_3eou1"] +shader = ExtResource("3_usrds") +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_usrds"] +colors = PackedColorArray(1, 0.984314, 1, 1, 1, 1, 1, 1) + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_goifu"] +gradient = SubResource("Gradient_usrds") + +[node name="CanvasLayer" type="CanvasLayer"] + +[node name="Level1EndCutscene" type="Node2D" parent="."] script = ExtResource("1_d3qhx") _trackName = &"Level1_End_Intermission" _finishedScenePath = &"uid://bx31ou6tw3kd1" @@ -11,6 +33,8 @@ _finishedScenePath = &"uid://bx31ou6tw3kd1" [node name="SubViewportContainer" type="SubViewportContainer" parent="."] offset_right = 320.0 offset_bottom = 160.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 [node name="SubViewport" type="SubViewport" parent="SubViewportContainer"] handle_input_locally = false @@ -18,3 +42,13 @@ size = Vector2i(320, 160) render_target_update_mode = 4 [node name="BriefingRoom3d" parent="SubViewportContainer/SubViewport" instance=ExtResource("2_d3qhx")] + +[node name="CRT" type="TextureRect" parent="."] +top_level = true +material = SubResource("ShaderMaterial_3eou1") +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = SubResource("GradientTexture2D_goifu")