Merge branch 'uuuhhh'

6 files changed, 95 insertions, 5 deletions

diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn
index cdf43b5..f8b17cb 100644
--- a/godot/scenes/Game.tscn
+++ b/godot/scenes/Game.tscn
@@ -1,13 +1,14 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://native/Game.gdns" type="Script" id=1]
-[ext_resource path="res://scenes/levels/test_scene/TestScene.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn" type="PackedScene" id=2]
 
 [node name="Game" type="Spatial"]
 script = ExtResource( 1 )
 
 [node name="Camera" type="Camera" parent="."]
-transform = Transform( 0.851268, -0.209482, 0.481104, -0.0793804, 0.854894, 0.512694, -0.518693, -0.47463, 0.711115, 4.71648, 5.18863, 3.45846 )
+transform = Transform( -0.538224, 0.336461, -0.772728, 0, 0.916856, 0.399217, 0.842802, 0.214868, -0.493474, -6.58972, 3.31005, -7.31211 )
 current = true
+fov = 64.6875
 
-[node name="TestScene" parent="." instance=ExtResource( 2 )]
+[node name="TestSceneUuuhhh" parent="." instance=ExtResource( 2 )]
diff --git a/godot/scenes/levels/test_scene/Floor.tscn b/godot/scenes/levels/test_scene_uuuhhh/Floor.tscn
index 5b58b9f..f8970a7 100644
--- a/godot/scenes/levels/test_scene/Floor.tscn
+++ b/godot/scenes/levels/test_scene_uuuhhh/Floor.tscn
@@ -1,7 +1,12 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://assets/textures/grass-texture-26.jpg" type="Texture" id=1]
 
 [sub_resource type="CubeMesh" id=1]
 
+[sub_resource type="SpatialMaterial" id=3]
+albedo_texture = ExtResource( 1 )
+
 [sub_resource type="BoxShape" id=2]
 
 [node name="StaticBody" type="StaticBody"]
@@ -10,7 +15,7 @@
 transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0 )
 mesh = SubResource( 1 )
 skeleton = NodePath("../CollisionShape")
-material/0 = null
+material/0 = SubResource( 3 )
 
 [node name="CollisionShape" type="CollisionShape" parent="."]
 transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0 )
diff --git a/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn b/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn
new file mode 100644
index 0000000..a8f9003
--- /dev/null
+++ b/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn
@@ -0,0 +1,39 @@
+[gd_scene load_steps=6 format=2]
+
+[ext_resource path="res://scenes/levels/test_scene_uuuhhh/Wall.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scenes/levels/test_scene_uuuhhh/Floor.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scenes/scripts/roblox-cube.gd" type="Script" id=3]
+[ext_resource path="res://assets/sounds/Uuhhh.mp3" type="AudioStream" id=4]
+[ext_resource path="res://scenes/objects/W8.tscn" type="PackedScene" id=5]
+
+[node name="TestScene" type="Spatial"]
+
+[node name="W8" parent="." instance=ExtResource( 5 )]
+transform = Transform( 0.990268, 0.0360207, 0.134431, 0, 0.965926, -0.258819, -0.139173, 0.2563, 0.956525, -2.57174, 1.79727, 8.45058 )
+contacts_reported = 3
+contact_monitor = true
+script = ExtResource( 3 )
+
+[node name="Floor" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0290833, -0.981747, 0.00208664 )
+
+[node name="Floor2" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 20 )
+
+[node name="Floor3" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 20, -1, 0 )
+
+[node name="Floor4" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 20, -1, 20 )
+
+[node name="Floor5" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 40, -1, 0 )
+
+[node name="Floor6" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 40, -1, 20 )
+
+[node name="Wall" parent="." instance=ExtResource( 1 )]
+transform = Transform( 0.766044, 0, -0.642788, 0, 2, 0, 0.642788, 0, 0.766044, 19.47, 0, 14.7187 )
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 4 )
diff --git a/godot/scenes/levels/test_scene_uuuhhh/Wall.tscn b/godot/scenes/levels/test_scene_uuuhhh/Wall.tscn
new file mode 100644
index 0000000..e3afe23
--- /dev/null
+++ b/godot/scenes/levels/test_scene_uuuhhh/Wall.tscn
@@ -0,0 +1,23 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://assets/textures/sandstone-brick-wall-texture.jpg" type="Texture" id=1]
+
+[sub_resource type="CubeMesh" id=1]
+
+[sub_resource type="SpatialMaterial" id=2]
+albedo_texture = ExtResource( 1 )
+
+[sub_resource type="ConvexPolygonShape" id=3]
+points = PoolVector3Array( 1, 1, 1, 1, 1, -1, -1, 1, 1, 1, -1, 1, 1, -1, -1, -1, 1, -1, -1, -1, 1, -1, -1, -1 )
+
+[node name="StaticBody" type="StaticBody"]
+
+[node name="MeshInstance" type="MeshInstance" parent="."]
+transform = Transform( 0.3, 0, 0, 0, 1, 0, 0, 0, 5, 0, 1, 0 )
+mesh = SubResource( 1 )
+skeleton = NodePath("")
+material/0 = SubResource( 2 )
+
+[node name="CollisionShape" type="CollisionShape" parent="."]
+transform = Transform( 0.3, 0, 0, 0, 1, 0, 0, 0, 5, 0, 1, 0 )
+shape = SubResource( 3 )
diff --git a/godot/scenes/W8.tscn b/godot/scenes/objects/W8.tscn
index 91f58eb..91f58eb 100644
--- a/godot/scenes/W8.tscn
+++ b/godot/scenes/objects/W8.tscn
diff --git a/godot/scenes/scripts/roblox-cube.gd b/godot/scenes/scripts/roblox-cube.gd
new file mode 100644
index 0000000..453067b
--- /dev/null
+++ b/godot/scenes/scripts/roblox-cube.gd
@@ -0,0 +1,22 @@
+extends Spatial
+
+
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+func on_collision(other):
+	var ap = get_parent().get_node("AudioStreamPlayer")
+	ap.play()
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	var rb = self
+	rb.apply_impulse(Vector3(), Vector3(40, 1, 10))
+	rb.connect("body_entered", self, "on_collision")
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass
+