Merge pull request #6 from jumpy-cat/dev

feat: new and improved physics (animation only for now)

Author: jumpy-cat

Cargo.lock

@@ -1,4 +1,4 @@
-[gd_scene load_steps=11 format=3 uid="uid://br738eihq2cus"]
+[gd_scene load_steps=13 format=3 uid="uid://br738eihq2cus"]
 
 [ext_resource type="Script" path="res://main.gd" id="1_w5dqp"]
 [ext_resource type="PackedScene" uid="uid://c3vuka4b0smhh" path="res://control_point.tscn" id="2_o72i1"]
@@ -20,6 +20,12 @@ LineEdit/colors/font_color = Color(0.875, 0.875, 0.875, 1)
 
 [sub_resource type="Theme" id="Theme_b8h1k"]
 
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_mwvwa"]
+shading_mode = 0
+vertex_color_use_as_albedo = true
+
+[sub_resource type="ImmediateMesh" id="ImmediateMesh_oh57q"]
+
 [node name="Main" type="Node3D"]
 script = ExtResource("1_w5dqp")
 control_point_scene = ExtResource("2_o72i1")
@@ -44,6 +50,7 @@ mesh = SubResource("ImmediateMesh_hneuq")
 
 [node name="Anim" parent="." instance=ExtResource("4_s6s4g")]
 visible = false
+script = null
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 offset_left = 40.0
@@ -69,6 +76,15 @@ text = "Optimizer"
 layout_mode = 2
 text = "-- iter/s"
 
+[node name="CheckBox" type="CheckBox" parent="VBoxContainer"]
+layout_mode = 2
+text = "Manual Physics"
+
+[node name="AnimStepEdit" parent="VBoxContainer" instance=ExtResource("5_svsvn")]
+layout_mode = 2
+_name = "Anim Step:"
+value = 0.01
+
 [node name="LREdit" parent="VBoxContainer" instance=ExtResource("5_svsvn")]
 layout_mode = 2
 _name = "LR:"
@@ -125,10 +141,17 @@ use_native_dialog = true
 
 [node name="SaveDialogue" type="FileDialog" parent="."]
 size = Vector2i(303, 180)
+ok_button_text = "Save"
 access = 2
 use_native_dialog = true
 
+[node name="HLNormal" type="MeshInstance3D" parent="."]
+material_overlay = SubResource("StandardMaterial3D_mwvwa")
+mesh = SubResource("ImmediateMesh_oh57q")
+
 [connection signal="toggled" from="VBoxContainer/CheckButton" to="." method="_on_check_button_toggled"]
+[connection signal="toggled" from="VBoxContainer/CheckBox" to="." method="_on_check_box_toggled"]
+[connection signal="value_changed" from="VBoxContainer/AnimStepEdit" to="." method="_on_anim_step_edit_value_changed"]
 [connection signal="value_changed" from="VBoxContainer/LREdit" to="." method="_on_lr_edit_value_changed"]
 [connection signal="value_changed" from="VBoxContainer/MassEdit" to="." method="_on_mass_edit_value_changed"]
 [connection signal="value_changed" from="VBoxContainer/GravityEdit" to="." method="_on_gravity_edit_value_changed"]

godot/Main.tscn

