aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--godot/scenes/levels/test_scene/TestScene.tscn11
-rw-r--r--godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn2
-rw-r--r--godot/scenes/objects/W8.tscn16
-rw-r--r--godot/scenes/scripts/roblox-cube.gd4
4 files changed, 18 insertions, 15 deletions
diff --git a/godot/scenes/levels/test_scene/TestScene.tscn b/godot/scenes/levels/test_scene/TestScene.tscn
new file mode 100644
index 0000000..ed981f8
--- /dev/null
+++ b/godot/scenes/levels/test_scene/TestScene.tscn
@@ -0,0 +1,11 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://scenes/levels/test_scene/Floor.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scenes/W8.tscn" type="PackedScene" id=2]
+
+[node name="TestScene" type="Spatial"]
+
+[node name="Floor" parent="." instance=ExtResource( 1 )]
+
+[node name="RigidBody" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0339947, 2.91518, -1.40456 )
diff --git a/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn b/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn
index d109705..a8f9003 100644
--- a/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn
+++ b/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn
@@ -10,6 +10,8 @@
[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 )]
diff --git a/godot/scenes/objects/W8.tscn b/godot/scenes/objects/W8.tscn
index b73df95..91f58eb 100644
--- a/godot/scenes/objects/W8.tscn
+++ b/godot/scenes/objects/W8.tscn
@@ -1,6 +1,5 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=4 format=2]
-[ext_resource path="res://assets/game_objects/W8.gltf" type="PackedScene" id=1]
[ext_resource path="res://assets/game_objects/W8baseColor_Mat.material" type="Material" id=2]
[sub_resource type="ArrayMesh" id=1]
@@ -21,19 +20,12 @@ surfaces/0 = {
[sub_resource type="ConvexPolygonShape" id=2]
points = PoolVector3Array( -0.0850063, -0.879389, -0.0282584, 0.0288993, 0.929375, 0.0289349, 0.0288993, 0.929375, -0.0289349, 0.929367, -0.0289314, 0.0289314, -0.0289784, -0.0289338, 0.929338, -0.929369, 0.028929, 0.028929, 0.0288993, -0.0289349, -0.929375, 0.0288993, -0.929375, 0.0289349, -0.0850063, 0.0282584, -0.879389, 0.0282247, 0.084959, 0.87945, 0.857489, 0.056933, -0.0855785, -0.879454, -0.0849424, 0.0282549, 0.0570775, -0.885814, -0.0571088, 0.0570775, -0.0571088, 0.885814, -0.0571532, 0.885743, -0.0571043, -0.0571532, 0.885743, 0.0571043, 0.0570775, 0.0571088, -0.885814, -0.885806, -0.057097, -0.057097, 0.879446, 0.0849494, 0.0282572, 0.857335, -0.0571018, -0.0855632, -0.0571532, 0.0571043, 0.885743, -0.0571532, -0.885743, 0.0571043, -0.885806, 0.057097, -0.057097, -0.0571532, -0.0571043, -0.885743, 0.0570775, 0.0571088, 0.885814, -0.0571532, -0.885743, -0.0571043, -0.0571532, 0.0571043, -0.885743, 0.0570775, -0.885814, 0.0571088, 0.0570775, 0.885814, 0.0571088, -0.0571532, -0.0571043, 0.885743, -0.885806, 0.057097, 0.057097, 0.0570775, 0.885814, -0.0571088, 0.0570775, -0.0571088, -0.885814, 0.857335, -0.0571018, 0.0855632, -0.885806, -0.057097, 0.057097, 0.857489, 0.056933, 0.0855785, 0.929425, 0.0287513, -0.0289333, 0.929367, -0.0289314, -0.0289314, -0.0289784, 0.929338, -0.0289338, 0.0288993, 0.0289349, -0.929375, -0.929369, -0.028929, -0.028929, -0.0283039, -0.87942, -0.0849561, 0.084933, 0.0282608, 0.879461, -0.0289784, 0.929338, 0.0289338, -0.0289784, -0.0289338, -0.929338, -0.0289784, 0.0289338, 0.929338, 0.0288993, -0.0289349, 0.929375, 0.0288993, -0.929375, -0.0289349, -0.0289784, -0.929338, 0.0289338, -0.929369, 0.028929, -0.028929, -0.0283039, 0.0849561, -0.87942, -0.879454, -0.0282549, 0.0849424, 0.879512, 0.0280816, 0.0849558, 0.879446, -0.0849494, -0.0282572, -0.0282988, -0.822574, 0.141805, 0.17021, 0.0280745, -0.794261, -0.879454, 0.0849424, -0.0282549, -0.0283039, 0.87942, 0.0849561, 0.0282247, 0.87945, -0.084959, 0.0282247, -0.084959, -0.87945, -0.879454, -0.0282549, -0.0849424, -0.0850063, 0.0282584, 0.879389, -0.0850063, 0.879389, 0.0282584, 0.084933, -0.0282608, 0.879461 )
-[node name="W8" instance=ExtResource( 1 )]
+[node name="RigidBody" type="RigidBody"]
-[node name="RigidBody" type="RigidBody" parent="." index="0"]
-contacts_reported = 6
-contact_monitor = true
-
-[node name="Cone" type="MeshInstance" parent="RigidBody" index="0"]
+[node name="Cone" type="MeshInstance" parent="."]
mesh = SubResource( 1 )
skeleton = NodePath("../..")
material/0 = null
-[node name="CollisionShape" type="CollisionShape" parent="RigidBody" index="1"]
+[node name="CollisionShape" type="CollisionShape" parent="."]
shape = SubResource( 2 )
-
-[node name="Cone" parent="." index="1"]
-visible = false
diff --git a/godot/scenes/scripts/roblox-cube.gd b/godot/scenes/scripts/roblox-cube.gd
index ac12159..453067b 100644
--- a/godot/scenes/scripts/roblox-cube.gd
+++ b/godot/scenes/scripts/roblox-cube.gd
@@ -5,17 +5,15 @@ extends Spatial
# var a = 2
# var b = "text"
func on_collision(other):
- print("b")
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 = get_node("RigidBody")
+ var rb = self
rb.apply_impulse(Vector3(), Vector3(40, 1, 10))
rb.connect("body_entered", self, "on_collision")
- print("a")
# Called every frame. 'delta' is the elapsed time since the previous frame.