derekdz/fps_project_1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor tweaks and tests - add all scene rigidbodies to mask bullet collision later

Browse Source
This commit is contained in:
Derek
2024-12-05 08:27:50 -06:00
parent f293c6745f
commit 816ae85938
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/trashcan.tscn
View File

@@ -97,7 +97,7 @@ height = 1.37889
[node name="RigidBody3D" type="RigidBody3D" parent="." groups=["scene_rigidbody"]] [node name="RigidBody3D" type="RigidBody3D" parent="." groups=["scene_rigidbody"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.51725, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.51725, 0)
collision_layer = 32 collision_layer = 32
collision_mask = 125 collision_mask = 253
mass = 5.0 mass = 5.0
[node name="trashcan1_lid" type="MeshInstance3D" parent="RigidBody3D"] [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"]] [node name="RigidBody3D2" type="RigidBody3D" parent="." groups=["scene_rigidbody"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.697674, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.697674, 0)
collision_layer = 32 collision_layer = 32
collision_mask = 125 collision_mask = 253
mass = 10.0 mass = 10.0
[node name="trashcan1" type="MeshInstance3D" parent="RigidBody3D2"] [node name="trashcan1" type="MeshInstance3D" parent="RigidBody3D2"]

2
blunderbus.tscn
View File

@@ -16,7 +16,6 @@
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hc8kj"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hc8kj"]
resource_name = "blunderbus.stock" resource_name = "blunderbus.stock"
cull_mode = 2 cull_mode = 2
diffuse_mode = 3
albedo_texture = ExtResource("3_4fcbv") albedo_texture = ExtResource("3_4fcbv")
roughness_texture = ExtResource("5_adrdr") roughness_texture = ExtResource("5_adrdr")
roughness_texture_channel = 1 roughness_texture_channel = 1
@@ -28,7 +27,6 @@ texture_filter = 2
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_211mx"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_211mx"]
resource_name = "blunderbus.metal" resource_name = "blunderbus.metal"
cull_mode = 2 cull_mode = 2
diffuse_mode = 3
albedo_texture = ExtResource("3_5l523") albedo_texture = ExtResource("3_5l523")
metallic = 0.9 metallic = 0.9
roughness_texture = ExtResource("6_x42cq") roughness_texture = ExtResource("6_x42cq")

1
scenes/asset_checker.tscn
View File

@@ -298,6 +298,7 @@ shadow_mesh = SubResource("ArrayMesh_7g1e1")
[node name="AssetChecker" type="Node3D" node_paths=PackedStringArray("player")] [node name="AssetChecker" type="Node3D" node_paths=PackedStringArray("player")]
script = ExtResource("1_saj4q") script = ExtResource("1_saj4q")
load_save = false
player = NodePath("Player") player = NodePath("Player")
gun_1 = ExtResource("2_ntm2q") gun_1 = ExtResource("2_ntm2q")