Incorporate new assets into the world gen

8 files changed, 65 insertions, 30 deletions

diff --git a/world/obstacles/Rock_coll.tres b/world/obstacles/Rock_coll.tres
deleted file mode 100644
index b06d080..0000000
--- a/world/obstacles/Rock_coll.tres
+++ /dev/null
@@ -1,4 +0,0 @@
-[gd_resource type="ConvexPolygonShape" format=2]
-
-[resource]
-points = PoolVector3Array( 2.5, -5, 2.5, 2.5, -5, -2.5, -2.5, -5, -2.5, -2.5, -5, 2.5, 0, 5, 2.5, 0, 5, -2.5 )
diff --git a/world/obstacles/Rock_mat.tres b/world/obstacles/Rock_mat.tres
deleted file mode 100644
index 8547487..0000000
--- a/world/obstacles/Rock_mat.tres
+++ /dev/null
@@ -1,21 +0,0 @@
-[gd_resource type="SpatialMaterial" load_steps=4 format=2]
-
-[sub_resource type="OpenSimplexNoise" id=3]
-octaves = 4
-period = 32.0
-
-[sub_resource type="NoiseTexture" id=4]
-noise = SubResource( 3 )
-
-[sub_resource type="NoiseTexture" id=5]
-seamless = true
-as_normalmap = true
-bump_strength = 32.0
-noise = SubResource( 3 )
-
-[resource]
-albedo_color = Color( 0.231373, 0.231373, 0.231373, 1 )
-albedo_texture = SubResource( 4 )
-normal_enabled = true
-normal_scale = 1.0
-normal_texture = SubResource( 5 )
diff --git a/world/obstacles/Rock_mesh.tres b/world/obstacles/Rock_mesh.tres
deleted file mode 100644
index bced5b6..0000000
--- a/world/obstacles/Rock_mesh.tres
+++ /dev/null
@@ -1,4 +0,0 @@
-[gd_resource type="PrismMesh" format=2]
-
-[resource]
-size = Vector3( 5, 10, 5 )
diff --git a/world/obstacles/rock/rock_2.obj.import b/world/obstacles/rock/rock_2.obj.import
new file mode 100644
index 0000000..fa1cd12
--- /dev/null
+++ b/world/obstacles/rock/rock_2.obj.import
@@ -0,0 +1,20 @@
+[remap]
+
+importer="wavefront_obj"
+type="Mesh"
+path="res://.import/rock_2.obj-6b46dcd26b50100b97b7de27c9d2442e.mesh"
+
+[deps]
+
+files=[ "res://.import/rock_2.obj-6b46dcd26b50100b97b7de27c9d2442e.mesh" ]
+
+source_file="res://world/obstacles/rock/rock_2.obj"
+dest_files=[ "res://.import/rock_2.obj-6b46dcd26b50100b97b7de27c9d2442e.mesh", "res://.import/rock_2.obj-6b46dcd26b50100b97b7de27c9d2442e.mesh" ]
+
+[params]
+
+generate_tangents=true
+scale_mesh=Vector3( 1, 1, 1 )
+offset_mesh=Vector3( 0, 0, 0 )
+octahedral_compression=true
+optimize_mesh_flags=4286
diff --git a/world/obstacles/rock/rock_3.obj.import b/world/obstacles/rock/rock_3.obj.import
new file mode 100644
index 0000000..2b6e51a
--- /dev/null
+++ b/world/obstacles/rock/rock_3.obj.import
@@ -0,0 +1,20 @@
+[remap]
+
+importer="wavefront_obj"
+type="Mesh"
+path="res://.import/rock_3.obj-25a12d271c599173a2a802010b38296e.mesh"
+
+[deps]
+
+files=[ "res://.import/rock_3.obj-25a12d271c599173a2a802010b38296e.mesh" ]
+
+source_file="res://world/obstacles/rock/rock_3.obj"
+dest_files=[ "res://.import/rock_3.obj-25a12d271c599173a2a802010b38296e.mesh", "res://.import/rock_3.obj-25a12d271c599173a2a802010b38296e.mesh" ]
+
+[params]
+
+generate_tangents=true
+scale_mesh=Vector3( 1, 1, 1 )
+offset_mesh=Vector3( 0, 0, 0 )
+octahedral_compression=true
+optimize_mesh_flags=4286
diff --git a/world/obstacles/rock/rock_4.obj.import b/world/obstacles/rock/rock_4.obj.import
new file mode 100644
index 0000000..40d0a17
--- /dev/null
+++ b/world/obstacles/rock/rock_4.obj.import
@@ -0,0 +1,20 @@
+[remap]
+
+importer="wavefront_obj"
+type="Mesh"
+path="res://.import/rock_4.obj-e336a57eb233d92daa5c7d433c8532c7.mesh"
+
+[deps]
+
+files=[ "res://.import/rock_4.obj-e336a57eb233d92daa5c7d433c8532c7.mesh" ]
+
+source_file="res://world/obstacles/rock/rock_4.obj"
+dest_files=[ "res://.import/rock_4.obj-e336a57eb233d92daa5c7d433c8532c7.mesh", "res://.import/rock_4.obj-e336a57eb233d92daa5c7d433c8532c7.mesh" ]
+
+[params]
+
+generate_tangents=true
+scale_mesh=Vector3( 1, 1, 1 )
+offset_mesh=Vector3( 0, 0, 0 )
+octahedral_compression=true
+optimize_mesh_flags=4286
diff --git a/world/obstacles/rock/rock_collision.tres b/world/obstacles/rock/rock_collision.tres
new file mode 100644
index 0000000..c5b2554
--- /dev/null
+++ b/world/obstacles/rock/rock_collision.tres
@@ -0,0 +1,4 @@
+[gd_resource type="SphereShape" format=2]
+
+[resource]
+radius = 60.0
diff --git a/world/obstacles/Rock_lowres_mesh.tres b/world/obstacles/rock/rock_lowres_mesh.tres
index 910d7f6..c78ae9f 100644
--- a/world/obstacles/Rock_lowres_mesh.tres
+++ b/world/obstacles/rock/rock_lowres_mesh.tres
@@ -1,4 +1,4 @@
 [gd_resource type="CubeMesh" format=2]
 
 [resource]
-size = Vector3( 5, 10, 5 )
+size = Vector3( 60, 60, 60 )