Merge main into agent/9bfb90314053

# Conflicts:
#	scenes/worlds/test_level.tscn
This commit is contained in:
2026-08-21 00:39:28 +00:00
2 changed files with 212 additions and 42 deletions
+87 -42
View File
@@ -1,75 +1,120 @@
[gd_scene load_steps=9 format=3]
[gd_scene load_steps=1 format=3 uid="uid://c49a36fc7db_test_level"]
[ext_resource type="PackedScene" path="res://scenes/player.tscn" id="1_player"]
[sub_resource type="BoxMesh" id="mesh_ground"]
[sub_resource type="BoxShape3D" id="BoxShape3D_ground"]
size = Vector3(40, 1, 40)
[sub_resource type="BoxMesh" id="mesh_box1"]
size = Vector3(1.5, 2.0, 1.5)
[sub_resource type="BoxMesh" id="BoxMesh_ground"]
size = Vector3(40, 1, 40)
[sub_resource type="CylinderMesh" id="mesh_cylinder"]
top_radius = 0.5
bottom_radius = 0.5
height = 2.0
[sub_resource type="BoxShape3D" id="BoxShape3D_prop1"]
size = Vector3(2, 3, 2)
[sub_resource type="SphereMesh" id="mesh_sphere"]
radius = 0.75
[sub_resource type="BoxMesh" id="BoxMesh_prop1"]
size = Vector3(2, 3, 2)
[sub_resource type="BoxMesh" id="mesh_box2"]
size = Vector3(1.0, 3.0, 1.0)
[sub_resource type="BoxShape3D" id="BoxShape3D_prop2"]
size = Vector3(3, 1, 3)
[sub_resource type="BoxMesh" id="mesh_box3"]
size = Vector3(2.0, 1.0, 2.0)
[sub_resource type="BoxMesh" id="BoxMesh_prop2"]
size = Vector3(3, 1, 3)
[sub_resource type="Environment" id="env_bg"]
[sub_resource type="CylinderShape3D" id="CylinderShape3D_prop3"]
top_radius = 1.0
height = 4.0
[sub_resource type="CylinderMesh" id="CylinderMesh_prop3"]
top_radius = 1.0
bottom_radius = 1.0
height = 4.0
subdivisions_top_radius = 8
[sub_resource type="SphereShape3D" id="SphereShape3D_prop4"]
radius = 1.0
[sub_resource type="SphereMesh" id="SphereMesh_prop4"]
radius = 1.0
subdivisions_ring = 12
subdivisions_height = 12
[sub_resource type="SphereShape3D" id="SphereShape3D_prop5"]
radius = 0.5
[sub_resource type="SphereMesh" id="SphereMesh_prop5"]
radius = 0.5
subdivisions_ring = 8
subdivisions_height = 8
[sub_resource type="Environment" id="WorldEnvironment_env"]
background_mode = 1
background_color = Color(0.4, 0.6, 0.9, 1)
ambient_light_energy = 0.6
background_color = Color(0.4, 0.6, 0.8, 1)
ambient_light_source = 1
ambient_light_energy = 0.4
ambient_light_sky_energy = 1.0
[node name="TestLevel" type="Node3D"]
[node name="Ground" type="StaticBody3D" parent="."]
position = Vector3(0, -0.5, 0)
[node name="GroundMesh" type="MeshInstance3D" parent="Ground"]
mesh = SubResource("mesh_ground")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Ground"]
shape = SubResource("BoxShape3D_ground")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Ground"]
mesh = SubResource("BoxMesh_ground")
[node name="Props" type="Node3D" parent="."]
[node name="Prop1" type="StaticBody3D" parent="Props"]
[node name="Prop1_Box" type="StaticBody3D" parent="Props"]
position = Vector3(8, 1.5, 8)
[node name="Prop1Mesh" type="MeshInstance3D" parent="Props/Prop1"]
mesh = SubResource("mesh_box1")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Props/Prop1_Box"]
shape = SubResource("BoxShape3D_prop1")
[node name="Prop2" type="StaticBody3D" parent="Props"]
[node name="MeshInstance3D" type="MeshInstance3D" parent="Props/Prop1_Box"]
mesh = SubResource("BoxMesh_prop1")
[node name="Prop2Mesh" type="MeshInstance3D" parent="Props/Prop2"]
mesh = SubResource("mesh_cylinder")
[node name="Prop2_Pedestal" type="StaticBody3D" parent="Props"]
position = Vector3(-8, 0.5, 6)
[node name="Prop3" type="StaticBody3D" parent="Props"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Props/Prop2_Pedestal"]
shape = SubResource("BoxShape3D_prop2")
[node name="Prop3Mesh" type="MeshInstance3D" parent="Props/Prop3"]
mesh = SubResource("mesh_sphere")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Props/Prop2_Pedestal"]
mesh = SubResource("BoxMesh_prop2")
[node name="Prop4" type="StaticBody3D" parent="Props"]
[node name="Prop3_Column" type="StaticBody3D" parent="Props"]
position = Vector3(6, 2.0, -8)
[node name="Prop4Mesh" type="MeshInstance3D" parent="Props/Prop4"]
mesh = SubResource("mesh_box2")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Props/Prop3_Column"]
shape = SubResource("CylinderShape3D_prop3")
[node name="Prop5" type="StaticBody3D" parent="Props"]
[node name="MeshInstance3D" type="MeshInstance3D" parent="Props/Prop3_Column"]
mesh = SubResource("CylinderMesh_prop3")
[node name="Prop5Mesh" type="MeshInstance3D" parent="Props/Prop5"]
mesh = SubResource("mesh_box3")
[node name="Prop4_Sphere" type="StaticBody3D" parent="Props"]
position = Vector3(-6, 1.0, -6)
[node name="CollisionShape3D" type="CollisionShape3D" parent="Props/Prop4_Sphere"]
shape = SubResource("SphereShape3D_prop4")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Props/Prop4_Sphere"]
mesh = SubResource("SphereMesh_prop4")
[node name="Prop5_SmallSphere" type="StaticBody3D" parent="Props"]
position = Vector3(0, 0.5, 12)
[node name="CollisionShape3D" type="CollisionShape3D" parent="Props/Prop5_SmallSphere"]
shape = SubResource("SphereShape3D_prop5")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Props/Prop5_SmallSphere"]
mesh = SubResource("SphereMesh_prop5")
[node name="Sun" type="DirectionalLight3D" parent="."]
rotation_degrees = Vector3(-45.0, 0.0, 0.0)
rotation = Vector3(-0.785398, 0, 0)
shadow_enabled = true
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("env_bg")
environment = SubResource("WorldEnvironment_env")
[node name="PlayerSpawn" type="Marker3D" parent="."]
position = Vector3(0, 1.0, 0)
[node name="Player" parent="." instance=ExtResource("1_player")]
position = Vector3(0, 1.0, 0)
position = Vector3(0, 1.5, 0)