Compare commits

..

No commits in common. "e811a84538d12475320d3e7942c4cba1d0e1640f" and "e7e85088e2d7b516e5ecf8ce87127cae144053f7" have entirely different histories.

9 changed files with 16 additions and 46 deletions

BIN
blends/balloon.blend (Stored with Git LFS)

Binary file not shown.

View File

@ -36,13 +36,12 @@ blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_vsncq") shadow_mesh = SubResource("ArrayMesh_vsncq")
[node name="balloon2" instance=ExtResource("1_y0aai")] [node name="balloon2" instance=ExtResource("1_y0aai")]
mass = 0.1
[node name="Balloon_String2" type="MeshInstance3D" parent="." index="1"] [node name="Balloon_String" 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) 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") mesh = SubResource("ArrayMesh_0v50y")
skeleton = NodePath("") skeleton = NodePath("")
[node name="Balloon" parent="." index="4"] [node name="Balloon" parent="." index="3"]
transform = Transform3D(0.299999, 0.000743196, 0.000234422, -0.0007434, 0.299999, 0.000261382, -0.000233774, -0.000261962, 0.3, 0, 0, 0) 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") surface_material_override/0 = ExtResource("2_5kbog")

View File

@ -1,25 +1,15 @@
[gd_scene load_steps=4 format=3 uid="uid://db3h7pscfif84"] [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="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"]
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_wfeli"] [ext_resource type="PackedScene" uid="uid://dkoiku0t4b0o7" path="res://Objects/balloon/string.tscn" id="3_7kjah"]
friction = 0.0
bounce = 12.8
[sub_resource type="SphereShape3D" id="SphereShape3D_pjfh4"]
radius = 0.258256
[node name="balloon" instance=ExtResource("1_sa42c")] [node name="balloon" instance=ExtResource("1_sa42c")]
mass = 0.01
physics_material_override = SubResource("PhysicsMaterial_wfeli")
gravity_scale = 0.0 gravity_scale = 0.0
[node name="Balloon_String" parent="." index="2"] [node name="Balloon" 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="Balloon" parent="." index="3"]
transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0) transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0)
material_override = ExtResource("2_uagtf")
[node name="CollisionShape3D" parent="." index="4"] [node name="string" parent="." index="4" instance=ExtResource("3_7kjah")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.239173, 0) transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0)
shape = SubResource("SphereShape3D_pjfh4")

View File

@ -1,8 +0,0 @@
[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

View File

@ -3,12 +3,12 @@
[ext_resource type="PackedScene" uid="uid://dmttoc025f26x" path="res://Domino.glb" id="1_n2u88"] [ext_resource type="PackedScene" uid="uid://dmttoc025f26x" path="res://Domino.glb" id="1_n2u88"]
[sub_resource type="BoxShape3D" id="BoxShape3D_ndu5u"] [sub_resource type="BoxShape3D" id="BoxShape3D_ndu5u"]
size = Vector3(0.153, 0.279, 0.066) size = Vector3(0.051, 0.093, 0.017)
[node name="Domino" instance=ExtResource("1_n2u88")] [node name="Domino" instance=ExtResource("1_n2u88")]
[node name="Domino2" parent="." index="2"] [node name="Domino2" parent="." index="2"]
transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0) transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0)
[node name="CollisionShape3D" parent="." index="3"] [node name="CollisionShape3D" parent="." index="3"]
transform = Transform3D(0.999984, 0, 0, 0, 0.999984, 0, 0, 0, 0.999984, 0, 0, 0) transform = Transform3D(0.999984, 0, 0, 0, 0.999984, 0, 0, 0, 0.999984, 0, 0, 0)

BIN
godot/balloon.glb (Stored with Git LFS)

Binary file not shown.

View File

@ -29,16 +29,6 @@ animation/trimming=false
animation/remove_immutable_tracks=true animation/remove_immutable_tracks=true
import_script/path="res://physics/import_billiard.gd" import_script/path="res://physics/import_billiard.gd"
_subresources={ _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": { "nodes": {
"PATH:Balloon": { "PATH:Balloon": {
"generate/physics": true, "generate/physics": true,

View File

@ -3,4 +3,3 @@
[ext_resource type="PackedScene" uid="uid://bsge8trc5uwb0" path="res://grape.glb" id="1_jlfas"] [ext_resource type="PackedScene" uid="uid://bsge8trc5uwb0" path="res://grape.glb" id="1_jlfas"]
[node name="grape" instance=ExtResource("1_jlfas")] [node name="grape" instance=ExtResource("1_jlfas")]
mass = 0.1

View File

@ -43,7 +43,7 @@ camera = NodePath("../Camera3D")
initial_target = NodePath("../grape") initial_target = NodePath("../grape")
[node name="grape" parent="." index="3" instance=ExtResource("3_gijly")] [node name="grape" parent="." index="3" instance=ExtResource("3_gijly")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.450543, 1.56762, 0.385236) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.56762, 0.385236)
[node name="grape2" parent="." index="4" instance=ExtResource("3_gijly")] [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) 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 autoplay = true
[node name="Domino" parent="." index="12" instance=ExtResource("11_2c1js")] [node name="Domino" parent="." index="12" instance=ExtResource("11_2c1js")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.50107, 1.55764, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.50107, 1.40023, 0)
[node name="balloon" parent="." index="13" instance=ExtResource("12_f4vmr")] [node name="balloon" parent="." index="13" instance=ExtResource("12_f4vmr")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 2, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 2, 0)