diff --git a/scenes/rendering.tscn b/scenes/rendering.tscn index 673fd74..1131583 100644 --- a/scenes/rendering.tscn +++ b/scenes/rendering.tscn @@ -13,7 +13,7 @@ curve = SubResource("Curve_km3hj") [sub_resource type="ShaderMaterial" id="ShaderMaterial_nxp0e"] shader = ExtResource("3_1qky5") -shader_parameter/target_tex_size = Vector2(427, 240) +shader_parameter/target_tex_size = Vector2(854, 480) shader_parameter/sample_count = 1 shader_parameter/color_steps = 16.0 shader_parameter/color_curve = SubResource("CurveTexture_5747v") diff --git a/scenes/room.VoxelGI_data.res b/scenes/room.VoxelGI_data.res index 93ea87d..3daddc7 100644 Binary files a/scenes/room.VoxelGI_data.res and b/scenes/room.VoxelGI_data.res differ diff --git a/scenes/room.tscn b/scenes/room.tscn index 1f89170..b89410f 100644 --- a/scenes/room.tscn +++ b/scenes/room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=42 format=3 uid="uid://157h04x0krfu"] +[gd_scene load_steps=46 format=3 uid="uid://157h04x0krfu"] [ext_resource type="PackedScene" uid="uid://bjufextny1icg" path="res://models/UndertakerAssets.glb" id="1_7dqbv"] [ext_resource type="ArrayMesh" uid="uid://iitrxdpdaq0i" path="res://models/ceiling.res" id="1_jn645"] @@ -28,6 +28,8 @@ [ext_resource type="Script" uid="uid://bwmyjdcv3cvc" path="res://scenes/coffin_slide_out.gd" id="24_a5qmg"] [ext_resource type="ArrayMesh" uid="uid://dtaqp7ru2gi8d" path="res://models/button.res" id="25_2ftkj"] [ext_resource type="Script" uid="uid://b22xrvio2577x" path="res://scenes/coffin_slide_fire.gd" id="27_ny2il"] +[ext_resource type="ArrayMesh" uid="uid://vtl7yxfd4hhq" path="res://models/main_screen.res" id="28_gjarb"] +[ext_resource type="Texture2D" uid="uid://dn4nke1qvik3k" path="res://screens/contract-1.png" id="29_5o3hq"] [sub_resource type="BoxShape3D" id="BoxShape3D_vfrn5"] size = Vector3(50, 1, 50) @@ -220,6 +222,15 @@ _data = { &"RESET": SubResource("Animation_2ulci") } +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7r6do"] +albedo_color = Color(0, 0, 0, 1) +emission_enabled = true +emission_texture = ExtResource("29_5o3hq") + +[sub_resource type="QuadMesh" id="QuadMesh_5o3hq"] +material = SubResource("StandardMaterial3D_7r6do") +size = Vector2(1.753, 0.882) + [sub_resource type="Environment" id="Environment_katsu"] tonemap_mode = 3 @@ -445,6 +456,15 @@ transform = Transform3D(1, 0, 0, 0, -1, -8.742278e-08, 0, 8.742278e-08, -1, -0.0 mesh = ExtResource("20_2ulci") skeleton = NodePath("../../..") +[node name="Main_Screen" type="MeshInstance3D" parent="."] +transform = Transform3D(1.5972348, 0, 0, 0, 1.5972348, 0, 0, 0, 1, 0, 2.7943075, 3.1311016) +mesh = ExtResource("28_gjarb") +skeleton = NodePath("") + +[node name="screen" type="MeshInstance3D" parent="Main_Screen"] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0.014483929, -0.015537739) +mesh = SubResource("QuadMesh_5o3hq") + [node name="Misc" type="Node" parent="."] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="Misc"] diff --git a/screens/contract-1.png b/screens/contract-1.png new file mode 100644 index 0000000..2d913d6 Binary files /dev/null and b/screens/contract-1.png differ diff --git a/screens/contract-1.png.import b/screens/contract-1.png.import new file mode 100644 index 0000000..16ee260 --- /dev/null +++ b/screens/contract-1.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dn4nke1qvik3k" +path.s3tc="res://.godot/imported/contract-1.png-d1bbb591a2974348327b3f77c58963dd.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://screens/contract-1.png" +dest_files=["res://.godot/imported/contract-1.png-d1bbb591a2974348327b3f77c58963dd.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0