Sara/wave-survival
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat: moved hitscan muzzles to camera

Browse source
This commit is contained in:
Sara 2025-08-04 13:45:07 +02:00
parent 8a3717eac3
commit 47970091ff
3 changed files with 55 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
project/maps/industrial_area.tscn
View file

@ -1,8 +1,9 @@
[gd_scene load_steps=7 format=3 uid="uid://cc2adfb3sfrep"] [gd_scene load_steps=8 format=3 uid="uid://cc2adfb3sfrep"]
[ext_resource type="PackedScene" uid="uid://snjgu4yp5swd" path="res://objects/player.tscn" id="1_mhgjp"] [ext_resource type="PackedScene" uid="uid://snjgu4yp5swd" path="res://objects/player.tscn" id="1_mhgjp"]
[ext_resource type="PackedScene" uid="uid://dllho5nkq2smw" path="res://maps/industrial_area_map.tscn" id="2_41t38"] [ext_resource type="PackedScene" uid="uid://dllho5nkq2smw" path="res://maps/industrial_area_map.tscn" id="2_41t38"]
[ext_resource type="PackedScene" uid="uid://bt054d3ic71rf" path="res://menus/pause_menu.tscn" id="2_ien74"] [ext_resource type="PackedScene" uid="uid://bt054d3ic71rf" path="res://menus/pause_menu.tscn" id="2_ien74"]
[ext_resource type="Texture2D" uid="uid://bwfkmwx6bd5u4" path="res://icon.svg" id="4_41t38"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ien74"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ien74"]
sky_horizon_color = Color(0.66224277, 0.6717428, 0.6867428, 1) sky_horizon_color = Color(0.66224277, 0.6717428, 0.6867428, 1)
@ -48,3 +49,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -20.454895, 0.006988764, -8.1
[node name="Map" parent="SubViewportContainer/SubViewport" instance=ExtResource("2_41t38")] [node name="Map" parent="SubViewportContainer/SubViewport" instance=ExtResource("2_41t38")]
[node name="PauseMenu" parent="." instance=ExtResource("2_ien74")] [node name="PauseMenu" parent="." instance=ExtResource("2_ien74")]
[node name="CenterContainer" type="CenterContainer" parent="."]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
focus_behavior_recursive = 1
mouse_filter = 2
mouse_behavior_recursive = 1
[node name="TextureRect" type="TextureRect" parent="CenterContainer"]
custom_minimum_size = Vector2(10, 10)
layout_mode = 2
texture = ExtResource("4_41t38")
expand_mode = 4

40
project/objects/weapons/revolver.tscn
View file

