diff --git a/blends/balloon.blend b/blends/balloon.blend index 81184f5..ed39c84 100644 --- a/blends/balloon.blend +++ b/blends/balloon.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca4af7f107fefde045be788872b19f7a959adea255654234c6f56fe8983733e2 -size 4791497 +oid sha256:b12e1e43cd1b805c554a1701175e95bbf487c54390cf2e824f076d61da9429fc +size 4828061 diff --git a/godot/Objects/balloon/balloon.tscn b/godot/Objects/balloon/balloon.tscn index 290b01a..513a128 100644 --- a/godot/Objects/balloon/balloon.tscn +++ b/godot/Objects/balloon/balloon.tscn @@ -36,12 +36,13 @@ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_vsncq") [node name="balloon2" instance=ExtResource("1_y0aai")] +mass = 0.1 -[node name="Balloon_String" type="MeshInstance3D" parent="." index="1"] +[node name="Balloon_String2" type="MeshInstance3D" parent="." index="1"] transform = Transform3D(-0.00735031, 1.59288e-05, -5.56369e-06, 1.21871e-07, 1, -6.21002e-06, 5.56359e-06, -0.000844878, -0.00735031, 0, -1.5621, 0) mesh = SubResource("ArrayMesh_0v50y") skeleton = NodePath("") -[node name="Balloon" parent="." index="3"] +[node name="Balloon" parent="." index="4"] transform = Transform3D(0.299999, 0.000743196, 0.000234422, -0.0007434, 0.299999, 0.000261382, -0.000233774, -0.000261962, 0.3, 0, 0, 0) surface_material_override/0 = ExtResource("2_5kbog") diff --git a/godot/Objects/balloon/balloon2.tscn b/godot/Objects/balloon/balloon2.tscn index 321bb7d..6233bd8 100644 --- a/godot/Objects/balloon/balloon2.tscn +++ b/godot/Objects/balloon/balloon2.tscn @@ -1,15 +1,25 @@ [gd_scene load_steps=4 format=3 uid="uid://db3h7pscfif84"] [ext_resource type="PackedScene" uid="uid://dl005e2rvn86b" path="res://balloon.glb" id="1_sa42c"] -[ext_resource type="Material" uid="uid://cqhehgwersrkl" path="res://Objects/balloon/balloon_material_standard.tres" id="2_uagtf"] -[ext_resource type="PackedScene" uid="uid://dkoiku0t4b0o7" path="res://Objects/balloon/string.tscn" id="3_7kjah"] + +[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_wfeli"] +friction = 0.0 +bounce = 12.8 + +[sub_resource type="SphereShape3D" id="SphereShape3D_pjfh4"] +radius = 0.258256 [node name="balloon" instance=ExtResource("1_sa42c")] +mass = 0.01 +physics_material_override = SubResource("PhysicsMaterial_wfeli") gravity_scale = 0.0 -[node name="Balloon" parent="." index="2"] -transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0) -material_override = ExtResource("2_uagtf") +[node name="Balloon_String" parent="." index="2"] +transform = Transform3D(-0.002, 0, -1.74846e-10, 0, 0.286, 0, 1.74846e-10, 0, -0.002, 0, -0.378486, 0) -[node name="string" parent="." index="4" instance=ExtResource("3_7kjah")] +[node name="Balloon" parent="." index="3"] transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0) + +[node name="CollisionShape3D" parent="." index="4"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.239173, 0) +shape = SubResource("SphereShape3D_pjfh4") diff --git a/godot/Objects/balloon/string.tres b/godot/Objects/balloon/string.tres new file mode 100644 index 0000000..317ff72 --- /dev/null +++ b/godot/Objects/balloon/string.tres @@ -0,0 +1,8 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://3r1biqr3c4l7"] + +[resource] +resource_name = "string" +cull_mode = 2 +vertex_color_use_as_albedo = true +albedo_color = Color(0.906332, 0.906332, 0.906332, 1) +roughness = 0.5 diff --git a/godot/Objects/domino/domino2.tscn b/godot/Objects/domino/domino2.tscn index 142c4a7..169a1b8 100644 --- a/godot/Objects/domino/domino2.tscn +++ b/godot/Objects/domino/domino2.tscn @@ -3,12 +3,12 @@ [ext_resource type="PackedScene" uid="uid://dmttoc025f26x" path="res://Domino.glb" id="1_n2u88"] [sub_resource type="BoxShape3D" id="BoxShape3D_ndu5u"] -size = Vector3(0.051, 0.093, 0.017) +size = Vector3(0.153, 0.279, 0.066) [node name="Domino" instance=ExtResource("1_n2u88")] [node name="Domino2" parent="." index="2"] -transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0) +transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0) [node name="CollisionShape3D" parent="." index="3"] transform = Transform3D(0.999984, 0, 0, 0, 0.999984, 0, 0, 0, 0.999984, 0, 0, 0) diff --git a/godot/balloon.glb b/godot/balloon.glb index e23c400..580c911 100644 --- a/godot/balloon.glb +++ b/godot/balloon.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e326f8928bc57c780a906ddc5b6465cf65e71c2045dc05c221d8901f53320e65 -size 17400 +oid sha256:2af87e8c6333ee2ed54d3f676c5e4f2a76834f7115603469b4a7da78c28fa930 +size 43232 diff --git a/godot/balloon.glb.import b/godot/balloon.glb.import index b823471..b2b9b63 100644 --- a/godot/balloon.glb.import +++ b/godot/balloon.glb.import @@ -29,6 +29,16 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="res://physics/import_billiard.gd" _subresources={ +"materials": { +"balloon": { +"use_external/enabled": true, +"use_external/path": "res://Objects/balloon/balloon_material_standard.tres" +}, +"string": { +"use_external/enabled": true, +"use_external/path": "res://Objects/balloon/string.tres" +} +}, "nodes": { "PATH:Balloon": { "generate/physics": true, diff --git a/godot/physics/grape.tscn b/godot/physics/grape.tscn index cfabd01..745da3e 100644 --- a/godot/physics/grape.tscn +++ b/godot/physics/grape.tscn @@ -3,3 +3,4 @@ [ext_resource type="PackedScene" uid="uid://bsge8trc5uwb0" path="res://grape.glb" id="1_jlfas"] [node name="grape" instance=ExtResource("1_jlfas")] +mass = 0.1 diff --git a/godot/tests/control_scheme/test_basic_controls.tscn b/godot/tests/control_scheme/test_basic_controls.tscn index 49271aa..5f6bea2 100644 --- a/godot/tests/control_scheme/test_basic_controls.tscn +++ b/godot/tests/control_scheme/test_basic_controls.tscn @@ -43,7 +43,7 @@ camera = NodePath("../Camera3D") initial_target = NodePath("../grape") [node name="grape" parent="." index="3" instance=ExtResource("3_gijly")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.56762, 0.385236) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.450543, 1.56762, 0.385236) [node name="grape2" parent="." index="4" instance=ExtResource("3_gijly")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.115958, 1.77839, -0.189013) @@ -92,7 +92,7 @@ stream = ExtResource("10_4mw33") autoplay = true [node name="Domino" parent="." index="12" instance=ExtResource("11_2c1js")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.50107, 1.40023, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.50107, 1.55764, 0) [node name="balloon" parent="." index="13" instance=ExtResource("12_f4vmr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 2, 0)