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

fixed some things, broke others. gotta figure out more collision issues

Browse Source
This commit is contained in:
derek
2024-10-23 17:01:03 -05:00
parent d5300779a0
commit 8dd49b4d6b
4 changed files with 54 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
assets/bullet.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=12 format=4 uid="uid://dqhltdnqyg8ni"]
[gd_scene load_steps=13 format=4 uid="uid://dqhltdnqyg8ni"]
[ext_resource type="Script" path="res://scripts/bullet.gd" id="1_oj0f5"]
[ext_resource type="Texture2D" uid="uid://dqytegxsmb5kg" path="res://assets/Models/bullet.transparency.png" id="2_0ks2n"]
@@ -49,10 +49,8 @@ blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_dtlcm")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_x6v7s"]
transparency = 1
blend_mode = 1
albedo_color = Color(0.75476, 0.726851, 0.555583, 1)
emission_enabled = true
albedo_color = Color(0.26779, 0.26779, 0.26779, 1)
metallic = 1.0
emission = Color(0.944624, 0.755365, 0, 1)
emission_energy_multiplier = 8.0
@@ -61,8 +59,8 @@ direction = Vector3(0, 0, 1)
initial_velocity_min = 3.0
initial_velocity_max = 5.0
[sub_resource type="BoxMesh" id="BoxMesh_jrtee"]
size = Vector3(0.04, 0.04, 0.04)
[sub_resource type="BoxMesh" id="BoxMesh_qy3jk"]
size = Vector3(0.05, 0.05, 0.05)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ywt21"]
transparency = 1
@@ -72,20 +70,25 @@ emission_enabled = true
emission = Color(0.737886, 0.150238, 0.0835467, 1)
emission_energy_multiplier = 8.0
[sub_resource type="BoxMesh" id="BoxMesh_jrtee"]
size = Vector3(0.04, 0.04, 0.04)
[sub_resource type="CylinderShape3D" id="CylinderShape3D_tqvit"]
height = 1.53305
height = 1.5
radius = 0.055
[node name="Bullet" type="RigidBody3D"]
top_level = true
collision_layer = 32
collision_mask = 109
axis_lock_angular_x = true
axis_lock_angular_y = true
axis_lock_angular_z = true
mass = 0.1
center_of_mass_mode = 1
continuous_cd = true
contact_monitor = true
max_contacts_reported = 10
angular_damp = 100.0
max_contacts_reported = 1
script = ExtResource("1_oj0f5")
[node name="Cylinder" type="MeshInstance3D" parent="."]
@@ -99,10 +102,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.718767)
material_override = SubResource("StandardMaterial3D_x6v7s")
cast_shadow = 0
emitting = false
amount = 20
one_shot = true
explosiveness = 1.0
process_material = SubResource("ParticleProcessMaterial_3wvag")
draw_pass_1 = SubResource("BoxMesh_jrtee")
draw_pass_1 = SubResource("BoxMesh_qy3jk")
[node name="GPUParticlesEnemy" type="GPUParticles3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.718767)
@@ -123,4 +127,10 @@ stream = ExtResource("3_6j0l2")
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0)
shape = SubResource("CylinderShape3D_tqvit")
[node name="RayCast3D" type="RayCast3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.47877)
target_position = Vector3(0, 0, -3)
collision_mask = 105
collide_with_areas = true
[connection signal="body_entered" from="." to="." method="_on_body_entered"]

2
assets/mac_10.tscn
View File

@@ -301,7 +301,7 @@ tracks/4/keys = {
"times": PackedFloat32Array(0, 0.03, 0.1),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [0.0, 20.0, 0.0]
"values": [0.0, 10.0, 0.0]
}
tracks/5/type = "value"
tracks/5/imported = false