@ -4,23 +4,49 @@
[node name="Revolver" type="Revolver" node_paths=PackedStringArray("anim")] [node name="Revolver" type="Revolver" node_paths=PackedStringArray("anim")]
anim = NodePath("revolver/AnimationPlayer") anim = NodePath("revolver/AnimationPlayer")
single_action_spread = 0.003
double_action_spread = 0.02
[node name="revolver" parent="." instance=ExtResource("1_5ynga")] [node name="revolver" parent="." instance=ExtResource("1_5ynga")]
[node name="Skeleton3D" parent="revolver/Character" index="0"]
bones/1/position = Vector3(0.077683, 0.15356629, 0.22951864)
bones/1/rotation = Quaternion(0.5851843, 0.4764963, 0.47324383, -0.45447868)
bones/2/rotation = Quaternion(-0.13058601, 0.036996037, 0.61635554, 0.7756832)
bones/3/rotation = Quaternion(0.041782245, 0.11465855, 0.27514994, 0.9536247)
bones/4/rotation = Quaternion(0.14384021, 0.35639, -0.26087254, 0.8855742)
bones/5/rotation = Quaternion(-0.22070737, 0.14418077, 0.13519569, 0.95510334)
bones/6/rotation = Quaternion(-0.10018806, 0.0017374308, -0.01725145, 0.99481744)
bones/7/rotation = Quaternion(-0.5670921, 0.0002677271, -0.0003900336, 0.82365435)
bones/8/rotation = Quaternion(-0.679744, 0.1527604, 0.07346371, 0.7135934)
bones/9/rotation = Quaternion(-0.52413255, -0.0052551352, 0.008540803, 0.85157764)
bones/10/rotation = Quaternion(-0.45302963, 0.0016381256, -0.0032266823, 0.89148813)
bones/11/rotation = Quaternion(-0.6447599, 0.17695157, 0.030249309, 0.74300593)
bones/12/rotation = Quaternion(-0.61815894, -0.0058423677, 0.008146217, 0.78598917)
bones/13/rotation = Quaternion(-0.2895717, 0.0008908666, -0.0035062192, 0.95714957)
bones/14/rotation = Quaternion(-0.41372666, 0.18337816, -0.05571315, 0.88999933)
bones/15/rotation = Quaternion(-0.56248397, 0.0085162, 0.018579094, 0.82655555)
bones/16/rotation = Quaternion(-0.5171131, -0.0032988985, -0.01302587, 0.8558117)
bones/17/position = Vector3(-0.035217408, 0.031610176, 0.010926676)
bones/17/rotation = Quaternion(-0.4766158, 0.022983566, 0.16551939, 0.8630831)
bones/18/rotation = Quaternion(0.30545127, -0.076055326, -0.15467335, 0.9364782)
bones/19/rotation = Quaternion(0.008012294, 0.013962945, -0.36334667, 0.9315149)
bones/20/rotation = Quaternion(0.5851843, -0.4764963, -0.47324383, -0.45447868)
bones/39/position = Vector3(0.075784564, -0.25414097, -0.44517958)
bones/39/rotation = Quaternion(-0.14452313, 2.8000815e-17, 2.8000815e-17, 0.9895014)
bones/40/position = Vector3(0.018712092, 0.02616787, 0.005937299)
bones/43/rotation = Quaternion(0.0037203024, 1.1920845e-07, 4.4349532e-10, 0.9999931)
bones/44/rotation = Quaternion(0.9970487, -9.1520045e-09, 1.1885747e-07, -0.07677229)
[node name="Body" parent="revolver/Character/Skeleton3D" index="0"] [node name="Body" parent="revolver/Character/Skeleton3D" index="0"]
layers = 2 layers = 2
[node name="Cube" parent="revolver/Character/Skeleton3D" index="1"] [node name="Cube" parent="revolver/Character/Skeleton3D" index="1"]
layers = 2 layers = 2
[node name="BoneAttachment3D" type="BoneAttachment3D" parent="revolver/Character/Skeleton3D" index="2"] [node name="HitscanMuzzle" type="HitscanMuzzle" parent="."]
transform = Transform3D(1, -6.350722e-17, 4.732016e-17, 4.732016e-17, 0.95822614, 0.28601173, -6.350722e-17, -0.28601173, 0.95822614, -1.1196792e-16, -0.03667751, 0.009908612)
bone_name = "root"
bone_idx = 39
[node name="HitscanMuzzle" type="HitscanMuzzle" parent="revolver/Character/Skeleton3D/BoneAttachment3D"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 6.3507215e-17, 4.732015e-17, -6.350722e-17, 0.28601167, 0.958226, 4.7320157e-17, -0.958226, 0.28601167, -9.044954e-18, 0.04726258, 0.25400588) transform = Transform3D(1, 0, 0, 0, -4.3711385e-08, 0.9999999, 0, -0.9999999, -4.3711385e-08, 0, 0, 0)
target_position = Vector3(0, 200, 0) target_position = Vector3(0, 200, 0)
collision_mask = 6 collision_mask = 6
collide_with_areas = true collide_with_areas = true

13
project/objects/weapons/rifle.tscn
View file

@ -13,21 +13,16 @@ layers = 2
[node name="mesh" parent="rifle/Character/Skeleton3D" index="1"] [node name="mesh" parent="rifle/Character/Skeleton3D" index="1"]
layers = 2 layers = 2
[node name="BoneAttachment3D" type="BoneAttachment3D" parent="rifle/Character/Skeleton3D" index="2"] [node name="AnimationPlayer" parent="rifle" index="2"]
transform = Transform3D(1, -2.0932122e-15, 2.3524223e-18, 2.3525281e-18, 0.0022477505, 0.99999744, -2.0932126e-15, -0.9999974, 0.0022477508, 0.07988295, -0.13953947, -0.33976445) playback_default_blend_time = 0.1
bone_name = "root"
bone_idx = 39
[node name="HitscanMuzzle" type="HitscanMuzzle" parent="rifle/Character/Skeleton3D/BoneAttachment3D"] [node name="HitscanMuzzle" type="HitscanMuzzle" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 0.9999968, 0.0024609112, 0, -0.0024609112, 0.9999968, 1.1099746e-16, 0.053034816, 0.03427495) transform = Transform3D(1, -2.0932111e-15, -2.7987948e-18, 2.3525281e-18, -0.00021316158, 0.99999976, -2.0932126e-15, -0.9999997, -0.00021316111, 0, 0, 0)
target_position = Vector3(0, 200, 0) target_position = Vector3(0, 200, 0)
collision_mask = 6 collision_mask = 6
collide_with_areas = true collide_with_areas = true
spread = 0.003 spread = 0.003
damage = 3 damage = 3
[node name="AnimationPlayer" parent="rifle" index="2"]
playback_default_blend_time = 0.1
[editable path="rifle"] [editable path="rifle"]