diff --git a/game/modules/buildings/CryptEntrance.tres b/game/modules/buildings/CryptEntrance.tres index 9bc22910..ad8deea7 100644 --- a/game/modules/buildings/CryptEntrance.tres +++ b/game/modules/buildings/CryptEntrance.tres @@ -1,11 +1,11 @@ [gd_resource type="PropData" load_steps=39 format=2] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=1] -[ext_resource path="res://modules/core_models/wall_xp.gltf" type="MeshDataResource" id=2] -[ext_resource path="res://modules/core_models/wall_xn.gltf" type="MeshDataResource" id=3] -[ext_resource path="res://modules/core_models/wall_zn.gltf" type="MeshDataResource" id=4] -[ext_resource path="res://modules/core_models/wall_zp.gltf" type="MeshDataResource" id=5] -[ext_resource path="res://modules/core_models/floor.gltf" type="MeshDataResource" id=6] +[ext_resource path="res://modules/core_models/wall_xp.tres" type="MeshDataResource" id=2] +[ext_resource path="res://modules/core_models/wall_xn.tres" type="MeshDataResource" id=3] +[ext_resource path="res://modules/core_models/wall_zn.tres" type="MeshDataResource" id=4] +[ext_resource path="res://modules/core_models/wall_zp.tres" type="MeshDataResource" id=5] +[ext_resource path="res://modules/core_models/floor.tres" type="MeshDataResource" id=6] [sub_resource type="PropDataMeshData" id=1] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -3 ) diff --git a/game/modules/buildings/CryptEntrance.tscn b/game/modules/buildings/CryptEntrance.tscn index e1704cda..140ed26c 100644 --- a/game/modules/buildings/CryptEntrance.tscn +++ b/game/modules/buildings/CryptEntrance.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=18 format=2] -[ext_resource path="res://modules/core_models/wall_xp.gltf" type="MeshDataResource" id=1] -[ext_resource path="res://modules/core_models/wall_xn.gltf" type="MeshDataResource" id=2] -[ext_resource path="res://modules/core_models/floor.gltf" type="MeshDataResource" id=3] -[ext_resource path="res://modules/core_models/wall_zn.gltf" type="MeshDataResource" id=4] -[ext_resource path="res://modules/core_models/wall_zp.gltf" type="MeshDataResource" id=5] +[ext_resource path="res://modules/core_models/wall_xp.tres" type="MeshDataResource" id=1] +[ext_resource path="res://modules/core_models/wall_xn.tres" type="MeshDataResource" id=2] +[ext_resource path="res://modules/core_models/floor.tres" type="MeshDataResource" id=3] +[ext_resource path="res://modules/core_models/wall_zn.tres" type="MeshDataResource" id=4] +[ext_resource path="res://modules/core_models/wall_zp.tres" type="MeshDataResource" id=5] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=6] [ext_resource path="res://modules/buildings/CryptEntranceDoor.tscn" type="PackedScene" id=7] diff --git a/game/modules/core_models/ceiling.gltf.import b/game/modules/core_models/ceiling.gltf.import index 0b436ab5..eaa25365 100644 --- a/game/modules/core_models/ceiling.gltf.import +++ b/game/modules/core_models/ceiling.gltf.import @@ -17,3 +17,4 @@ collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) scale=Vector3( 1, 1, 1 ) +save_copy_as_resource=true diff --git a/game/modules/core_models/ceiling.tres b/game/modules/core_models/ceiling.tres new file mode 100644 index 00000000..cb8e78d2 --- /dev/null +++ b/game/modules/core_models/ceiling.tres @@ -0,0 +1,5 @@ +[gd_resource type="MeshDataResource" format=2] + +[resource] +array = [ PoolVector3Array( 1.19209e-07, 8.9407e-08, 1, 8.9407e-08, -1.47027e-07, 1.78814e-07, 1, -8.9407e-08, 1.78814e-07, 1, 1.47027e-07, 1 ), PoolVector3Array( 5.76204e-08, -1, 2.36434e-07, 5.76204e-08, -1, 2.36434e-07, 5.76204e-08, -1, 2.36434e-07, 5.76204e-08, -1, 2.36434e-07 ), null, null, PoolVector2Array( 1, 0, 0, 0, 0, 1, 1, 1 ), null, null, null, PoolIntArray( 0, 2, 1, 0, 3, 2 ) ] +aabb = AABB( 8.9407e-08, -1.47027e-07, 1.78814e-07, 1, 2.94055e-07, 1 ) diff --git a/game/modules/core_models/floor.gltf.import b/game/modules/core_models/floor.gltf.import index 06b99bd3..add5158b 100644 --- a/game/modules/core_models/floor.gltf.import +++ b/game/modules/core_models/floor.gltf.import @@ -17,3 +17,4 @@ collider_type=4 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) scale=Vector3( 1, 1, 1 ) +save_copy_as_resource=true diff --git a/game/modules/core_models/floor.tres b/game/modules/core_models/floor.tres new file mode 100644 index 00000000..4d7a0e51 --- /dev/null +++ b/game/modules/core_models/floor.tres @@ -0,0 +1,9 @@ +[gd_resource type="MeshDataResource" load_steps=2 format=2] + +[sub_resource type="BoxShape" id=1] +extents = Vector3( 0.5, 0, 0.5 ) + +[resource] +array = [ PoolVector3Array( 1, 0, 0, 1, 0, -1, 1.19209e-07, 0, -1, 1.19209e-07, 0, 0 ), PoolVector3Array( 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0 ), null, null, PoolVector2Array( 0, 0, 0, 1, 1, 1, 1, 0 ), null, null, null, PoolIntArray( 0, 2, 1, 0, 3, 2 ) ] +aabb = AABB( 1.19209e-07, 0, -1, 1, 0, 1 ) +collision_shapes = [ Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 0, -0.5 ), SubResource( 1 ) ] diff --git a/game/modules/core_models/wall_xn.gltf.import b/game/modules/core_models/wall_xn.gltf.import index 27325c93..6663caba 100644 --- a/game/modules/core_models/wall_xn.gltf.import +++ b/game/modules/core_models/wall_xn.gltf.import @@ -17,3 +17,4 @@ collider_type=4 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) scale=Vector3( 1, 1, 1 ) +save_copy_as_resource=true diff --git a/game/modules/core_models/wall_xn.tres b/game/modules/core_models/wall_xn.tres new file mode 100644 index 00000000..878d784d --- /dev/null +++ b/game/modules/core_models/wall_xn.tres @@ -0,0 +1,9 @@ +[gd_resource type="MeshDataResource" load_steps=2 format=2] + +[sub_resource type="BoxShape" id=1] +extents = Vector3( 5.96046e-08, 0.5, 0.5 ) + +[resource] +array = [ PoolVector3Array( 2.98023e-08, 1, -1, -5.96046e-08, 0, -1, -2.98023e-08, 0, -1.49012e-07, 5.96046e-08, 1, -1.49012e-07 ), PoolVector3Array( -1, 8.9407e-08, 2.98023e-08, -1, 8.9407e-08, 2.98023e-08, -1, 8.9407e-08, 2.98023e-08, -1, 8.9407e-08, 2.98023e-08 ), null, null, PoolVector2Array( 0, 0, 0, 1, 1, 1, 1, 0 ), null, null, null, PoolIntArray( 0, 2, 1, 0, 3, 2 ) ] +aabb = AABB( -5.96046e-08, 0, -1, 1.19209e-07, 1, 1 ) +collision_shapes = [ Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, -0.5 ), SubResource( 1 ) ] diff --git a/game/modules/core_models/wall_xp.gltf.import b/game/modules/core_models/wall_xp.gltf.import index 80c86ba2..2c9c92cd 100644 --- a/game/modules/core_models/wall_xp.gltf.import +++ b/game/modules/core_models/wall_xp.gltf.import @@ -17,3 +17,4 @@ collider_type=4 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) scale=Vector3( 1, 1, 1 ) +save_copy_as_resource=true diff --git a/game/modules/core_models/wall_xp.tres b/game/modules/core_models/wall_xp.tres new file mode 100644 index 00000000..8b4ec2dc --- /dev/null +++ b/game/modules/core_models/wall_xp.tres @@ -0,0 +1,9 @@ +[gd_resource type="MeshDataResource" load_steps=2 format=2] + +[sub_resource type="BoxShape" id=1] +extents = Vector3( 1.19209e-07, 0.5, 0.5 ) + +[resource] +array = [ PoolVector3Array( 2.98023e-08, 1, -1.49012e-07, 1.19209e-07, 8.9407e-08, -1.49012e-07, -2.98023e-08, 8.9407e-08, -1, -1.19209e-07, 1, -1 ), PoolVector3Array( 1, 8.9407e-08, -1.49012e-07, 1, 8.9407e-08, -1.49012e-07, 1, 8.9407e-08, -1.49012e-07, 1, 8.9407e-08, -1.49012e-07 ), null, null, PoolVector2Array( 0, 0, 0, 1, 1, 1, 1, 0 ), null, null, null, PoolIntArray( 0, 2, 1, 0, 3, 2 ) ] +aabb = AABB( -1.19209e-07, 8.9407e-08, -1, 2.38419e-07, 1, 1 ) +collision_shapes = [ Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, -0.5 ), SubResource( 1 ) ] diff --git a/game/modules/core_models/wall_zn.gltf.import b/game/modules/core_models/wall_zn.gltf.import index 2bd074fc..19e4b423 100644 --- a/game/modules/core_models/wall_zn.gltf.import +++ b/game/modules/core_models/wall_zn.gltf.import @@ -17,3 +17,4 @@ collider_type=4 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) scale=Vector3( 1, 1, 1 ) +save_copy_as_resource=true diff --git a/game/modules/core_models/wall_zn.tres b/game/modules/core_models/wall_zn.tres new file mode 100644 index 00000000..148baa6b --- /dev/null +++ b/game/modules/core_models/wall_zn.tres @@ -0,0 +1,9 @@ +[gd_resource type="MeshDataResource" load_steps=2 format=2] + +[sub_resource type="BoxShape" id=1] +extents = Vector3( 0.5, 0.5, 4.37114e-08 ) + +[resource] +array = [ PoolVector3Array( 1, 1, 4.37114e-08, 1, 0, -4.37114e-08, 1.49012e-07, 0, -4.37114e-08, 1.49012e-07, 1, 4.37114e-08 ), PoolVector3Array( 0, 8.74228e-08, -1, 0, 8.74228e-08, -1, 0, 8.74228e-08, -1, 0, 8.74228e-08, -1 ), null, null, PoolVector2Array( 0, 0, 0, 1, 1, 1, 1, 0 ), null, null, null, PoolIntArray( 0, 2, 1, 0, 3, 2 ) ] +aabb = AABB( 1.49012e-07, 0, -4.37114e-08, 1, 1, 8.74228e-08 ) +collision_shapes = [ Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 0.5, 0 ), SubResource( 1 ) ] diff --git a/game/modules/core_models/wall_zp.gltf.import b/game/modules/core_models/wall_zp.gltf.import index 790f89ff..01c5b5ec 100644 --- a/game/modules/core_models/wall_zp.gltf.import +++ b/game/modules/core_models/wall_zp.gltf.import @@ -17,3 +17,4 @@ collider_type=4 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) scale=Vector3( 1, 1, 1 ) +save_copy_as_resource=true diff --git a/game/modules/core_models/wall_zp.tres b/game/modules/core_models/wall_zp.tres new file mode 100644 index 00000000..24f5ed49 --- /dev/null +++ b/game/modules/core_models/wall_zp.tres @@ -0,0 +1,9 @@ +[gd_resource type="MeshDataResource" load_steps=2 format=2] + +[sub_resource type="BoxShape" id=1] +extents = Vector3( 0.5, 0.5, 0 ) + +[resource] +array = [ PoolVector3Array( 1.49012e-07, 1, 0, 1.49012e-07, 0, 0, 1, 0, 0, 1, 1, 0 ), PoolVector3Array( 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1 ), null, null, PoolVector2Array( 1, 1, 1, 0, 0, 0, 0, 1 ), null, null, null, PoolIntArray( 0, 2, 1, 0, 3, 2 ) ] +aabb = AABB( 1.49012e-07, 0, 0, 1, 1, 0 ) +collision_shapes = [ Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 0.5, 0 ), SubResource( 1 ) ] diff --git a/game/modules/planets/test_planet/dungeons/dungeon.tres b/game/modules/planets/test_planet/dungeons/dungeon.tres index 6e74f7d1..50b07f0f 100644 --- a/game/modules/planets/test_planet/dungeons/dungeon.tres +++ b/game/modules/planets/test_planet/dungeons/dungeon.tres @@ -3,12 +3,12 @@ [ext_resource path="res://modules/planets/test_planet/dungeons/dungeon.gd" type="Script" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.gltf" type="MeshDataResource" id=2] [ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.tscn" type="PackedScene" id=3] -[ext_resource path="res://modules/core_models/ceiling.gltf" type="MeshDataResource" id=4] -[ext_resource path="res://modules/core_models/wall_xp.gltf" type="MeshDataResource" id=5] -[ext_resource path="res://modules/core_models/wall_xn.gltf" type="MeshDataResource" id=6] -[ext_resource path="res://modules/core_models/floor.gltf" type="MeshDataResource" id=7] -[ext_resource path="res://modules/core_models/wall_zn.gltf" type="MeshDataResource" id=8] -[ext_resource path="res://modules/core_models/wall_zp.gltf" type="MeshDataResource" id=9] +[ext_resource path="res://modules/core_models/ceiling.tres" type="MeshDataResource" id=4] +[ext_resource path="res://modules/core_models/wall_xp.tres" type="MeshDataResource" id=5] +[ext_resource path="res://modules/core_models/wall_xn.tres" type="MeshDataResource" id=6] +[ext_resource path="res://modules/core_models/floor.tres" type="MeshDataResource" id=7] +[ext_resource path="res://modules/core_models/wall_zn.tres" type="MeshDataResource" id=8] +[ext_resource path="res://modules/core_models/wall_zp.tres" type="MeshDataResource" id=9] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=10] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=11] diff --git a/game/modules/planets/test_planet/dungeons/dungeon_l2.tres b/game/modules/planets/test_planet/dungeons/dungeon_l2.tres index 60a9d20f..f7ac71c2 100644 --- a/game/modules/planets/test_planet/dungeons/dungeon_l2.tres +++ b/game/modules/planets/test_planet/dungeons/dungeon_l2.tres @@ -3,12 +3,12 @@ [ext_resource path="res://modules/planets/test_planet/dungeons/dungeon.gd" type="Script" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.gltf" type="MeshDataResource" id=2] [ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.tscn" type="PackedScene" id=3] -[ext_resource path="res://modules/core_models/ceiling.gltf" type="MeshDataResource" id=4] -[ext_resource path="res://modules/core_models/wall_xp.gltf" type="MeshDataResource" id=5] -[ext_resource path="res://modules/core_models/wall_xn.gltf" type="MeshDataResource" id=6] -[ext_resource path="res://modules/core_models/floor.gltf" type="MeshDataResource" id=7] -[ext_resource path="res://modules/core_models/wall_zn.gltf" type="MeshDataResource" id=8] -[ext_resource path="res://modules/core_models/wall_zp.gltf" type="MeshDataResource" id=9] +[ext_resource path="res://modules/core_models/ceiling.tres" type="MeshDataResource" id=4] +[ext_resource path="res://modules/core_models/wall_xp.tres" type="MeshDataResource" id=5] +[ext_resource path="res://modules/core_models/wall_xn.tres" type="MeshDataResource" id=6] +[ext_resource path="res://modules/core_models/floor.tres" type="MeshDataResource" id=7] +[ext_resource path="res://modules/core_models/wall_zn.tres" type="MeshDataResource" id=8] +[ext_resource path="res://modules/core_models/wall_zp.tres" type="MeshDataResource" id=9] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=10] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=11]