new placeholder gun

This commit is contained in:
anyreso 2024-04-21 02:01:01 +00:00
parent 80cf77e532
commit b11764689b
6 changed files with 127 additions and 163 deletions

View file

@ -2,9 +2,9 @@
[ext_resource type="PackedScene" uid="uid://4naw661fqmjg" path="res://entities/player/assets/vanguard.glb" id="1_d2ik6"]
[ext_resource type="Script" path="res://entities/player/assets/vanguard.gd" id="2_c22xr"]
[ext_resource type="PackedScene" uid="uid://dmkytrpsfbtlh" path="res://entities/weapons/space_gun/assets/SpaceGun.glb" id="3_1d68x"]
[ext_resource type="PackedScene" uid="uid://c8co0qa2omjmh" path="res://entities/weapons/space_gun/space_gun.tscn" id="3_c7kd6"]
[sub_resource type="Animation" id="Animation_p414c"]
[sub_resource type="Animation" id="Animation_a6skd"]
resource_name = "t_pose"
length = 0.0333333
tracks/0/type = "position_3d"
@ -379,7 +379,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.354872, -0.0338185, -0.004324, 0.934293)
[sub_resource type="Animation" id="Animation_be1cq"]
[sub_resource type="Animation" id="Animation_ggabv"]
resource_name = "run_left"
length = 0.5
loop_mode = 1
@ -755,7 +755,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_o8b6w"]
[sub_resource type="Animation" id="Animation_nbrwa"]
resource_name = "jump_up"
length = 0.533333
tracks/0/type = "position_3d"
@ -1130,7 +1130,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_x4g37"]
[sub_resource type="Animation" id="Animation_001mg"]
resource_name = "idle"
length = 2.1
loop_mode = 1
@ -1506,7 +1506,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_pknyr"]
[sub_resource type="Animation" id="Animation_8nhf0"]
resource_name = "run_backward"
length = 0.5
loop_mode = 1
@ -1882,7 +1882,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_fwypn"]
[sub_resource type="Animation" id="Animation_tq1m2"]
resource_name = "run_forward"
length = 0.5
loop_mode = 1
@ -2258,7 +2258,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_m61sh"]
[sub_resource type="Animation" id="Animation_p6pta"]
resource_name = "run_right"
length = 0.5
loop_mode = 1
@ -2634,7 +2634,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_2jwt7"]
[sub_resource type="Animation" id="Animation_kpnct"]
resource_name = "death"
length = 2.83333
tracks/0/type = "position_3d"
@ -3009,7 +3009,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_6cy2e"]
[sub_resource type="Animation" id="Animation_k5qbp"]
resource_name = "jump_loop"
loop_mode = 1
tracks/0/type = "position_3d"
@ -3384,17 +3384,17 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="AnimationLibrary" id="AnimationLibrary_u6bg6"]
[sub_resource type="AnimationLibrary" id="AnimationLibrary_hxhxq"]
_data = {
"death": SubResource("Animation_2jwt7"),
"idle": SubResource("Animation_x4g37"),
"jump": SubResource("Animation_6cy2e"),
"jump_up": SubResource("Animation_o8b6w"),
"run_backward": SubResource("Animation_pknyr"),
"run_forward": SubResource("Animation_fwypn"),
"run_left": SubResource("Animation_be1cq"),
"run_right": SubResource("Animation_m61sh"),
"t_pose": SubResource("Animation_p414c")
"death": SubResource("Animation_kpnct"),
"idle": SubResource("Animation_001mg"),
"jump": SubResource("Animation_k5qbp"),
"jump_up": SubResource("Animation_nbrwa"),
"run_backward": SubResource("Animation_8nhf0"),
"run_forward": SubResource("Animation_tq1m2"),
"run_left": SubResource("Animation_ggabv"),
"run_right": SubResource("Animation_p6pta"),
"t_pose": SubResource("Animation_a6skd")
}
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_lw37l"]
@ -3453,7 +3453,7 @@ input_2/auto_advance = false
input_2/reset = true
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_1ok7t"]
graph_offset = Vector2(66.8571, 75.185)
graph_offset = Vector2(-328.518, -6.27956)
nodes/Death/node = SubResource("AnimationNodeOneShot_ncg4i")
nodes/Death/position = Vector2(860, 380)
"nodes/Death 2/node" = SubResource("AnimationNodeAnimation_lw37l")
@ -3477,15 +3477,15 @@ node_connections = [&"Death", 0, &"Death 2", &"GroundSpeed", 0, &"Locomotion", &
script = ExtResource("2_c22xr")
[node name="Skeleton3D" parent="Node" index="0"]
bones/0/position = Vector3(-0.00173, 0.968097, 0.0102844)
bones/0/rotation = Quaternion(-0.0376647, -0.435369, -0.0400344, 0.898573)
bones/2/rotation = Quaternion(0.00816777, 0.00677155, 0.00042395, 0.999944)
bones/4/rotation = Quaternion(0.0731821, 0.00505516, 0.0168974, 0.997163)
bones/6/rotation = Quaternion(0.168044, 0.010812, 0.0113512, 0.985655)
bones/8/rotation = Quaternion(0.687995, -0.407168, 0.399605, 0.448546)
bones/10/rotation = Quaternion(0.232583, -0.0669989, -0.309712, 0.919508)
bones/12/rotation = Quaternion(0.0848093, 0.214035, -0.748836, 0.621483)
bones/14/rotation = Quaternion(0.0439883, 0.072675, -0.153509, 0.984489)
bones/0/position = Vector3(0.0091125, 0.978834, 0.00716115)
bones/0/rotation = Quaternion(-0.0304238, -0.416145, -0.0281289, 0.908354)
bones/2/rotation = Quaternion(-0.00126834, -0.00431537, 0.019369, 0.999802)
bones/4/rotation = Quaternion(0.0745231, -0.00841037, 0.0181398, 0.997019)
bones/6/rotation = Quaternion(0.168689, -0.0033058, 0.0113768, 0.985598)
bones/8/rotation = Quaternion(0.678951, -0.411553, 0.402316, 0.455842)
bones/10/rotation = Quaternion(0.208378, -0.0845422, -0.32573, 0.918331)
bones/12/rotation = Quaternion(0.0793166, 0.208833, -0.74794, 0.625048)
bones/14/rotation = Quaternion(0.0322551, 0.0838214, -0.13899, 0.986213)
bones/20/rotation = Quaternion(-0.123455, 0.0248346, 0.23344, 0.964183)
bones/24/rotation = Quaternion(0.0450683, -0.000817796, 0.0508488, 0.997689)
bones/26/rotation = Quaternion(0.100545, -1.16532e-07, 0.00792588, 0.994901)
@ -3499,12 +3499,12 @@ bones/44/rotation = Quaternion(0.633142, 6.48257e-09, 0.04991, 0.772425)
bones/50/rotation = Quaternion(0.729888, -4.88266e-08, 0.0575362, 0.681141)
bones/52/rotation = Quaternion(0.624011, -9.63141e-08, 0.04919, 0.779865)
bones/54/rotation = Quaternion(-1.18924e-16, 2.81961e-21, -4.50738e-10, 1)
bones/56/rotation = Quaternion(-0.027387, 0.0477242, -0.0102335, 0.998433)
bones/58/rotation = Quaternion(-0.0272967, 0.307174, -0.0493656, 0.94998)
bones/62/rotation = Quaternion(0.693539, 0.362122, -0.415845, 0.463622)
bones/64/rotation = Quaternion(0.324204, -0.30741, 0.122213, 0.886259)
bones/66/rotation = Quaternion(0.570764, -0.560023, 0.419045, 0.430121)
bones/68/rotation = Quaternion(-0.0159497, -0.258891, 0.0744964, 0.962897)
bones/56/rotation = Quaternion(-0.0282395, 0.0506182, -0.0137337, 0.998224)
bones/58/rotation = Quaternion(-0.0161163, 0.300902, -0.0735058, 0.950682)
bones/62/rotation = Quaternion(0.672582, 0.38819, -0.440775, 0.450177)
bones/64/rotation = Quaternion(0.378653, -0.28528, 0.144158, 0.868594)
bones/66/rotation = Quaternion(0.558028, -0.577928, 0.408015, 0.433737)
bones/68/rotation = Quaternion(0.0146346, -0.253118, 0.0594528, 0.965496)
bones/70/rotation = Quaternion(0.155965, 0.0109114, -0.00107202, 0.987702)
bones/72/rotation = Quaternion(0.563923, 4.19095e-08, -0.0577906, 0.823803)
bones/74/rotation = Quaternion(0.285209, 0.0197164, -0.0936782, 0.953673)
@ -3521,22 +3521,22 @@ bones/100/rotation = Quaternion(-6.44756e-14, -1.4372e-11, -3.12192e-10, 1)
bones/102/rotation = Quaternion(0.179829, 0.0890365, -0.000307644, 0.97966)
bones/104/rotation = Quaternion(0.388149, 1.28057e-07, -0.0397774, 0.920738)
bones/106/rotation = Quaternion(0.372324, -1.37021e-07, -0.0381557, 0.927318)
bones/110/rotation = Quaternion(-0.0838619, 0.187447, 0.974965, 0.0852912)
bones/112/rotation = Quaternion(-0.467849, 0.0166342, -0.0112761, 0.88358)
bones/114/rotation = Quaternion(0.449729, 0.0515854, 0.00300445, 0.891669)
bones/116/rotation = Quaternion(0.372768, 0.0597713, 0.0286748, 0.925553)
bones/120/rotation = Quaternion(0.122412, 0.250244, 0.948794, -0.148942)
bones/122/rotation = Quaternion(-0.341409, -0.0816528, 0.0267745, 0.935979)
bones/124/rotation = Quaternion(0.404856, -0.0684155, -0.00791205, 0.911783)
bones/126/rotation = Quaternion(0.379454, -0.0779287, -0.0184118, 0.921739)
bones/110/rotation = Quaternion(-0.139688, 0.221395, 0.964738, 0.0274396)
bones/112/rotation = Quaternion(-0.373597, -0.00959325, -0.0354531, 0.926864)
bones/114/rotation = Quaternion(0.517785, 0.099108, 0.0311123, 0.849181)
bones/116/rotation = Quaternion(0.358209, 0.0547665, 0.027865, 0.931617)
bones/120/rotation = Quaternion(0.15189, 0.197526, 0.967067, -0.0518993)
bones/122/rotation = Quaternion(-0.393453, -0.0720602, 0.0315744, 0.915972)
bones/124/rotation = Quaternion(0.357526, -0.0428325, 0.0112871, 0.932852)
bones/126/rotation = Quaternion(0.421703, -0.0297867, 0.00958528, 0.906194)
[node name="HandAttachment" type="BoneAttachment3D" parent="Node/Skeleton3D" index="0"]
transform = Transform3D(-0.175561, 0.0544393, 0.982962, 0.930342, 0.335686, 0.147572, -0.321933, 0.9404, -0.109581, -0.240578, 1.15696, 0.0953967)
transform = Transform3D(-0.17714, 0.0688076, 0.981778, 0.933879, 0.326602, 0.145608, -0.310631, 0.942654, -0.122112, -0.237544, 1.16641, 0.0838305)
bone_name = "mixamorigRightHand"
bone_idx = 14
[node name="SpaceGun" parent="Node/Skeleton3D/HandAttachment" index="0" instance=ExtResource("3_1d68x")]
transform = Transform3D(-0.0109711, 0.094734, -0.0300857, -0.00595679, 0.0295874, 0.095337, 0.0992177, 0.0122517, 0.00239707, -0.173344, 0.519761, 0.10355)
[node name="SpaceGun" parent="Node/Skeleton3D/HandAttachment" index="0" instance=ExtResource("3_c7kd6")]
transform = Transform3D(-0.181021, 0.947541, -0.263434, -0.081767, 0.252432, 0.964154, 0.980074, 0.196072, 0.0317819, -0.0066033, 0.122139, 0.016189)
[node name="SpineIK" type="SkeletonIK3D" parent="Node/Skeleton3D" index="3"]
process_priority = 1
@ -3551,14 +3551,14 @@ playback_default_blend_time = 0.2
[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
libraries = {
"": SubResource("AnimationLibrary_u6bg6")
"": SubResource("AnimationLibrary_hxhxq")
}
tree_root = SubResource("AnimationNodeBlendTree_1ok7t")
anim_player = NodePath("../AnimationPlayer")
parameters/Death/active = false
parameters/Death/internal_active = false
parameters/Death/request = 0
parameters/GroundSpeed/scale = 1.0
parameters/GroundSpeed/scale = 0.0
parameters/Locomotion/blend_position = Vector2(0.0952381, 0.280822)
parameters/OneShot/active = false
parameters/OneShot/internal_active = false

View file

@ -1,11 +1,10 @@
[gd_scene load_steps=22 format=3 uid="uid://cbhx1xme0sb7k"]
[gd_scene load_steps=21 format=3 uid="uid://cbhx1xme0sb7k"]
[ext_resource type="Script" path="res://entities/player/player.gd" id="1_mk68k"]
[ext_resource type="PackedScene" uid="uid://drbefw6akui2v" path="res://entities/player/assets/vanguard.tscn" id="2_beyex"]
[ext_resource type="Shape3D" uid="uid://cb8esdlnottdn" path="res://entities/player/collision_shape.tres" id="2_vjqny"]
[ext_resource type="PackedScene" uid="uid://bcv81ku26xo" path="res://interfaces/hud/hud.tscn" id="3_ccety"]
[ext_resource type="PackedScene" uid="uid://c8co0qa2omjmh" path="res://entities/weapons/space_gun/space_gun.tscn" id="4_6jh57"]
[ext_resource type="PackedScene" uid="uid://dn1tcakam5egs" path="res://entities/weapons/space_gun/projectile.tscn" id="5_2xh36"]
[ext_resource type="PackedScene" uid="uid://bof3mg7wgxrmn" path="res://components/health_component.tscn" id="5_t6i6e"]
[ext_resource type="Script" path="res://entities/player/player_input.gd" id="6_ymcrr"]
[ext_resource type="PackedScene" uid="uid://dsysi2rd3bu76" path="res://interfaces/hud/iffs/iff.tscn" id="7_8hc80"]
@ -28,50 +27,50 @@ length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Smoothing/SpringArm3D/Inventory/SpaceGun:position")
tracks/0/path = NodePath("Smoothing/SpringArm3D:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"times": PackedFloat32Array(0, 0.0001),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Vector3(0.244668, -0.229311, -0.30332)]
"values": [Vector3(0, 0.5, 0), Vector3(0, 0.5, 0)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Smoothing/SpringArm3D/Inventory/SpaceGun:rotation")
tracks/1/path = NodePath("Smoothing/SpringArm3D:rotation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 3.14159, 0)]
"values": [Vector3(0, 0, 0)]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Smoothing/SpringArm3D:position")
tracks/2/path = NodePath("Smoothing/SpringArm3D/Inventory/SpaceGun:position")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 0.5, 0)]
"values": [Vector3(0.15, -0.3, -0.2)]
}
tracks/3/type = "value"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("Smoothing/SpringArm3D:rotation")
tracks/3/path = NodePath("Smoothing/SpringArm3D/Inventory/SpaceGun:rotation")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 0, 0)]
"values": [Vector3(0, 3.14159, 0)]
}
[sub_resource type="Animation" id="Animation_yqgrk"]
@ -115,7 +114,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0, 1.5),
"transitions": PackedFloat32Array(-2, -2),
"update": 0,
"values": [Vector3(0.244668, -0.229311, -0.30332), Vector3(0.244668, -0.26057, -0.30332)]
"values": [Vector3(0.15, -0.3, -0.2), Vector3(0.15, -0.3, -0.2)]
}
tracks/1/type = "value"
tracks/1/imported = false
@ -127,7 +126,7 @@ tracks/1/keys = {
"times": PackedFloat32Array(0, 1.5),
"transitions": PackedFloat32Array(-2, -2),
"update": 0,
"values": [Vector3(0, 3.14159, 0), Vector3(0.114371, 3.14159, -1.73453e-08)]
"values": [Vector3(0, 3.14159, 0), Vector3(0.0698132, 3.14159, 0)]
}
[sub_resource type="Animation" id="Animation_p84l0"]
@ -142,7 +141,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(0.5, 1),
"update": 0,
"values": [Vector3(0.244668, -0.204488, -0.268482), Vector3(0.244668, -0.229311, -0.30332)]
"values": [Vector3(0.15, -0.3, -0.2), Vector3(0.15, -0.3, -0.2)]
}
tracks/1/type = "value"
tracks/1/imported = false
@ -249,7 +248,7 @@ sensor = NodePath("../Sensor")
libraries = {
"": SubResource("AnimationLibrary_hg307")
}
autoplay = "idle"
autoplay = "shoot"
playback_default_blend_time = 0.05
[node name="ServerSynchronizer" type="MultiplayerSynchronizer" parent="."]
@ -271,14 +270,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
spring_length = 0.0
[node name="Camera3D" type="Camera3D" parent="Smoothing/SpringArm3D"]
fov = 100.0
fov = 90.0
near = 0.1
[node name="Inventory" type="Node3D" parent="Smoothing/SpringArm3D"]
[node name="SpaceGun" parent="Smoothing/SpringArm3D/Inventory" instance=ExtResource("4_6jh57")]
transform = Transform3D(-1, 0, 2.53518e-06, 0, 1, 0, -2.53518e-06, 0, -1, 0.244668, -0.229311, -0.30332)
PROJECTILE = ExtResource("5_2xh36")
transform = Transform3D(-1, 0, 2.53518e-06, 0, 1, 0, -2.53518e-06, 0, -1, 0.15, -0.3, -0.2)
[node name="SpineIKTarget" type="Node3D" parent="Smoothing/SpringArm3D"]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)

Binary file not shown.

View file

@ -0,0 +1,50 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://q2v7c7011xva"
path="res://.godot/imported/disclauncher.blend-a26958530956435b197b16a484362916.scn"
[deps]
source_file="res://entities/weapons/space_gun/assets/disclauncher.blend"
dest_files=["res://.godot/imported/disclauncher.blend-a26958530956435b197b16a484362916.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
blender/nodes/visible=0
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true

View file

@ -1,34 +0,0 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://hy0rbh3d1eig"
path="res://.godot/imported/disclauncher.glb-e58edebbe444fad4554f8c76e8b18f06.scn"
[deps]
source_file="res://entities/weapons/space_gun/assets/disclauncher.glb"
dest_files=["res://.godot/imported/disclauncher.glb-e58edebbe444fad4554f8c76e8b18f06.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1

File diff suppressed because one or more lines are too long