diff --git a/images/elevator_wall.png b/images/elevator_wall.png new file mode 100644 index 0000000..e686562 Binary files /dev/null and b/images/elevator_wall.png differ diff --git a/images/elevator_wall.png.import b/images/elevator_wall.png.import new file mode 100644 index 0000000..63ef9d5 --- /dev/null +++ b/images/elevator_wall.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dtl8n0wgpjyc2" +path.s3tc="res://.godot/imported/elevator_wall.png-8bedfa455e04239a62ef42b37a28e91a.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://images/elevator_wall.png" +dest_files=["res://.godot/imported/elevator_wall.png-8bedfa455e04239a62ef42b37a28e91a.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 diff --git a/scenes/elevator.tscn b/scenes/elevator.tscn index 07d5482..27b569f 100644 --- a/scenes/elevator.tscn +++ b/scenes/elevator.tscn @@ -1,7 +1,8 @@ [gd_scene format=3 uid="uid://brd3iponame0e"] [ext_resource type="PackedScene" uid="uid://8ybwrid1vk4j" path="res://scenes/elevator_door.tscn" id="1_uuuf0"] -[ext_resource type="Script" path="res://scenes/elevator.gd" id="2_elev"] +[ext_resource type="Script" uid="uid://cw4kqlft85a5g" path="res://scenes/elevator.gd" id="2_elev"] +[ext_resource type="PackedScene" uid="uid://d2hli7lwquq0c" path="res://scenes/elevator_wall.tscn" id="2_jmdsd"] [sub_resource type="Animation" id="Animation_8o2wm"] length = 0.001 @@ -96,8 +97,14 @@ _data = { [node name="Elevator" type="Node3D" unique_id=242258467] script = ExtResource("2_elev") -[node name="ElevatorDoorLeft" parent="." unique_id=1751198646 instance=ExtResource("1_uuuf0")] -transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1.25, 0, 0) +[node name="ElevatorWallRight2" parent="." unique_id=1751198646 instance=ExtResource("2_jmdsd")] +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1.2651916, 0, -0.080937) + +[node name="ElevatorDoorLeft" parent="." unique_id=729245249 instance=ExtResource("1_uuuf0")] +transform = Transform3D(-1, 0, 1.509958e-07, 0, 1, 0, -1.509958e-07, 0, -1, -1.25, 0, 0) + +[node name="ElevatorWallRight" parent="." unique_id=1939990578 instance=ExtResource("2_jmdsd")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.2699873, 0, -0.080937) [node name="ElevatorDoorRight" parent="." unique_id=1811985699 instance=ExtResource("1_uuuf0")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.1535625, 2.9802322e-08, 0.0001654625) diff --git a/scenes/elevator_door.tscn b/scenes/elevator_door.tscn index b9f1767..486ddd7 100644 --- a/scenes/elevator_door.tscn +++ b/scenes/elevator_door.tscn @@ -14,6 +14,7 @@ disabled = true [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) +transparent = false texture_filter = 0 texture = ExtResource("1_45ql6") region_rect = Rect2(0, 0, 96, 144) diff --git a/scenes/elevator_wall.tscn b/scenes/elevator_wall.tscn new file mode 100644 index 0000000..6c6db12 --- /dev/null +++ b/scenes/elevator_wall.tscn @@ -0,0 +1,21 @@ +[gd_scene format=3 uid="uid://d2hli7lwquq0c"] + +[ext_resource type="Texture2D" uid="uid://dtl8n0wgpjyc2" path="res://images/elevator_wall.png" id="1_mflgn"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_2ktk7"] +size = Vector3(0.94641113, 1.4300561, 0.018554688) + +[node name="ElevatorWall" 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") +disabled = true + +[node name="Wall" type="Sprite3D" parent="." unique_id=1889832031] +transform = Transform3D(1, 0, 3.9750646e-15, 0, 1, 0, -3.9750646e-15, 0, 1, 0, 0, 0) +billboard = 1 +transparent = false +texture_filter = 0 +texture = ExtResource("1_mflgn") +region_rect = Rect2(0, 0, 96, 144) diff --git a/scenes/world.tscn b/scenes/world.tscn index 397049b..9cffd40 100644 --- a/scenes/world.tscn +++ b/scenes/world.tscn @@ -2,7 +2,7 @@ [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://b8q1mk8ub3dwm" path="res://scenes/robot.tscn" id="3_71j4m"] +[ext_resource type="PackedScene" uid="uid://v07x1vbept3i" path="res://scenes/robot.tscn" id="3_71j4m"] [ext_resource type="PackedScene" uid="uid://brd3iponame0e" path="res://scenes/elevator.tscn" id="4_k0juu"] [sub_resource type="BoxShape3D" id="BoxShape3D_k0juu"] @@ -11,8 +11,8 @@ size = Vector3(9.291687, 6.6328125, 0.8612671) [node name="World" type="Node3D" unique_id=831374579] [node name="Camera3D" parent="." unique_id=691202574 instance=ExtResource("1_f3sb7")] -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 +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, -10.424748) +fov = 105.7 [node name="Hall" type="Node3D" parent="." unique_id=2096979798] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.10000013, 0) @@ -37,7 +37,7 @@ unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -8.351522) [node name="Elevator" parent="ElevatorSafeZone" unique_id=242258467 instance=ExtResource("4_k0juu")] -transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 3, 0) +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 3, -0.061756134) [node name="CollisionShape3D" type="CollisionShape3D" parent="ElevatorSafeZone" unique_id=264489586] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.8164063, -0.30373383)