Import and configure coffee_mug rigidbody

6 files changed, 293 insertions, 2 deletions

diff --git a/character/fps_controller/fps_controller.gd b/character/fps_controller/fps_controller.gd
index 8d5af12..0ac12a8 100644
--- a/character/fps_controller/fps_controller.gd
+++ b/character/fps_controller/fps_controller.gd
@@ -87,4 +87,4 @@ func _on_ladder_detector_body_entered(body):
 
 func _on_ladder_detector_body_exited(body):
     if body.is_in_group("ladder"):
-        is_climbing = false
\ No newline at end of file
+        is_climbing = false
diff --git a/ship/cabinets/blend_files/cabinet.blend b/ship/cabinets/blend_files/cabinet.blend
index ab43666..295d7fb 100644
--- a/ship/cabinets/blend_files/cabinet.blend
+++ b/ship/cabinets/blend_files/cabinet.blend
diff --git a/ship/coffee_mug/coffee_mug.obj b/ship/coffee_mug/coffee_mug.obj
new file mode 100644
index 0000000..73443e3
--- /dev/null
+++ b/ship/coffee_mug/coffee_mug.obj
@@ -0,0 +1,246 @@
+# Blender 3.3.1
+# www.blender.org
+o coffee_mug
+v -0.067508 -0.178570 -0.165317
+v -0.067508 0.178570 -0.165317
+v 0.069161 -0.178570 -0.164632
+v 0.069161 0.178570 -0.164632
+v 0.165317 -0.178570 -0.067508
+v 0.165317 0.178570 -0.067508
+v 0.164632 -0.178570 0.069161
+v 0.164632 0.178570 0.069161
+v 0.067508 -0.178570 0.165317
+v 0.067508 0.178570 0.165317
+v -0.069161 -0.178570 0.164632
+v -0.069161 0.178570 0.164632
+v -0.165317 -0.178570 0.067508
+v -0.165317 0.178570 0.067508
+v -0.164632 -0.178570 -0.069161
+v -0.164632 0.178570 -0.069161
+v -0.060170 -0.162813 -0.147348
+v -0.058057 0.178570 -0.142173
+v 0.061644 -0.162813 -0.146738
+v 0.059479 0.178570 -0.141584
+v 0.147348 -0.162813 -0.060170
+v 0.142173 0.178570 -0.058057
+v 0.146738 -0.162813 0.061644
+v 0.141584 0.178570 0.059479
+v 0.060170 -0.162813 0.147348
+v 0.058057 0.178570 0.142173
+v -0.061644 -0.162813 0.146738
+v -0.059479 0.178570 0.141584
+v -0.147348 -0.162813 0.060170
+v -0.142173 0.178570 0.058057
+v -0.146738 -0.162813 -0.061644
+v -0.141584 0.178570 -0.059479
+v -0.211284 0.077583 0.024946
+v -0.222717 0.127843 0.024946
+v -0.211284 0.077583 -0.026599
+v -0.222717 0.127843 -0.026599
+v -0.162888 0.081563 0.024946
+v -0.162888 0.133107 0.024946
+v -0.162888 0.081563 -0.026599
+v -0.162888 0.133107 -0.026599
+v -0.251932 0.062906 0.022798
+v -0.280673 0.100408 0.022798
+v -0.251932 0.062906 -0.024451
+v -0.280673 0.100408 -0.024451
+v -0.276432 0.027801 0.021196
+v -0.313692 0.051288 0.021196
+v -0.276432 0.027801 -0.022849
+v -0.313692 0.051288 -0.022849
+v -0.277259 -0.017308 0.021196
+v -0.316973 -0.022750 0.021196
+v -0.277259 -0.017308 -0.022849
+v -0.316973 -0.022750 -0.022849
+v -0.222328 -0.083704 0.021196
+v -0.253785 -0.114532 0.021196
+v -0.222328 -0.083704 -0.022849
+v -0.253785 -0.114532 -0.022849
+v -0.181151 -0.097195 0.021196
+v -0.191222 -0.140072 0.021196
+v -0.181151 -0.097194 -0.022849
+v -0.191222 -0.140072 -0.022849
+v -0.159201 -0.098154 0.021196
+v -0.159761 -0.142195 0.021196
+v -0.159201 -0.098154 -0.022849
+v -0.159761 -0.142195 -0.022849
+v -0.253645 -0.056925 -0.022849
+v -0.289231 -0.076601 -0.022849
+v -0.289231 -0.076601 0.021196
+v -0.253645 -0.056925 0.021196
+vn -0.3780 -0.0000 -0.9258
+vn 0.3873 -0.0000 -0.9220
+vn 0.9258 -0.0000 -0.3780
+vn 0.9220 -0.0000 0.3873
+vn 0.3780 -0.0000 0.9258
+vn -0.3873 -0.0000 0.9220
+vn -0.9258 -0.0000 0.3780
+vn -0.9220 -0.0000 -0.3873
+vn -0.0000 -1.0000 -0.0000
+vn 0.3780 -0.0164 0.9257
+vn -0.3873 -0.0164 0.9218
+vn -0.9257 -0.0164 0.3780
+vn -0.9218 -0.0164 -0.3873
+vn -0.3780 -0.0164 -0.9257
+vn 0.3873 -0.0164 -0.9218
+vn 0.9257 -0.0164 -0.3780
+vn 0.9218 -0.0164 0.3873
+vn -0.0000 1.0000 -0.0000
+vn -0.0182 -0.0078 -0.9998
+vn -0.0290 -0.0200 -0.9994
+vn -0.0250 -0.0192 -0.9995
+vn -0.0243 -0.0055 -0.9997
+vn -0.0000 -0.0000 -1.0000
+vn 0.2106 -0.9776 -0.0000
+vn 0.6014 -0.7990 -0.0000
+vn -0.0000 -0.0000 1.0000
+vn -0.0243 -0.0055 0.9997
+vn 0.0820 -0.9966 -0.0000
+vn -0.2600 0.9656 -0.0000
+vn -0.0876 0.9962 -0.0000
+vn -0.0182 -0.0078 0.9998
+vn -0.0290 -0.0200 0.9994
+vn -0.6482 0.7614 -0.0000
+vn -0.9491 0.3150 -0.0000
+vn 0.9500 -0.3121 -0.0000
+vn -0.0127 -0.0145 -0.9998
+vn -0.0127 -0.0145 0.9998
+vn -0.0087 -0.0137 0.9999
+vn -0.9768 -0.2140 -0.0000
+vn 0.9665 0.2567 -0.0000
+vn -0.0087 -0.0137 -0.9999
+vn -0.8176 -0.5758 -0.0000
+vn -0.5675 -0.8234 -0.0000
+vn 0.7646 0.6446 -0.0000
+vn 0.4899 0.8718 -0.0000
+vn -0.2255 -0.9742 -0.0000
+vn 0.1792 0.9838 -0.0000
+vn 0.0437 0.9990 -0.0000
+vn -0.0673 -0.9977 -0.0000
+vn -0.0250 -0.0192 0.9995
+s 1
+f 2//1 3//2 1//1
+f 4//2 5//3 3//2
+f 6//3 7//4 5//3
+f 8//4 9//5 7//4
+f 10//5 11//6 9//5
+f 12//6 13//7 11//6
+f 14//7 15//8 13//7
+f 16//8 1//1 15//8
+f 7//9 11//9 15//9
+f 17//10 20//11 18//10
+f 21//12 20//11 19//11
+f 21//12 24//13 22//12
+f 25//14 24//13 23//13
+f 25//14 28//15 26//14
+f 29//16 28//15 27//15
+f 29//16 32//17 30//16
+f 17//10 32//17 31//17
+f 27//18 23//18 19//18
+f 2//18 20//18 4//18
+f 6//18 20//18 22//18
+f 6//18 24//18 8//18
+f 10//18 24//18 26//18
+f 10//18 28//18 12//18
+f 14//18 28//18 30//18
+f 14//18 32//18 16//18
+f 2//18 32//18 18//18
+f 36//19 43//20 44//21
+f 35//22 40//23 39//23
+f 33//24 43//25 35//24
+f 38//26 33//27 37//26
+f 39//28 33//24 35//24
+f 36//29 38//30 40//30
+f 34//31 41//32 33//27
+f 36//29 42//33 34//29
+f 44//33 46//34 42//33
+f 41//25 47//35 43//25
+f 43//20 48//36 44//21
+f 41//32 46//37 45//38
+f 48//34 50//39 46//34
+f 45//35 51//40 47//35
+f 47//41 52//23 48//36
+f 45//38 50//26 49//26
+f 65//23 56//23 66//23
+f 68//26 54//26 53//26
+f 66//42 54//43 67//42
+f 68//44 55//45 65//44
+f 56//43 58//46 54//43
+f 53//45 59//47 55//45
+f 55//23 60//23 56//23
+f 53//26 58//26 57//26
+f 57//47 63//48 59//47
+f 59//23 64//23 60//23
+f 57//26 62//26 61//26
+f 60//46 62//49 58//46
+f 49//40 65//44 51//40
+f 50//39 66//42 67//42
+f 49//26 67//26 68//26
+f 51//23 66//23 52//23
+f 2//1 4//2 3//2
+f 4//2 6//3 5//3
+f 6//3 8//4 7//4
+f 8//4 10//5 9//5
+f 10//5 12//6 11//6
+f 12//6 14//7 13//7
+f 14//7 16//8 15//8
+f 16//8 2//1 1//1
+f 15//9 1//9 3//9
+f 3//9 5//9 7//9
+f 7//9 9//9 11//9
+f 11//9 13//9 15//9
+f 15//9 3//9 7//9
+f 17//10 19//11 20//11
+f 21//12 22//12 20//11
+f 21//12 23//13 24//13
+f 25//14 26//14 24//13
+f 25//14 27//15 28//15
+f 29//16 30//16 28//15
+f 29//16 31//17 32//17
+f 17//10 18//10 32//17
+f 19//18 17//18 31//18
+f 31//18 29//18 27//18
+f 27//18 25//18 23//18
+f 23//18 21//18 19//18
+f 19//18 31//18 27//18
+f 2//18 18//18 20//18
+f 6//18 4//18 20//18
+f 6//18 22//18 24//18
+f 10//18 8//18 24//18
+f 10//18 26//18 28//18
+f 14//18 12//18 28//18
+f 14//18 30//18 32//18
+f 2//18 16//18 32//18
+f 36//19 35//22 43//20
+f 35//22 36//19 40//23
+f 33//24 41//25 43//25
+f 38//26 34//31 33//27
+f 39//28 37//28 33//24
+f 36//29 34//29 38//30
+f 34//31 42//50 41//32
+f 36//29 44//33 42//33
+f 44//33 48//34 46//34
+f 41//25 45//35 47//35
+f 43//20 47//41 48//36
+f 41//32 42//50 46//37
+f 48//34 52//39 50//39
+f 45//35 49//40 51//40
+f 47//41 51//23 52//23
+f 45//38 46//37 50//26
+f 65//23 55//23 56//23
+f 68//26 67//26 54//26
+f 66//42 56//43 54//43
+f 68//44 53//45 55//45
+f 56//43 60//46 58//46
+f 53//45 57//47 59//47
+f 55//23 59//23 60//23
+f 53//26 54//26 58//26
+f 57//47 61//48 63//48
+f 59//23 63//23 64//23
+f 57//26 58//26 62//26
+f 60//46 64//49 62//49
+f 49//40 68//44 65//44
+f 50//39 52//39 66//42
+f 49//26 50//26 67//26
+f 51//23 65//23 66//23
diff --git a/ship/coffee_mug/coffee_mug.obj.import b/ship/coffee_mug/coffee_mug.obj.import
new file mode 100644
index 0000000..2110fbd
--- /dev/null
+++ b/ship/coffee_mug/coffee_mug.obj.import
@@ -0,0 +1,20 @@
+[remap]
+
+importer="wavefront_obj"
+type="Mesh"
+path="res://.import/coffee_mug.obj-c39650cc1216a0f0db19fb8c57c4b78b.mesh"
+
+[deps]
+
+files=[ "res://.import/coffee_mug.obj-c39650cc1216a0f0db19fb8c57c4b78b.mesh" ]
+
+source_file="res://ship/coffee_mug/coffee_mug.obj"
+dest_files=[ "res://.import/coffee_mug.obj-c39650cc1216a0f0db19fb8c57c4b78b.mesh", "res://.import/coffee_mug.obj-c39650cc1216a0f0db19fb8c57c4b78b.mesh" ]
+
+[params]
+
+generate_tangents=true
+scale_mesh=Vector3( 1, 1, 1 )
+offset_mesh=Vector3( 0, 0, 0 )
+octahedral_compression=true
+optimize_mesh_flags=4286
diff --git a/ship/coffee_mug/coffee_mug.tscn b/ship/coffee_mug/coffee_mug.tscn
new file mode 100644
index 0000000..6d95a3e
--- /dev/null
+++ b/ship/coffee_mug/coffee_mug.tscn
@@ -0,0 +1,21 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://ship/coffee_mug/coffee_mug.obj" type="ArrayMesh" id=1]
+
+[sub_resource type="SpatialMaterial" id=1]
+albedo_color = Color( 0.921569, 0.858824, 0.784314, 1 )
+roughness = 0.2
+
+[sub_resource type="ConvexPolygonShape" id=2]
+points = PoolVector3Array( -0.251177, -0.115572, -0.0226116, 0.16054, 0.1786, 0.0731729, 0.158845, 0.177328, -0.0740226, 0.160575, -0.176015, 0.0731838, 0.0712205, -0.175261, -0.162558, -0.0757988, 0.174365, 0.157932, -0.0757995, 0.171902, -0.157086, -0.0757988, -0.171754, 0.157932, -0.297793, 0.0931003, 0.0298927, 0.0714456, -0.175532, 0.161395, -0.0757995, -0.169291, -0.157086, -0.310528, -0.035325, -0.0226908, 0.0712205, 0.177872, -0.162558, 0.0714456, 0.178143, 0.161395, 0.158845, -0.174717, -0.0740226, -0.161585, 0.172839, -0.0721836, -0.297793, 0.0931003, -0.0313038, -0.161846, -0.17075, 0.0709898, -0.309678, -0.0351923, 0.0212, -0.161846, 0.173361, 0.0709898, -0.161585, -0.170228, -0.0721836, -0.280187, -0.086249, 0.0211745, -0.282494, 0.108423, -0.0313038, -0.312373, 0.0530193, -0.0228636, -0.280187, -0.086249, -0.0225856, -0.282494, 0.108423, 0.0298927, -0.310661, 0.052645, 0.0212921, -0.251174, -0.11557, 0.0212, -0.302967, -0.0499574, -0.0226705, -0.302353, -0.0498189, 0.0212 )
+
+[node name="coffee_mug" type="RigidBody"]
+collision_layer = 16
+collision_mask = 28
+
+[node name="coffee_mug_mesh" type="MeshInstance" parent="."]
+mesh = ExtResource( 1 )
+material/0 = SubResource( 1 )
+
+[node name="CollisionShape" type="CollisionShape" parent="."]
+shape = SubResource( 2 )
diff --git a/ship/ship/ship.tscn b/ship/ship/ship.tscn
index 1503186..f763d2e 100644
--- a/ship/ship/ship.tscn
+++ b/ship/ship/ship.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=96 format=2]
+[gd_scene load_steps=97 format=2]
 
 [ext_resource path="res://ship/ship/rear_deck.material" type="Material" id=1]
 [ext_resource path="res://ship/staircase_1/staircase_1.tscn" type="PackedScene" id=2]
@@ -27,6 +27,7 @@
 [ext_resource path="res://ship/camera/base_baked.material" type="Material" id=25]
 [ext_resource path="res://ship/camera/security_camera.tscn" type="PackedScene" id=26]
 [ext_resource path="res://ship/cabinets/cabinet.tscn" type="PackedScene" id=27]
+[ext_resource path="res://ship/coffee_mug/coffee_mug.tscn" type="PackedScene" id=28]
 
 [sub_resource type="BoxShape" id=26]
 extents = Vector3( 5.76897, 0.594175, 1.03357 )
@@ -909,3 +910,6 @@ transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0.28626
 
 [node name="cabinet" parent="." instance=ExtResource( 27 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 6.40128, 5.20189, 52.5728 )
+
+[node name="coffee_mug" parent="." instance=ExtResource( 28 )]
+transform = Transform( 0.608124, 0, 0.793842, 0, 1, 0, -0.793842, 0, 0.608124, 2.83394, 6.48585, 52.4547 )