@@ -1,4 +1,6 @@
-[gd_scene load_steps=4 format=3 uid="uid://dp1iulbnn6wvy"]
+[gd_scene load_steps=8 format=3 uid="uid://dp1iulbnn6wvy"]
+
+[sub_resource type="GDScript" id="GDScript_gxknm"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_38yrt"]
 diffuse_mode = 2
@@ -12,7 +14,17 @@ height = 2.0
 [sub_resource type="SphereShape3D" id="SphereShape3D_r0wmb"]
 radius = 1.0
 
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_q7vat"]
+diffuse_mode = 2
+
+[sub_resource type="CapsuleMesh" id="CapsuleMesh_ncu23"]
+material = SubResource("StandardMaterial3D_q7vat")
+height = 5.0
+
+[sub_resource type="ImmediateMesh" id="ImmediateMesh_teg0u"]
+
 [node name="Anim" type="Node3D"]
+script = SubResource("GDScript_gxknm")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 mesh = SubResource("SphereMesh_su52i")
@@ -21,3 +33,10 @@ mesh = SubResource("SphereMesh_su52i")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 shape = SubResource("SphereShape3D_r0wmb")
+
+[node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.70093, 0)
+mesh = SubResource("CapsuleMesh_ncu23")
+
+[node name="MeshInstance3D3" type="MeshInstance3D" parent="."]
+mesh = SubResource("ImmediateMesh_teg0u")

godot/anim.tscn

@@ -11,64 +11,64 @@ signal clicked(index)
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-    var mat: StandardMaterial3D = StandardMaterial3D.new()
-    mat.vertex_color_use_as_albedo = true
-    mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
-    axes.material_override = mat
-    var m: ImmediateMesh = axes.mesh
-    m.clear_surfaces()
-    #m.surface_begin(Mesh.PRIMITIVE_TRIANGLES)
+	var mat: StandardMaterial3D = StandardMaterial3D.new()
+	mat.vertex_color_use_as_albedo = true
+	mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
+	axes.material_override = mat
+	var m: ImmediateMesh = axes.mesh
+	m.clear_surfaces()
+	#m.surface_begin(Mesh.PRIMITIVE_TRIANGLES)
 
-    m.surface_begin(Mesh.PRIMITIVE_LINES)
+	m.surface_begin(Mesh.PRIMITIVE_LINES)
 
-    m.surface_set_color(Color.RED)
-    m.surface_add_vertex(Vector3.ZERO)
-    m.surface_set_color(Color.RED)
-    m.surface_add_vertex(Vector3(100, 0, 0))
+	m.surface_set_color(Color.RED)
+	m.surface_add_vertex(Vector3.ZERO)
+	m.surface_set_color(Color.RED)
+	m.surface_add_vertex(Vector3(100, 0, 0))
 
-    m.surface_set_color(Color.GREEN)
-    m.surface_add_vertex(Vector3.ZERO)
-    m.surface_set_color(Color.GREEN)
-    m.surface_add_vertex(Vector3(0, 100, 0))
+	m.surface_set_color(Color.GREEN)
+	m.surface_add_vertex(Vector3.ZERO)
+	m.surface_set_color(Color.GREEN)
+	m.surface_add_vertex(Vector3(0, 100, 0))
 
-    m.surface_set_color(Color.SKY_BLUE)
-    m.surface_add_vertex(Vector3.ZERO)
-    m.surface_set_color(Color.SKY_BLUE)
-    m.surface_add_vertex(Vector3(0, 0, 100))
+	m.surface_set_color(Color.SKY_BLUE)
+	m.surface_add_vertex(Vector3.ZERO)
+	m.surface_set_color(Color.SKY_BLUE)
+	m.surface_add_vertex(Vector3(0, 0, 100))
 
-    m.surface_end()
+	m.surface_end()
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(_delta: float) -> void:
-    if selected or hovered:
-        scale = Vector3(2.0, 2.0, 2.0)
-    else:
-        scale = Vector3.ONE
-    axes.visible = selected 
+	if selected or hovered:
+		scale = Vector3(2.0, 2.0, 2.0)
+	else:
+		scale = Vector3.ONE
+	axes.visible = selected 
 
 
 func initialize(pos: Vector3, index_: int) -> void:
-    translate(pos)
-    index = index_
+	translate(pos)
+	index = index_
 
 
 ## Increase size when mouse hovering over control point
 func _on_static_body_3d_mouse_entered() -> void:
-    hovered = true
+	hovered = true
 
 
 ## Reset size when mouse leaves control point
 func _on_static_body_3d_mouse_exited() -> void:
-    hovered = false
+	hovered = false
 
 
 ## Handle mouse click on control point
 func _on_static_body_3d_input_event(
-    _camera: Node,
-    event: InputEvent,
-    _event_position: Vector3,
-    _normal: Vector3,
-    _shape_idx: int
+	_camera: Node,
+	event: InputEvent,
+	_event_position: Vector3,
+	_normal: Vector3,
+	_shape_idx: int
 ) -> void:
-    if event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_LEFT and event.is_pressed():
-        clicked.emit(index)
+	if event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_LEFT and event.is_pressed():
+		clicked.emit(index)