diff options
| -rw-r--r-- | godot/project.godot | 2 | ||||
| -rw-r--r-- | godot/scenes/Game.tscn | 2 | ||||
| -rw-r--r-- | godot/scenes/W8.tscn | 11 | ||||
| -rw-r--r-- | godot/scenes/levels/test_scene/TestScene.tscn | 6 |
4 files changed, 11 insertions, 10 deletions
diff --git a/godot/project.godot b/godot/project.godot index 914091e..01c44a7 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -15,7 +15,7 @@ _global_script_class_icons={ [application] config/name="code-with-your-friends2022" -config/icon="res://assets/godot-ferris-32x32.png" +run/main_scene="res://scenes/Game.tscn" [rendering] diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn index ba84e42..cdf43b5 100644 --- a/godot/scenes/Game.tscn +++ b/godot/scenes/Game.tscn @@ -7,7 +7,7 @@ script = ExtResource( 1 ) [node name="Camera" type="Camera" parent="."] -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 ) +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 ) current = true [node name="TestScene" parent="." instance=ExtResource( 2 )] diff --git a/godot/scenes/W8.tscn b/godot/scenes/W8.tscn index 1cf2dba..91f58eb 100644 --- a/godot/scenes/W8.tscn +++ b/godot/scenes/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,14 +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"] - -[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 ) diff --git a/godot/scenes/levels/test_scene/TestScene.tscn b/godot/scenes/levels/test_scene/TestScene.tscn index 5775e39..ed981f8 100644 --- a/godot/scenes/levels/test_scene/TestScene.tscn +++ b/godot/scenes/levels/test_scene/TestScene.tscn @@ -1,7 +1,11 @@ -[gd_scene load_steps=2 format=2] +[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 ) |