diff --git a/scenes/draggable_object.tscn b/scenes/draggable_object.tscn index f003b23..2ac849d 100644 --- a/scenes/draggable_object.tscn +++ b/scenes/draggable_object.tscn @@ -1,15 +1,17 @@ [gd_scene load_steps=5 format=3 uid="uid://bjxjcx2qu16q5"] -[ext_resource type="Script" uid="uid://bjnv2g1ni0525" path="res://src/draggable_object.gd" id="1_vcwhe"] +[ext_resource type="Script" uid="uid://bjnv2g1ni0525" path="res://src/drag/draggable_object.gd" id="1_vcwhe"] [sub_resource type="SphereShape3D" id="SphereShape3D_vcwhe"] radius = 0.49570328 -[sub_resource type="SphereShape3D" id="SphereShape3D_18ddp"] -radius = 0.25 +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_vcwhe"] +radius = 0.1 +height = 0.7 -[sub_resource type="SphereMesh" id="SphereMesh_18ddp"] -radius = 0.25 +[sub_resource type="CylinderMesh" id="CylinderMesh_627mb"] +top_radius = 0.1 +bottom_radius = 0.1 height = 0.5 [node name="DraggableObject" type="Area3D"] @@ -18,10 +20,10 @@ script = ExtResource("1_vcwhe") [node name="DragShape" type="CollisionShape3D" parent="."] shape = SubResource("SphereShape3D_vcwhe") -[node name="DragArea" type="Area3D" parent="."] +[node name="InteractionArea" type="Area3D" parent="."] -[node name="CollisionShape3D" type="CollisionShape3D" parent="DragArea"] -shape = SubResource("SphereShape3D_18ddp") +[node name="CollisionShape3D" type="CollisionShape3D" parent="InteractionArea"] +shape = SubResource("CapsuleShape3D_vcwhe") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] -mesh = SubResource("SphereMesh_18ddp") +mesh = SubResource("CylinderMesh_627mb") diff --git a/scenes/lab.tscn b/scenes/lab.tscn index 9b87706..de32645 100644 --- a/scenes/lab.tscn +++ b/scenes/lab.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://c7r4rhgj3ucao"] [ext_resource type="PackedScene" uid="uid://bjxjcx2qu16q5" path="res://scenes/draggable_object.tscn" id="1_bb6uc"] -[ext_resource type="Script" uid="uid://crjao0jjv5yqs" path="res://src/draggable_camera.gd" id="1_hem3r"] +[ext_resource type="Script" uid="uid://crjao0jjv5yqs" path="res://src/drag/draggable_camera.gd" id="1_hem3r"] [sub_resource type="BoxMesh" id="BoxMesh_cbcd7"] size = Vector3(3.535, 1, 1) diff --git a/src/draggable_camera.gd b/src/drag/draggable_camera.gd similarity index 100% rename from src/draggable_camera.gd rename to src/drag/draggable_camera.gd diff --git a/src/draggable_camera.gd.uid b/src/drag/draggable_camera.gd.uid similarity index 100% rename from src/draggable_camera.gd.uid rename to src/drag/draggable_camera.gd.uid diff --git a/src/draggable_object.gd b/src/drag/draggable_object.gd similarity index 100% rename from src/draggable_object.gd rename to src/drag/draggable_object.gd diff --git a/src/draggable_object.gd.uid b/src/drag/draggable_object.gd.uid similarity index 100% rename from src/draggable_object.gd.uid rename to src/drag/draggable_object.gd.uid