aboutsummaryrefslogtreecommitdiffstats
path: root/godot/scenes
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--godot/scenes/Game.tscn11
-rw-r--r--godot/scenes/SpinningCube.tscn6
-rw-r--r--godot/scenes/W8.tscn7
-rw-r--r--godot/scenes/levels/test_scene/Floor.tscn17
-rw-r--r--godot/scenes/levels/test_scene/TestScene.tscn7
-rw-r--r--godot/scenes/objects/Goal.tscn3
6 files changed, 37 insertions, 14 deletions
diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn
index a37a7eb..ba84e42 100644
--- a/godot/scenes/Game.tscn
+++ b/godot/scenes/Game.tscn
@@ -1,9 +1,7 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=3 format=2]
[ext_resource path="res://native/Game.gdns" type="Script" id=1]
-[ext_resource path="res://scenes/SpinningCube.tscn" type="PackedScene" id=2]
-
-[sub_resource type="CubeMesh" id=1]
+[ext_resource path="res://scenes/levels/test_scene/TestScene.tscn" type="PackedScene" id=2]
[node name="Game" type="Spatial"]
script = ExtResource( 1 )
@@ -12,7 +10,4 @@ script = ExtResource( 1 )
transform = Transform( 0.572229, -0.327396, 0.751909, 0, 0.916856, 0.399217, -0.820094, -0.228443, 0.524651, 4.71648, 2.5, 3.45846 )
current = true
-[node name="SpinningCube" parent="." instance=ExtResource( 2 )]
-mesh = SubResource( 1 )
-material/0 = null
-base/rotate_speed = 1.0
+[node name="TestScene" parent="." instance=ExtResource( 2 )]
diff --git a/godot/scenes/SpinningCube.tscn b/godot/scenes/SpinningCube.tscn
deleted file mode 100644
index 4a41ab3..0000000
--- a/godot/scenes/SpinningCube.tscn
+++ /dev/null
@@ -1,6 +0,0 @@
-[gd_scene load_steps=2 format=2]
-
-[ext_resource path="res://native/SpinningCube.gdns" type="Script" id=1]
-
-[node name="SpinningCube" type="MeshInstance"]
-script = ExtResource( 1 )
diff --git a/godot/scenes/W8.tscn b/godot/scenes/W8.tscn
new file mode 100644
index 0000000..af5782d
--- /dev/null
+++ b/godot/scenes/W8.tscn
@@ -0,0 +1,7 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://assets/game_objects/W8.gltf" type="PackedScene" id=1]
+
+[node name="W8" instance=ExtResource( 1 )]
+
+[node name="CollisionShape" type="CollisionShape" parent="." index="1"]
diff --git a/godot/scenes/levels/test_scene/Floor.tscn b/godot/scenes/levels/test_scene/Floor.tscn
new file mode 100644
index 0000000..5b58b9f
--- /dev/null
+++ b/godot/scenes/levels/test_scene/Floor.tscn
@@ -0,0 +1,17 @@
+[gd_scene load_steps=3 format=2]
+
+[sub_resource type="CubeMesh" id=1]
+
+[sub_resource type="BoxShape" id=2]
+
+[node name="StaticBody" type="StaticBody"]
+
+[node name="MeshInstance" type="MeshInstance" parent="."]
+transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0 )
+mesh = SubResource( 1 )
+skeleton = NodePath("../CollisionShape")
+material/0 = null
+
+[node name="CollisionShape" type="CollisionShape" parent="."]
+transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0 )
+shape = SubResource( 2 )
diff --git a/godot/scenes/levels/test_scene/TestScene.tscn b/godot/scenes/levels/test_scene/TestScene.tscn
new file mode 100644
index 0000000..5775e39
--- /dev/null
+++ b/godot/scenes/levels/test_scene/TestScene.tscn
@@ -0,0 +1,7 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://scenes/levels/test_scene/Floor.tscn" type="PackedScene" id=1]
+
+[node name="TestScene" type="Spatial"]
+
+[node name="Floor" parent="." instance=ExtResource( 1 )]
diff --git a/godot/scenes/objects/Goal.tscn b/godot/scenes/objects/Goal.tscn
new file mode 100644
index 0000000..23ce4c5
--- /dev/null
+++ b/godot/scenes/objects/Goal.tscn
@@ -0,0 +1,3 @@
+[gd_scene format=2]
+
+[node name="Goal" type="MeshInstance"]