From 816ae85938faf66a6add9e13c586a8afa5d019e4 Mon Sep 17 00:00:00 2001 From: Derek Date: Thu, 5 Dec 2024 08:27:50 -0600 Subject: [PATCH] minor tweaks and tests - add all scene rigidbodies to mask bullet collision later --- assets/trashcan.tscn | 4 ++-- blunderbus.tscn | 2 -- scenes/asset_checker.tscn | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/assets/trashcan.tscn b/assets/trashcan.tscn index 66cace8..9188310 100644 --- a/assets/trashcan.tscn +++ b/assets/trashcan.tscn @@ -97,7 +97,7 @@ height = 1.37889 [node name="RigidBody3D" type="RigidBody3D" parent="." groups=["scene_rigidbody"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.51725, 0) collision_layer = 32 -collision_mask = 125 +collision_mask = 253 mass = 5.0 [node name="trashcan1_lid" type="MeshInstance3D" parent="RigidBody3D"] @@ -110,7 +110,7 @@ shape = SubResource("ConvexPolygonShape3D_cglky") [node name="RigidBody3D2" type="RigidBody3D" parent="." groups=["scene_rigidbody"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.697674, 0) collision_layer = 32 -collision_mask = 125 +collision_mask = 253 mass = 10.0 [node name="trashcan1" type="MeshInstance3D" parent="RigidBody3D2"] diff --git a/blunderbus.tscn b/blunderbus.tscn index e3a4d0c..ec92a95 100644 --- a/blunderbus.tscn +++ b/blunderbus.tscn @@ -16,7 +16,6 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hc8kj"] resource_name = "blunderbus.stock" cull_mode = 2 -diffuse_mode = 3 albedo_texture = ExtResource("3_4fcbv") roughness_texture = ExtResource("5_adrdr") roughness_texture_channel = 1 @@ -28,7 +27,6 @@ texture_filter = 2 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_211mx"] resource_name = "blunderbus.metal" cull_mode = 2 -diffuse_mode = 3 albedo_texture = ExtResource("3_5l523") metallic = 0.9 roughness_texture = ExtResource("6_x42cq") diff --git a/scenes/asset_checker.tscn b/scenes/asset_checker.tscn index 5ed674c..c372b36 100644 --- a/scenes/asset_checker.tscn +++ b/scenes/asset_checker.tscn @@ -298,6 +298,7 @@ shadow_mesh = SubResource("ArrayMesh_7g1e1") [node name="AssetChecker" type="Node3D" node_paths=PackedStringArray("player")] script = ExtResource("1_saj4q") +load_save = false player = NodePath("Player") gun_1 = ExtResource("2_ntm2q")