Visual obstacles and floor

6 files changed, 91 insertions, 7 deletions

diff --git a/Assets/Environment/Floor_tile.png b/Assets/Environment/Floor_tile.png
new file mode 100644
index 0000000..9639b64
--- /dev/null
+++ b/Assets/Environment/Floor_tile.png
diff --git a/Assets/Environment/Floor_tile.png.import b/Assets/Environment/Floor_tile.png.import
new file mode 100644
index 0000000..4c5bb5b
--- /dev/null
+++ b/Assets/Environment/Floor_tile.png.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Floor_tile.png-7fe69137fc54b01ab1a5cda6823a6b0b.s3tc.stex"
+path.etc="res://.import/Floor_tile.png-7fe69137fc54b01ab1a5cda6823a6b0b.etc.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/Environment/Floor_tile.png"
+dest_files=[ "res://.import/Floor_tile.png-7fe69137fc54b01ab1a5cda6823a6b0b.s3tc.stex", "res://.import/Floor_tile.png-7fe69137fc54b01ab1a5cda6823a6b0b.etc.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0
diff --git a/Assets/Environment/Obstacle.png b/Assets/Environment/Obstacle.png
new file mode 100644
index 0000000..715e1df
--- /dev/null
+++ b/Assets/Environment/Obstacle.png
diff --git a/Assets/Environment/Obstacle.png.import b/Assets/Environment/Obstacle.png.import
new file mode 100644
index 0000000..d76ef1d
--- /dev/null
+++ b/Assets/Environment/Obstacle.png.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Obstacle.png-da861dec256e64c656fd4bebbe253eb5.s3tc.stex"
+path.etc="res://.import/Obstacle.png-da861dec256e64c656fd4bebbe253eb5.etc.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/Environment/Obstacle.png"
+dest_files=[ "res://.import/Obstacle.png-da861dec256e64c656fd4bebbe253eb5.s3tc.stex", "res://.import/Obstacle.png-da861dec256e64c656fd4bebbe253eb5.etc.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0
diff --git a/Scenes/Dungeon.tscn b/Scenes/Dungeon.tscn
index 5ca40d8..5795e4d 100644
--- a/Scenes/Dungeon.tscn
+++ b/Scenes/Dungeon.tscn
@@ -1,10 +1,17 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://Scenes/Dungeon.gd" type="Script" id=1]
 [ext_resource path="res://Scenes/CameraControl.gd" type="Script" id=2]
+[ext_resource path="res://Assets/Environment/Floor_tile.png" type="Texture" id=3]
 
 [sub_resource type="PlaneMesh" id=1]
 
+[sub_resource type="SpatialMaterial" id=4]
+albedo_color = Color( 0.694118, 0.505882, 0.666667, 1 )
+albedo_texture = ExtResource( 3 )
+uv1_scale = Vector3( 12, 12, 1 )
+uv1_offset = Vector3( 0.25, 0.25, 1 )
+
 [sub_resource type="ProceduralSky" id=2]
 
 [sub_resource type="Environment" id=3]
@@ -17,9 +24,9 @@ dof_blur_far_amount = 0.06
 script = ExtResource( 1 )
 
 [node name="Floor" type="MeshInstance" parent="."]
-transform = Transform( 12.2453, 0, 0, 0, 1, 0, 0, 0, 12.2453, 0, 0, 0 )
+transform = Transform( 12, 0, 0, 0, 1, 0, 0, 0, 12, 0, 0, 0 )
 mesh = SubResource( 1 )
-material/0 = null
+material/0 = SubResource( 4 )
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource( 3 )
diff --git a/Scenes/Obstacle.tscn b/Scenes/Obstacle.tscn
index a768039..40d9338 100644
--- a/Scenes/Obstacle.tscn
+++ b/Scenes/Obstacle.tscn
@@ -1,18 +1,21 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://Scenes/Entity.gd" type="Script" id=1]
+[ext_resource path="res://Assets/Environment/Obstacle.png" type="Texture" id=2]
 
 [sub_resource type="CubeMesh" id=6]
-size = Vector3( 0.8, 0.8, 0.8 )
+size = Vector3( 1, 1, 1 )
 
 [sub_resource type="SpatialMaterial" id=5]
-albedo_color = Color( 0.976471, 0.541176, 0.541176, 1 )
+albedo_color = Color( 0.627451, 0.701961, 0.788235, 1 )
+albedo_texture = ExtResource( 2 )
+uv1_scale = Vector3( 3, 2, 1 )
 
 [node name="Obstacle" type="Spatial"]
 script = ExtResource( 1 )
 
 [node name="Mesh" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.4, 0 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0 )
 mesh = SubResource( 6 )
 skeleton = NodePath("../..")
 material/0 = SubResource( 5 )