From e98ba4ef27c9f38e6b3335863bfea8d04471804a Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 9 May 2026 16:45:13 +0100 Subject: [PATCH] Rebuilt hallway meshes and added floor and wall sprites. --- images/elevator_doorl_sprites.png | Bin 0 -> 483 bytes images/elevator_doorl_sprites.png.import | 41 +++++++++++++++++++++++ images/floor_sprites.png | Bin 0 -> 538 bytes images/floor_sprites.png.import | 40 ++++++++++++++++++++++ images/hall_sprites.png | Bin 0 -> 750 bytes images/hall_sprites.png.import | 41 +++++++++++++++++++++++ scenes/elevator_door.tscn | 18 ++++++++++ scenes/hall_block.tscn | 24 ++++++------- scenes/hall_floor.tscn | 18 ++++++++++ scenes/hall_wall.tscn | 18 ++++++++++ scenes/survivor.gd | 4 +-- scenes/world.tscn | 24 ++++++------- 12 files changed, 201 insertions(+), 27 deletions(-) create mode 100644 images/elevator_doorl_sprites.png create mode 100644 images/elevator_doorl_sprites.png.import create mode 100644 images/floor_sprites.png create mode 100644 images/floor_sprites.png.import create mode 100644 images/hall_sprites.png create mode 100644 images/hall_sprites.png.import create mode 100644 scenes/elevator_door.tscn create mode 100644 scenes/hall_floor.tscn create mode 100644 scenes/hall_wall.tscn diff --git a/images/elevator_doorl_sprites.png b/images/elevator_doorl_sprites.png new file mode 100644 index 0000000000000000000000000000000000000000..e40e6c84f214643894c7ea9e987c5ba5569a3065 GIT binary patch literal 483 zcmb`By-EX75QS$+lPp>BrxP1(ENo0?VPTdHaWyVs%^+BbAU=Q=wh;q~jg}F_I@}^4 z2sR4(0us=NP|ydkar|;$K?m-gbI+VP=k}UeJql+-5sA|EB&T1FPqDx~>QA53f}^}1 z%kX9HgU3^|(W=o^#EFo5Zok&lYoc+czM1O zcnjeFRU;E8S$MTv+X}aiKVPzDB0Jb;RX^e)i%}z2n`v2_)0cZeqg`r0bjmkIW|nfd zhT0uJHP7QcA-cM#PF4P{cr|{$<$1lc^tO@C?a=CWI*f6C)KB(+>w&MNH{?u)YiD=( M4{{yPZWfknzvp=UC;$Ke literal 0 HcmV?d00001 diff --git a/images/floor_sprites.png.import b/images/floor_sprites.png.import new file mode 100644 index 0000000..8379e11 --- /dev/null +++ b/images/floor_sprites.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://g76xnsgvhdte" +path="res://.godot/imported/floor_sprites.png-f88c7a3a389c12c2e7d691c01849f910.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/floor_sprites.png" +dest_files=["res://.godot/imported/floor_sprites.png-f88c7a3a389c12c2e7d691c01849f910.ctex"] + +[params] + +compress/mode=0 +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 diff --git a/images/hall_sprites.png b/images/hall_sprites.png new file mode 100644 index 0000000000000000000000000000000000000000..9a9efe2f7d73bff0682f93f8922cf75d749e4c1b GIT binary patch literal 750 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=7>k44ofy`glX(f`90>3UaRt($ z3=FFn82*DXe7`ipaDRAK;=MHKuMq&kO>6;!FB+(0a^dSmI3VtS_`xd zXbI44ppih6fCd2d0TlsN0VRQAKqe4eNl)zuy4;~8$S)WuP7x5+o@WRQqY0iajv*Cu z-rliZ*Qy}mmMFtyeBsbNH}1Lr_vG2|%eyB;a=e-SXZ6jc@mrmF4(cv@WfeZVVBPCG zIa>LQCceMF?6X@Te>`)xo5N!>-G*oT?l0%OVA!b9s3EMN>&BL8c+X$Kiv;*ezTwpU z3!cr>wpDm@ZQ0`d(QlD_0Pp$861J-!=eVc`=$;QOVY&KQ#)Un=_q^UM$5Pwb8O&F| z)wsq7)Sh?$!Wj8sk8Az}-t*pHm?A%}StOcr+?Z$WcRt&HH(w;L+raK}&-%-m^V7r> zUlj6pa7;NkS&UJmTV2zu*{CvTk&4D_bw#g6qpC-XSTt6vYjrgnRVOXd(Acf6)YZsU zacB|8iVk%Ru4b-Er$q`YW~eK0HF8z0Q+j{*>w%yPo4e|EHFW{GpZ9;!QWsFg2~(Mt zm`h6l@jH+zAn)i21>Ix6e;(^ymbIqw*fahQ2fFesqHVQ-@yy`q>gTe~DWM4f?L1Zw literal 0 HcmV?d00001 diff --git a/images/hall_sprites.png.import b/images/hall_sprites.png.import new file mode 100644 index 0000000..582e2fa --- /dev/null +++ b/images/hall_sprites.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b7em0643n5rij" +path.bptc="res://.godot/imported/hall_sprites.png-29b50228091d602695d5f80271712df5.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://images/hall_sprites.png" +dest_files=["res://.godot/imported/hall_sprites.png-29b50228091d602695d5f80271712df5.bptc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=true +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 diff --git a/scenes/elevator_door.tscn b/scenes/elevator_door.tscn new file mode 100644 index 0000000..5c36cfa --- /dev/null +++ b/scenes/elevator_door.tscn @@ -0,0 +1,18 @@ +[gd_scene format=3 uid="uid://8ybwrid1vk4j"] + +[ext_resource type="Texture2D" uid="uid://s6b4vr0utvpb" path="res://images/elevator_doorl_sprites.png" id="1_45ql6"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_2ktk7"] +size = Vector3(0.94641113, 1.4300561, 0.018554688) + +[node name="ElevatorDoor" type="StaticBody3D" unique_id=1751198646] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=461678032] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0018920898, 0.0053675175, 0.0034179688) +shape = SubResource("BoxShape3D_2ktk7") + +[node name="Panel" type="Sprite3D" parent="." unique_id=1889832031] +transform = Transform3D(1, 0, 3.9750646e-15, 0, 1, 0, -3.9750646e-15, 0, 1, 0, 0, 0) +texture_filter = 0 +texture = ExtResource("1_45ql6") +region_rect = Rect2(0, 0, 96, 144) diff --git a/scenes/hall_block.tscn b/scenes/hall_block.tscn index b19b137..916048f 100644 --- a/scenes/hall_block.tscn +++ b/scenes/hall_block.tscn @@ -1,22 +1,22 @@ [gd_scene format=3 uid="uid://cxnocjdotkl5e"] +[ext_resource type="PackedScene" uid="uid://ceem38lhtmtiw" path="res://scenes/hall_floor.tscn" id="1_7mju3"] +[ext_resource type="PackedScene" uid="uid://qr1lwojf1cp6" path="res://scenes/hall_wall.tscn" id="1_cpafl"] + [sub_resource type="PlaneMesh" id="PlaneMesh_53tvs"] [node name="HallBlock" type="Node3D" unique_id=2127508708] transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 0, 0, 0) -[node name="Ground" type="MeshInstance3D" parent="." unique_id=1243012028] -transform = Transform3D(1.5, 0, 0, 0, -2.5, 6.039832e-07, 0, -3.774895e-07, -4, 0.017923832, 7.9985394, -0.017028354) +[node name="Floor" parent="." unique_id=1751198646 instance=ExtResource("1_7mju3")] +transform = Transform3D(4, 0, 0, 0, -1.7484554e-07, -3.9999998, 0, 3.9999998, -1.7484554e-07, 0, 0, 0) + +[node name="CeilingTemp" type="MeshInstance3D" parent="." unique_id=1243012028] +transform = Transform3D(1.5, 0, 0, 0, -2.5, 6.039832e-07, 0, -3.774895e-07, -4, 0.017923832, 5.798539, -0.017028354) mesh = SubResource("PlaneMesh_53tvs") -[node name="Ground2" type="MeshInstance3D" parent="." unique_id=456628197] -transform = Transform3D(1.5, 0, 0, 0, 2.5, 0, 0, 0, 4, 0, 0, 0) -mesh = SubResource("PlaneMesh_53tvs") +[node name="WallLeft" parent="." unique_id=1979972832 instance=ExtResource("1_cpafl")] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, -1.2676303e-07, 2.9, 2.9) -[node name="WallLeft" type="MeshInstance3D" parent="." unique_id=2073244630] -transform = Transform3D(1.5, 0, 0, 0, -1.3113416e-07, 4, 0, -3, -1.7484555e-07, -0.0013566017, 4.021149, 3.9638805) -mesh = SubResource("PlaneMesh_53tvs") - -[node name="WallRight" type="MeshInstance3D" parent="." unique_id=267065348] -transform = Transform3D(1.5, 0, 0, 0, -1.3113416e-07, -4, 0, 3, -1.7484555e-07, 3.862381e-05, 4.031578, -4.0129037) -mesh = SubResource("PlaneMesh_53tvs") +[node name="WallRight" parent="." unique_id=221874085 instance=ExtResource("1_cpafl")] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 1.11861866e-07, 2.9, -2.9) diff --git a/scenes/hall_floor.tscn b/scenes/hall_floor.tscn new file mode 100644 index 0000000..89e8114 --- /dev/null +++ b/scenes/hall_floor.tscn @@ -0,0 +1,18 @@ +[gd_scene format=3 uid="uid://ceem38lhtmtiw"] + +[ext_resource type="Texture2D" uid="uid://g76xnsgvhdte" path="res://images/floor_sprites.png" id="1_0uqw4"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_2ktk7"] +size = Vector3(0.94641113, 1.4300561, 0.018554688) + +[node name="Floor" type="StaticBody3D" unique_id=1751198646] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=461678032] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0018920898, 0.0053675175, 0.0034179688) +shape = SubResource("BoxShape3D_2ktk7") + +[node name="Panel" type="Sprite3D" parent="." unique_id=1889832031] +transform = Transform3D(1, 0, 3.9750646e-15, 0, 1, 0, -3.9750646e-15, 0, 1, 0, 0, 0) +texture_filter = 0 +texture = ExtResource("1_0uqw4") +region_rect = Rect2(0, 0, 96, 144) diff --git a/scenes/hall_wall.tscn b/scenes/hall_wall.tscn new file mode 100644 index 0000000..75fc144 --- /dev/null +++ b/scenes/hall_wall.tscn @@ -0,0 +1,18 @@ +[gd_scene format=3 uid="uid://qr1lwojf1cp6"] + +[ext_resource type="Texture2D" uid="uid://b7em0643n5rij" path="res://images/hall_sprites.png" id="1_wykyb"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_2ktk7"] +size = Vector3(0.94641113, 1.4300561, 0.018554688) + +[node name="Wall" type="StaticBody3D" unique_id=1751198646] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=461678032] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0018920898, 0.0053675175, 0.0034179688) +shape = SubResource("BoxShape3D_2ktk7") + +[node name="Panel" type="Sprite3D" parent="." unique_id=1889832031] +transform = Transform3D(1, 0, 3.9750646e-15, 0, 1, 0, -3.9750646e-15, 0, 1, 0, 0, 0) +texture_filter = 0 +texture = ExtResource("1_wykyb") +region_rect = Rect2(0, 0, 96, 144) diff --git a/scenes/survivor.gd b/scenes/survivor.gd index 3db7ca8..66ac67c 100644 --- a/scenes/survivor.gd +++ b/scenes/survivor.gd @@ -1,6 +1,6 @@ extends CharacterBody3D -var speed: int = 10 +var speed: int = 5 var clumsiness: int = 0 @@ -9,5 +9,5 @@ func start(xform): velocity = (-xform.basis.z * speed).rotated(Vector3.UP, randf_range(-PI/4, PI/4)) func _physics_process(delta): - velocity.z -= 10 * delta + velocity.z -= speed * delta move_and_slide() diff --git a/scenes/world.tscn b/scenes/world.tscn index e8adf5e..3fb233f 100644 --- a/scenes/world.tscn +++ b/scenes/world.tscn @@ -3,38 +3,38 @@ [ext_resource type="PackedScene" uid="uid://dowvqakiqkvk5" path="res://scenes/camera_3d.tscn" id="1_f3sb7"] [ext_resource type="PackedScene" uid="uid://cxnocjdotkl5e" path="res://scenes/hall_block.tscn" id="1_tlwt5"] [ext_resource type="PackedScene" uid="uid://bedp5mlcbielu" path="res://scenes/survivor.tscn" id="3_4wyf3"] +[ext_resource type="PackedScene" uid="uid://8ybwrid1vk4j" path="res://scenes/elevator_door.tscn" id="3_k0juu"] [sub_resource type="CapsuleMesh" id="CapsuleMesh_tlwt5"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_aqk2v"] -[sub_resource type="PlaneMesh" id="PlaneMesh_tlwt5"] - [node name="World" type="Node3D" unique_id=831374579] [node name="Hall" type="Node3D" parent="." unique_id=2096979798] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.10000013, 0) [node name="HallBlock3" parent="Hall" unique_id=2127508708 instance=ExtResource("1_tlwt5")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 0, 0, 8.996796) +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 0, 0, 11.696419) [node name="HallBlock2" parent="Hall" unique_id=797565575 instance=ExtResource("1_tlwt5")] transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -0.00023269653, 0.01109314, 6.0201683) [node name="HallBlock1" parent="Hall" unique_id=1437187009 instance=ExtResource("1_tlwt5")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 0, 0, 3.017323) +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 0, 0, 0.31732297) [node name="HallBlock0" parent="Hall" unique_id=1901572100 instance=ExtResource("1_tlwt5")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 0, 0, -5.4) [node name="Camera3D" parent="." unique_id=691202574 instance=ExtResource("1_f3sb7")] -transform = Transform3D(-0.9999863, 0.005235979, -8.616466e-08, 0.005230568, 0.99895376, 0.045432728, 0.00023797085, 0.045432106, -0.9989674, -0.25669718, 2.565366, -3.1106362) +transform = Transform3D(-0.9999863, 0.005235964, 8.742278e-08, 0.005235964, 0.9999863, 0, -8.7421576e-08, 4.577425e-10, -1, 0.003270626, 2.9093587, -9.910637) fov = 90.0 [node name="StaticBody3D" type="StaticBody3D" parent="." unique_id=133407620] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.6470537, 0, 4.4912777) [node name="MeshInstance3D" type="MeshInstance3D" parent="StaticBody3D" unique_id=996721213] -transform = Transform3D(2.5, 0, 0, 0, 2.5, 0, 0, 0, 2.5, -2.6999998, 2.538711, 3.8988447) +transform = Transform3D(2.75, 0, 0, 0, 2.75, 0, 0, 0, 2.75, -2.6999998, 2.9387112, 3.8988447) mesh = SubResource("CapsuleMesh_tlwt5") [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D" unique_id=1517735028] @@ -43,13 +43,11 @@ shape = SubResource("CapsuleShape3D_aqk2v") [node name="Elevator Doors" type="Node3D" parent="." unique_id=351419432] -[node name="DoorLeft" type="MeshInstance3D" parent="Elevator Doors" unique_id=1505149375] -transform = Transform3D(-1.4999795, -2.5919616e-07, -0.020943915, 0.007845853, 0.13629805, -3.995815, 0.0003569563, -2.9969022, -0.18172824, 2.6999998, 4.294, -1.621) -mesh = SubResource("PlaneMesh_tlwt5") +[node name="DoorLeft" parent="Elevator Doors" unique_id=1751198646 instance=ExtResource("3_k0juu")] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 4.5, 2.9909716, -8.27242) -[node name="DoorRight" type="MeshInstance3D" parent="Elevator Doors" unique_id=1325879051] -transform = Transform3D(-1.4999795, -2.5919616e-07, -0.020943915, 0.007845853, 0.13629805, -3.995815, 0.0003569563, -2.9969022, -0.18172824, -2.7, 4.273, -1.621) -mesh = SubResource("PlaneMesh_tlwt5") +[node name="DoorRight" parent="Elevator Doors" unique_id=551316937 instance=ExtResource("3_k0juu")] +transform = Transform3D(-4, 0, 3.496911e-07, 0, 4, 0, -3.496911e-07, 0, -4, -4.4, 2.9909716, -8.27242) [node name="Survivor" parent="." unique_id=510103859 instance=ExtResource("3_4wyf3")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.3680804, 1.3, 4.7656555) +transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 1.3680804, 1.6999999, 4.7656555)