9daa8bd · hyper-godot4-test

Changed files (11) +58 -325

game/player/player_core.tscn +1 -117

…	…	@@ -1,7 +1,6 @@
1		[gd_scene load_steps=16 format=3 uid="uid://th4ivyj7adfg"]
	1	[gd_scene load_steps=15 format=3 uid="uid://th4ivyj7adfg"]
2	2
3	3	[ext_resource type="PackedScene" uid="uid://cf6uh7nuu6mlx" path="res://assets/models/gumble/gumble.scn" id="2_fx0ea"]
4		[ext_resource type="AnimationNodeBlendTree" uid="uid://4lcyy2yqlv2m" path="res://game/player/player_animation_tree.tres" id="14_4b160"]
5	4	[ext_resource type="Script" path="res://game/player/player_core.gd" id="24"]
6	5	[ext_resource type="AudioStream" uid="uid://d2voabwtxjm13" path="res://assets/sounds/player/generic_robot_jump.wav" id="25"]
7	6	[ext_resource type="AudioStream" uid="uid://buq4r46riphcr" path="res://assets/sounds/player/metal_footstep_3.wav" id="26"]
…	…	@@ -28,100 +27,6 @@ shape = SubResource( "1" )
28	27
29	28	[node name="Model" parent="." instance=ExtResource( "2_fx0ea" )]
30	29
31		[node name="Skeleton3D" parent="Model/Armature" index="0"]
32		bones/1/position = Vector3(3.74218e-14, 0.0634533, 1.02831)
33		bones/1/rotation = Quaternion(8.46653e-08, 0.61252, 0.790455, 2.99052e-08)
34		bones/2/rotation = Quaternion(0.0925973, -3.56091e-07, -6.91741e-08, 0.995704)
35		bones/3/rotation = Quaternion(-9.68419e-08, 0.998783, 0.0493129, -3.06423e-06)
36		bones/4/rotation = Quaternion(0.00162716, -2.0214e-06, 4.89793e-09, 0.999999)
37		bones/5/rotation = Quaternion(-6.01138e-08, 0.97944, 0.201738, 6.7326e-07)
38		bones/6/rotation = Quaternion(0.0948577, -1.07455e-12, -3.69389e-08, 0.995491)
39		bones/7/rotation = Quaternion(7.0754e-09, 0.995599, 0.0937121, -7.51656e-08)
40		bones/8/position = Vector3(0.021036, 0.157738, 0.0899508)
41		bones/8/rotation = Quaternion(-0.574533, -0.380402, -0.372139, 0.621867)
42		bones/9/rotation = Quaternion(-0.0781163, 0.768422, -0.600986, 0.205526)
43		bones/9/scale = Vector3(0.999877, 1.00025, 0.999877)
44		bones/10/rotation = Quaternion(1.51331e-07, -0.030928, -1.01527e-07, 0.999522)
45		bones/11/rotation = Quaternion(0.131204, -0.0309258, 0.00409734, 0.990864)
46		bones/11/scale = Vector3(0.999664, 1.0007, 0.999638)
47		bones/12/rotation = Quaternion(8.84133e-07, 0.0331753, -6.0102e-07, 0.99945)
48		bones/13/rotation = Quaternion(-0.0275201, 0.0331775, -0.113121, 0.992646)
49		bones/13/scale = Vector3(1.00039, 0.999155, 1.00046)
50		bones/15/position = Vector3(0.000886593, 0.0800313, 1.91273e-05)
51		bones/16/rotation = Quaternion(-0.00581887, 0.0016982, -0.00528009, 0.999968)
52		bones/17/rotation = Quaternion(0.0065653, -0.00667406, 0.0208095, 0.99974)
53		bones/18/position = Vector3(0.0235933, 0.0697305, -0.0610185)
54		bones/18/rotation = Quaternion(0.178116, 0.150551, -0.33769, 0.911907)
55		bones/19/rotation = Quaternion(-0.148158, 0.0254844, -0.0646288, 0.986521)
56		bones/20/rotation = Quaternion(-0.0146405, -0.0187557, 0.0313062, 0.999227)
57		bones/22/position = Vector3(-0.00202787, 0.0783301, -0.00199709)
58		bones/22/rotation = Quaternion(0.155842, 0.00461602, -0.0101422, 0.987719)
59		bones/23/rotation = Quaternion(-0.0133977, -0.000793498, 0.00273888, 0.999906)
60		bones/24/rotation = Quaternion(-0.00209431, 0.00257172, -0.00834415, 0.99996)
61		bones/26/position = Vector3(-0.00151126, 0.077316, -0.000154029)
62		bones/26/rotation = Quaternion(0.118904, 0.0306709, -0.0560406, 0.990848)
63		bones/27/rotation = Quaternion(-0.013392, -0.00270695, 0.00650454, 0.999885)
64		bones/28/rotation = Quaternion(0.000326484, -0.00915124, 0.0211577, 0.999734)
65		bones/30/position = Vector3(0.00136774, 0.0745291, 0.000474518)
66		bones/30/rotation = Quaternion(0.119319, -0.0143616, 0.0193321, 0.992564)
67		bones/31/rotation = Quaternion(-0.0149339, 0.0107445, -0.0181568, 0.999666)
68		bones/32/rotation = Quaternion(0.0224833, -0.00492395, 0.00846113, 0.999699)
69		bones/33/position = Vector3(-0.0210362, 0.157738, 0.0899507)
70		bones/33/rotation = Quaternion(-0.574533, 0.380401, 0.372139, 0.621867)
71		bones/34/rotation = Quaternion(0.0781163, 0.768422, -0.600986, -0.205526)
72		bones/34/scale = Vector3(0.999877, 1.00025, 0.999877)
73		bones/35/rotation = Quaternion(4.894e-07, 0.0309286, 5.70601e-07, 0.999522)
74		bones/36/rotation = Quaternion(0.131205, 0.0309267, -0.00409664, 0.990864)
75		bones/36/scale = Vector3(0.999664, 1.0007, 0.999639)
76		bones/37/rotation = Quaternion(-3.67523e-07, -0.0331773, -2.1813e-07, 0.99945)
77		bones/38/rotation = Quaternion(-0.0275206, -0.0331778, 0.11312, 0.992646)
78		bones/38/scale = Vector3(1.00039, 0.999156, 1.00046)
79		bones/40/position = Vector3(-0.00088668, 0.0800313, 1.89864e-05)
80		bones/40/rotation = Quaternion(0.152494, -0.0320192, 0.0648275, 0.985656)
81		bones/41/rotation = Quaternion(-0.0058182, -0.00169902, 0.00528057, 0.999968)
82		bones/42/rotation = Quaternion(0.00656411, 0.00667606, -0.0208096, 0.99974)
83		bones/43/position = Vector3(-0.0235932, 0.069731, -0.0610188)
84		bones/43/rotation = Quaternion(0.178115, -0.150549, 0.337691, 0.911907)
85		bones/44/rotation = Quaternion(-0.14816, -0.0254828, 0.0646272, 0.98652)
86		bones/45/rotation = Quaternion(-0.0146359, 0.0187393, -0.0313094, 0.999227)
87		bones/47/position = Vector3(0.00202794, 0.0783306, -0.00199749)
88		bones/48/rotation = Quaternion(-0.0134026, 0.000799712, -0.00273872, 0.999906)
89		bones/49/rotation = Quaternion(-0.00209714, -0.00256799, 0.00834452, 0.99996)
90		bones/51/position = Vector3(0.00151125, 0.0773163, -0.000153924)
91		bones/52/rotation = Quaternion(-0.0133977, 0.00271319, -0.00650378, 0.999885)
92		bones/53/rotation = Quaternion(0.000341449, 0.00913482, -0.0211588, 0.999734)
93		bones/55/position = Vector3(-0.00136773, 0.0745294, 0.000474296)
94		bones/55/rotation = Quaternion(0.119319, 0.0143618, -0.0193322, 0.992564)
95		bones/56/rotation = Quaternion(-0.0149346, -0.0107439, 0.0181571, 0.999666)
96		bones/57/rotation = Quaternion(0.0224814, 0.00492577, -0.00846109, 0.999699)
97		bones/58/position = Vector3(0.177163, -0.0671752, -0.0509083)
98		bones/58/rotation = Quaternion(-3.44743e-07, 0.696936, 0.717133, 3.4553e-07)
99		bones/59/position = Vector3(-0.177162, -0.0671751, -0.0509087)
100		bones/59/rotation = Quaternion(-3.44744e-07, 0.696936, 0.717133, 3.4553e-07)
101		bones/60/position = Vector3(3.00642e-07, -0.114907, -0.303985)
102		bones/60/rotation = Quaternion(0.0142813, -4.9445e-07, 7.0621e-09, 0.999898)
103		bones/63/rotation = Quaternion(-0.000665779, -0.126809, 0.991927, 1.72349e-05)
104		bones/63/scale = Vector3(0.998759, 1.00249, 0.99876)
105		bones/64/rotation = Quaternion(-5.08396e-10, -0.124696, -8.00788e-10, 0.992195)
106		bones/65/rotation = Quaternion(0.125008, -0.12471, 0.0159037, 0.984158)
107		bones/65/scale = Vector3(0.999957, 1.00032, 0.999725)
108		bones/66/rotation = Quaternion(-4.15466e-08, -0.00657663, -1.01208e-07, 0.999978)
109		bones/67/rotation = Quaternion(-0.283251, -0.0065805, 0.000842836, 0.959023)
110		bones/67/scale = Vector3(1.00129, 0.998573, 1.00015)
111		bones/68/rotation = Quaternion(-0.0191087, 0.813682, -0.580927, 0.0089989)
112		bones/69/rotation = Quaternion(0.000548311, -0.2102, 0.977658, -0.000684877)
113		bones/69/scale = Vector3(1.00048, 0.999036, 1.00048)
114		bones/70/rotation = Quaternion(-1.86531e-08, -8.05049e-05, -3.07205e-08, 1)
115		bones/71/rotation = Quaternion(0.151268, -8.05677e-05, 3.74502e-06, 0.988493)
116		bones/71/scale = Vector3(1.00003, 0.999812, 1.00016)
117		bones/72/rotation = Quaternion(2.97917e-08, 0.0181738, 3.00053e-10, 0.999835)
118		bones/73/rotation = Quaternion(-0.225792, 0.0181711, -0.00135875, 0.974005)
119		bones/73/scale = Vector3(0.999489, 1.00073, 0.999786)
120		bones/74/rotation = Quaternion(0.0191237, 0.813682, -0.580926, -0.00901949)
121
122		[node name="SkeletonIK3D" parent="Model/Armature/Skeleton3D" index="1"]
123		target_node = NodePath("../../../../GrapplingHook/IKTarget")
124
125	30	[node name="Sound_Jump" type="AudioStreamPlayer3D" parent="Model"]
126	31	transform = Transform3D(1.53846, 0, 0, 0, 1.53846, 0, 0, 0, 1.53846, 0, 0, 0)
127	32	stream = ExtResource( "25" )
…	…	@@ -189,26 +94,5 @@ light_energy = 5.194
189	94	omni_range = 50.9
190	95
191	96	[node name="AnimationTree" type="AnimationTree" parent="."]
192		tree_root = ExtResource( "14_4b160" )
193		anim_player = NodePath("../Model/AnimationPlayer")
194		active = true
195		parameters/Blend2/blend_amount = 0
196		"parameters/Blend2 2/blend_amount" = 0
197		"parameters/TimeScale 3/scale" = 1.0
198		parameters/aim_transition/current = 1
199		parameters/air_blend/blend_amount = 0
200		parameters/air_transition/current = 1
201		parameters/falling_scale/scale = 1.0
202		parameters/iwr_blend/blend_amount = -1.0
203		parameters/jump_scale/scale = 1.0
204		parameters/landing_scale/scale = 1.0
205		parameters/roll/active = false
206		parameters/roll_scale/scale = 1.0
207		parameters/run_scale/scale = 1.0
208		parameters/strafe/blend_position = Vector2(0.00236213, -0.0131004)
209		parameters/walk_scale/scale = 1.0
210		parameters/wall_run/current = 2
211	97
212	98	[connection signal="timeout" from="MoveNetworkTimer" to="." method="_on_MoveNetworkTimer_timeout"]
213
214		[editable path="Model"]

game/player/player_core_local.tscn +1 -163

…	…	@@ -1,169 +1,14 @@
1		[gd_scene load_steps=30 format=3 uid="uid://ds36d5iqtsvuh"]
	1	[gd_scene load_steps=7 format=3 uid="uid://ds36d5iqtsvuh"]
2	2
3	3	[ext_resource type="PackedScene" uid="uid://th4ivyj7adfg" path="res://game/player/player_core.tscn" id="1"]
4	4	[ext_resource type="Script" path="res://game/player/player_core_local_input.gd" id="2"]
5		[ext_resource type="Animation" uid="uid://bhxwd0hc1xwol" path="res://assets/models/tumble/animation/default.res" id="2_3lvdg"]
6	5	[ext_resource type="Script" path="res://game/player/player_core_local_input_special.gd" id="3"]
7		[ext_resource type="Animation" uid="uid://b641gdt8rlxs0" path="res://assets/models/tumble/animation/idle.res" id="3_xfe16"]
8	6	[ext_resource type="PackedScene" uid="uid://bdo2nek3n4knj" path="res://game/player/grappling_hook/gh_visual_point_1.tscn" id="4"]
9		[ext_resource type="Animation" uid="uid://cevud8wm6itgs" path="res://assets/models/tumble/animation/walk-forward.res" id="4_s5ryo"]
10	7	[ext_resource type="PackedScene" uid="uid://cq34ge5fyxan8" path="res://game/player/player_core_local_debugui.tscn" id="5"]
11		[ext_resource type="Animation" uid="uid://bbo2efp3p5j45" path="res://assets/models/tumble/animation/landing.res" id="5_mqp7y"]
12		[ext_resource type="Animation" uid="uid://beqlu220rgebq" path="res://assets/models/tumble/animation/sprint.res" id="6_dqvc6"]
13		[ext_resource type="Animation" uid="uid://3m8jnrrjmb8n" path="res://assets/models/tumble/animation/dive-roll.res" id="7_t5x5g"]
14		[ext_resource type="Animation" uid="uid://csbbfdgwqo8tq" path="res://assets/models/tumble/animation/falling.res" id="8_86wts"]
15	8	[ext_resource type="AudioStream" uid="uid://cs26rjexov20r" path="res://assets/sounds/player/fire_grapplinghook1.mp3" id="9"]
16		[ext_resource type="Animation" uid="uid://cllf5vh5wfe4m" path="res://assets/models/tumble/animation/jump.res" id="9_edfyb"]
17		[ext_resource type="Animation" uid="uid://h4f7tog32k57" path="res://assets/models/tumble/animation/walk-backward.res" id="10_33t3r"]
18		[ext_resource type="Animation" uid="uid://cetrd58cpnn2x" path="res://assets/models/tumble/animation/walk-diagonal-left.res" id="11_v4hfn"]
19		[ext_resource type="Animation" uid="uid://crlfbbyt7jnwd" path="res://assets/models/tumble/animation/walk-diagonal-left-back.res" id="12_6r0iy"]
20		[ext_resource type="Animation" uid="uid://b046urodah0a1" path="res://assets/models/tumble/animation/strafe-left.res" id="13_m6doc"]
21		[ext_resource type="Animation" uid="uid://brqor25qijknl" path="res://assets/models/tumble/animation/walk-diagonal-right.res" id="14_6a5ke"]
22		[ext_resource type="Animation" uid="uid://cy81owqw5jwgd" path="res://assets/models/tumble/animation/walk-diagonal-right-back.res" id="15_htoqq"]
23		[ext_resource type="Animation" uid="uid://rejlngohxkgr" path="res://assets/models/tumble/animation/wall-grab-l.res" id="16_xyssk"]
24		[ext_resource type="Animation" uid="uid://dg0td345nrdbe" path="res://assets/models/tumble/animation/run.res" id="17_8ik7u"]
25		[ext_resource type="Animation" uid="uid://bkvaodakwug3e" path="res://assets/models/tumble/animation/wall-run-l.res" id="18_qntyn"]
26		[ext_resource type="Animation" uid="uid://4ixqttqa6txu" path="res://assets/models/tumble/animation/wall-run-r.res" id="19_3w5sk"]
27		[ext_resource type="Animation" uid="uid://b0vglu3hw56jb" path="res://assets/models/tumble/animation/strafe_right.res" id="20_o2xjy"]
28		[ext_resource type="Animation" uid="uid://diu138rt4wbo4" path="res://assets/models/tumble/animation/wall-grab-f.res" id="21_a34r2"]
29		[ext_resource type="Animation" uid="uid://cjiv1m5iedtef" path="res://assets/models/tumble/animation/wall-grab-r.res" id="22_548fu"]
30
31		[sub_resource type="AnimationLibrary" id="AnimationLibrary_mfbj4"]
32		_data = {
33		"default": ExtResource( "2_3lvdg" ),
34		"dive-roll": ExtResource( "7_t5x5g" ),
35		"falling": ExtResource( "8_86wts" ),
36		"idle": ExtResource( "3_xfe16" ),
37		"jump": ExtResource( "9_edfyb" ),
38		"landing": ExtResource( "5_mqp7y" ),
39		"run": ExtResource( "17_8ik7u" ),
40		"sprint": ExtResource( "6_dqvc6" ),
41		"strafe-left": ExtResource( "13_m6doc" ),
42		"strafe-right": ExtResource( "20_o2xjy" ),
43		"walk-backward": ExtResource( "10_33t3r" ),
44		"walk-diagonal-left": ExtResource( "11_v4hfn" ),
45		"walk-diagonal-left-back": ExtResource( "12_6r0iy" ),
46		"walk-diagonal-right": ExtResource( "14_6a5ke" ),
47		"walk-diagonal-right-back": ExtResource( "15_htoqq" ),
48		"walk-forward": ExtResource( "4_s5ryo" ),
49		"wall_grab_f": ExtResource( "21_a34r2" ),
50		"wall_grab_l": ExtResource( "16_xyssk" ),
51		"wall_grab_r": ExtResource( "22_548fu" ),
52		"wall_run_l": ExtResource( "18_qntyn" ),
53		"wall_run_r": ExtResource( "19_3w5sk" )
54		}
55
56		[sub_resource type="AnimationLibrary" id="AnimationLibrary_jepw0"]
57		_data = {
58		"default": ExtResource( "2_3lvdg" ),
59		"dive-roll": ExtResource( "7_t5x5g" ),
60		"falling": ExtResource( "8_86wts" ),
61		"idle": ExtResource( "3_xfe16" ),
62		"jump": ExtResource( "9_edfyb" ),
63		"landing": ExtResource( "5_mqp7y" ),
64		"run": ExtResource( "17_8ik7u" ),
65		"sprint": ExtResource( "6_dqvc6" ),
66		"strafe-left": ExtResource( "13_m6doc" ),
67		"strafe_right": ExtResource( "20_o2xjy" ),
68		"walk-backward": ExtResource( "10_33t3r" ),
69		"walk-diagonal-left": ExtResource( "11_v4hfn" ),
70		"walk-diagonal-left-back": ExtResource( "12_6r0iy" ),
71		"walk-diagonal-right": ExtResource( "14_6a5ke" ),
72		"walk-diagonal-right-back": ExtResource( "15_htoqq" ),
73		"walk-forward": ExtResource( "4_s5ryo" ),
74		"wall-grab-f": ExtResource( "21_a34r2" ),
75		"wall-grab-l": ExtResource( "16_xyssk" ),
76		"wall-grab-r": ExtResource( "22_548fu" ),
77		"wall-run-l": ExtResource( "18_qntyn" ),
78		"wall-run-r": ExtResource( "19_3w5sk" )
79		}
80	9
81	10	[node name="PlayerCoreLocal" instance=ExtResource( "1" )]
82	11
83		[node name="Skeleton3D" parent="Model/Armature" index="0"]
84		bones/0/position = Vector3(0, 0.235168, 0)
85		bones/1/position = Vector3(0.025113, 0.0234577, 0.751629)
86		bones/1/rotation = Quaternion(0.00601547, 0.544154, 0.838964, -0.000462305)
87		bones/2/rotation = Quaternion(0.111005, 6.04274e-06, -6.8906e-05, 0.99382)
88		bones/3/rotation = Quaternion(0.000393012, 0.999838, -0.0170541, -0.00571777)
89		bones/3/scale = Vector3(1, 1, 1)
90		bones/4/rotation = Quaternion(0.149188, 0.00587571, -0.000327082, 0.988791)
91		bones/5/rotation = Quaternion(-0.000394494, 0.995085, 0.0989721, 0.00322795)
92		bones/6/rotation = Quaternion(0.093461, 0.000127583, 1.31935e-05, 0.995623)
93		bones/7/rotation = Quaternion(0.000435368, 0.990042, 0.140737, 0.00314753)
94		bones/8/position = Vector3(0.021036, 0.1424, 0.0949776)
95		bones/9/rotation = Quaternion(-0.0487467, 0.725476, -0.660537, 0.187082)
96		bones/9/scale = Vector3(1.00213, 0.994925, 1.00213)
97		bones/10/rotation = Quaternion(1.13059e-07, -0.131121, -4.37599e-08, 0.991366)
98		bones/11/rotation = Quaternion(0.188657, -0.131088, 0.0251646, 0.972929)
99		bones/11/scale = Vector3(0.999515, 0.996785, 1.00205)
100		bones/12/rotation = Quaternion(8.89895e-07, 0.132137, -5.21194e-07, 0.991231)
101		bones/13/rotation = Quaternion(-0.159597, 0.137148, -0.230932, 0.949942)
102		bones/13/scale = Vector3(0.998803, 1.0032, 0.996491)
103		bones/16/rotation = Quaternion(-0.00581887, 0.0016982, -0.00528009, 0.999968)
104		bones/17/rotation = Quaternion(0.0065653, -0.00667406, 0.0208095, 0.99974)
105		bones/19/rotation = Quaternion(-0.148158, 0.0254844, -0.0646288, 0.986521)
106		bones/20/rotation = Quaternion(-0.0146405, -0.0187557, 0.0313062, 0.999227)
107		bones/23/rotation = Quaternion(-0.0133977, -0.000793498, 0.00273888, 0.999906)
108		bones/24/rotation = Quaternion(-0.00209431, 0.00257172, -0.00834415, 0.99996)
109		bones/26/rotation = Quaternion(0.118904, 0.0306709, -0.0560406, 0.990848)
110		bones/27/rotation = Quaternion(-0.013392, -0.00270695, 0.00650454, 0.999885)
111		bones/28/rotation = Quaternion(0.000326484, -0.00915123, 0.0211577, 0.999734)
112		bones/30/rotation = Quaternion(0.119319, -0.0143615, 0.0193321, 0.992564)
113		bones/32/rotation = Quaternion(0.0224833, -0.00492395, 0.00846113, 0.999699)
114		bones/33/position = Vector3(-0.0210363, 0.1424, 0.0949775)
115		bones/33/rotation = Quaternion(-0.574533, 0.380401, 0.372139, 0.621867)
116		bones/34/rotation = Quaternion(0.0187844, 0.745717, -0.632811, -0.207613)
117		bones/34/scale = Vector3(1.0061, 0.989602, 1.0061)
118		bones/35/rotation = Quaternion(2.06824e-07, 0.159876, 6.26255e-07, 0.987137)
119		bones/36/rotation = Quaternion(0.410602, 0.150928, -0.0680916, 0.896655)
120		bones/36/scale = Vector3(0.999974, 0.98965, 1.01093)
121		bones/37/rotation = Quaternion(-3.62793e-07, -0.126973, -2.03234e-07, 0.991906)
122		bones/38/rotation = Quaternion(0.0590191, -0.123985, 0.0521213, 0.989155)
123		bones/38/scale = Vector3(0.994385, 1.01068, 0.994872)
124		bones/40/rotation = Quaternion(0.152494, -0.0320192, 0.0648275, 0.985656)
125		bones/41/rotation = Quaternion(-0.0058182, -0.00169902, 0.00528057, 0.999968)
126		bones/42/rotation = Quaternion(0.00656411, 0.00667606, -0.0208096, 0.99974)
127		bones/44/rotation = Quaternion(-0.14816, -0.0254828, 0.0646272, 0.98652)
128		bones/45/rotation = Quaternion(-0.0146359, 0.0187393, -0.0313094, 0.999227)
129		bones/47/rotation = Quaternion(0.155842, -0.0046164, 0.0101418, 0.987719)
130		bones/48/rotation = Quaternion(-0.0134026, 0.000799712, -0.00273872, 0.999906)
131		bones/49/rotation = Quaternion(-0.00209714, -0.00256799, 0.00834452, 0.99996)
132		bones/53/rotation = Quaternion(0.000341449, 0.00913482, -0.0211588, 0.999734)
133		bones/55/rotation = Quaternion(0.119319, 0.0143618, -0.0193322, 0.992564)
134		bones/56/rotation = Quaternion(-0.0149346, -0.0107439, 0.0181571, 0.999666)
135		bones/57/rotation = Quaternion(0.0224814, 0.00492577, -0.00846109, 0.999699)
136		bones/58/position = Vector3(0.177163, -0.0825137, -0.0458816)
137		bones/58/rotation = Quaternion(-3.44743e-07, 0.696936, 0.717133, 3.4553e-07)
138		bones/59/position = Vector3(-0.177162, -0.0825137, -0.045882)
139		bones/59/rotation = Quaternion(-3.44744e-07, 0.696936, 0.717133, 3.4553e-07)
140		bones/60/position = Vector3(2.95953e-07, -0.130245, -0.298959)
141		bones/60/rotation = Quaternion(0.0142813, -4.9445e-07, 7.0621e-09, 0.999898)
142		bones/63/rotation = Quaternion(-0.0170062, -0.665242, 0.740612, -0.0930531)
143		bones/63/scale = Vector3(1.0105, 0.980401, 1.0105)
144		bones/64/rotation = Quaternion(9.34075e-09, -0.0226591, 3.82375e-09, 0.999743)
145		bones/65/rotation = Quaternion(0.597031, -0.0250195, 0.0191747, 0.801599)
146		bones/65/scale = Vector3(1.00123, 0.972417, 1.02762)
147		bones/66/rotation = Quaternion(4.20902e-08, -0.00772438, -8.95655e-08, 0.99997)
148		bones/67/rotation = Quaternion(-0.270103, -0.0101397, -0.135793, 0.953154)
149		bones/67/scale = Vector3(0.98977, 1.01083, 0.998584)
150		bones/69/rotation = Quaternion(-0.00114081, -0.446921, 0.894516, -0.0100913)
151		bones/69/scale = Vector3(1.01298, 0.97375, 1.01298)
152		bones/70/rotation = Quaternion(4.97867e-08, -0.000935263, -6.22435e-09, 1)
153		bones/71/rotation = Quaternion(0.761278, -0.00241582, 0.00298629, 0.648415)
154		bones/71/scale = Vector3(1.00085, 0.970321, 1.0297)
155		bones/72/rotation = Quaternion(4.2561e-08, -0.00532523, -1.17982e-08, 0.999986)
156		bones/73/rotation = Quaternion(0.0133263, -0.0051952, -0.00348867, 0.999892)
157		bones/73/scale = Vector3(0.985484, 1.02391, 0.991301)
158
159		[node name="SkeletonIK3D" parent="Model/Armature/Skeleton3D" index="1"]
160		target_node = NodePath("../../../../GrapplingHook/IKTarget")
161
162		[node name="AnimationPlayer" parent="Model" index="1"]
163		libraries = {
164		"": SubResource( "AnimationLibrary_mfbj4" )
165		}
166
167	12	[node name="Sound_Jump" parent="Model" index="2"]
168	13	transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)
169	14
…	…	@@ -197,11 +42,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.5)
197	42
198	43	[node name="PlayerDebugUI" parent="." index="7" instance=ExtResource( "5" )]
199	44
200		[node name="AnimationPlayer" parent="." index="10"]
201		libraries = {
202		"": SubResource( "AnimationLibrary_jepw0" )
203		}
204
205	45	[connection signal="player_jump" from="Input" to="." method="_on_input_player_jump"]
206	46	[connection signal="player_mousemotion_event" from="Input" to="." method="_on_input_player_mousemotion_event"]
207	47	[connection signal="player_move" from="Input" to="." method="_on_input_player_move"]
…	…	@@ -209,5 +49,3 @@ libraries = {
209	49	[connection signal="player_respawn_player" from="Input" to="." method="_on_input_player_respawn_player"]
210	50	[connection signal="player_shoot_grapplinghook" from="Input" to="." method="_on_input_player_shoot_grapplinghook"]
211	51	[connection signal="player_toggle_light" from="Input" to="." method="_on_input_player_toggle_light"]
212
213		[editable path="Model"]

game/player/player_core_local_debugui.gd +4 -4

…	…	@@ -50,15 +50,15 @@ func _on_map_cyber1_button_up():
50	50
51	51	func tryMapChange(mapChangeName : String, sendGossip : bool):
52	52	var mapCurrentName = actualMapNode.name
53		var mapNode = null
	53	var _mapNode = null
54	54	if(mapCurrentName != mapChangeName):
55	55	actualMapNode.queue_free()
56	56	if(mapChangeName == "map_test"):
57		mapNode = get_tree().get_current_scene().map_test
	57	_mapNode = get_tree().get_current_scene().map_test
58	58	elif(mapChangeName == "map_cyber"):
59		mapNode = get_tree().get_current_scene().map_cyber
	59	_mapNode = get_tree().get_current_scene().map_cyber
60	60	elif(mapChangeName == "map_cyber1"):
61		mapNode = get_tree().get_current_scene().map_cyber1
	61	_mapNode = get_tree().get_current_scene().map_cyber1
62	62	# Update Current Map
63	63	playerNode.currentMap = get_tree().get_current_scene().get_node("CurrentMap").get_child(1)
64	64	# Update Actual Map

game/player/player_core_local_input_special.gd +2 -1

…	…	@@ -30,7 +30,8 @@ func _input(_event):
30	30	UINode.resetUI()
31	31	UINode.showUI()
32	32	if Input.is_action_just_pressed("toggleMouse"):
33		HandleMouseToggle()
	33	# HandleMouseToggle()
	34	return
34	35
35	36	func _process(_delta):
36	37	pass

hypergodot/hyper_gossip/hyper_gossip.gd +3 -0

…	…	@@ -31,6 +31,7 @@ var seen_messages = LRU.new()
31	31	func _ready():
32	32	randomize()
33	33
	34	peerListRequest.name = "PeerListRequest"
34	35	add_child(peerListRequest)
35	36	var callable = Callable(self, "_on_peer_list")
36	37	peerListRequest.connect("request_completed", callable)
…	…	@@ -39,11 +40,13 @@ func _ready():
39	40	for _i in range(pool_size):
40	41	var broadcastRequest = HyperRequest.new()
41	42	broadcastRequest.use_threads = true
	43	broadcastRequest.name = "BroadcastRequest#" + str(_i)
42	44	add_child(broadcastRequest)
43	45	callable = Callable(self, "_on_broadcast_completed")
44	46	broadcastRequest.connect("request_completed", callable)
45	47	requestPool.push_back(broadcastRequest)
46	48
	49	eventSource.name = "HyperEventSource"
47	50	add_child(eventSource)
48	51	callable = Callable(self, "_on_event")
49	52	eventSource.connect("event", callable)

main.gd +2 -4

…	…	@@ -7,10 +7,10 @@ extends Node
7	7	func _ready():
8	8	pass
9	9
10		func _process(delta):
	10	func _process(_delta):
11	11	pass
12	12
13		func getSpawnLocation(bodyNode, mapNode) -> Vector3:
	13	func getSpawnLocation(_bodyNode, mapNode) -> Vector3:
14	14	# Get Number of Maps
15	15	var childCount : int = self.get_child(0).get_child_count()
16	16
…	…	@@ -20,8 +20,6 @@ func getSpawnLocation(bodyNode, mapNode) -> Vector3:
20	20	childCount = playerSpawnNodes.get_child_count()
21	21	# Get Random Spawn Node
22	22	var spawnNode : Node3D = playerSpawnNodes.get_child( randi() % childCount )
23		# Get Global Space
24		var globalCoord = spawnNode.global_transform.origin
25	23
26	24	# Return!
27	25	return spawnNode.global_transform.origin

menu/main/main_main.scn +0 -0

(no content changes — binary or rename)

menu/main/main_multiplayer.scn +0 -0

(no content changes — binary or rename)

menu/main/main_settings.scn +0 -0

(no content changes — binary or rename)

menu/main/menu_main.gd +45 -36

…	…	@@ -4,13 +4,14 @@ signal replace_main_scene
4	4	#warning-ignore:unused_signal
5	5	signal quit # Useless, but needed as there is no clean way to check if a node exposes a signal
6	6
7		@onready var ui = $Menu_Main
8		@onready var uiProper = $Menu_Main/CenterContainer
	7	@onready var ui = $CenterContainer
	8	@onready var uiProper = $CenterContainer
9	9
10	10	@onready var main = uiProper.get_node("Main")
11		@onready var play_button = main.get_node("Resume")
12		@onready var settings_button = main.get_node("Settings")
13		@onready var quit_button = main.get_node("Quit")
	11	@onready var resume_button : Button = main.get_node("Resume")
	12	@onready var settings_button : Button = main.get_node("Settings")
	13	@onready var multiplayer_button : Button = main.get_node("Multiplayer")
	14	@onready var quit_button : Button = main.get_node("Quit")
14	15
15	16	@onready var settings_menu = uiProper.get_node("Settings")
16	17	@onready var settings_actions = settings_menu.get_node("Actions")
…	…	@@ -24,6 +25,7 @@ signal quit # Useless, but needed as there is no clean way to check if a node ex
24	25	@onready var multiplayer_LabelGossipStatus = multiplayer_menu.get_node("HyperGossipStatus").get_node("LabelGossipStatus")
25	26	@onready var multiplayer_PortInput = multiplayer_menu.get_node("HyperGatewayPort").get_node("LineEdit")
26	27	@onready var multiplayer_GossipURLInput = multiplayer_menu.get_node("GossipURL").get_node("LineEdit")
	28	@onready var multiplayer_actions_ok = multiplayer_menu.get_node("Actions").get_node("OK")
27	29
28	30	@onready var shadows_menu = settings_menu.get_node("Shadows")
29	31	@onready var shadows_4096 = shadows_menu.get_node("4096")
…	…	@@ -32,8 +34,8 @@ signal quit # Useless, but needed as there is no clean way to check if a node ex
32	34	@onready var shadows_disabled = shadows_menu.get_node("Disabled")
33	35
34	36	@onready var gi_menu = settings_menu.get_node("GI")
35		@onready var gi_high = gi_menu.get_node("High")
36		@onready var gi_low = gi_menu.get_node("Low")
	37	@onready var gi_full = gi_menu.get_node("Full")
	38	@onready var gi_half = gi_menu.get_node("Half")
37	39	@onready var gi_disabled = gi_menu.get_node("Disabled")
38	40
39	41	@onready var aa_menu = settings_menu.get_node("AA")
…	…	@@ -62,6 +64,25 @@ func _ready():
62	64	# get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_2D, SceneTree.STRETCH_ASPECT_KEEP, Vector2(1440, 810))
63	65	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
64	66
	67	# Setup Signals
	68	var callable
	69	callable = Callable(self, "_on_resume_pressed")
	70	resume_button.connect("pressed", callable)
	71	callable = Callable(self, "_on_settings_pressed")
	72	settings_button.connect("pressed", callable)
	73	callable = Callable(self, "_on_multiplayer_pressed")
	74	multiplayer_button.connect("pressed", callable)
	75	callable = Callable(self, "_on_quit_pressed")
	76	quit_button.connect("pressed", callable)
	77
	78	callable = Callable(self, "_on_settings_apply_pressed")
	79	settings_action_apply.connect("pressed", callable)
	80	callable = Callable(self, "_on_settings_cancel_pressed")
	81	settings_action_cancel.connect("pressed", callable)
	82
	83	callable = Callable(self, "_on_multiplayer_ok_pressed")
	84	multiplayer_actions_ok.connect("pressed", callable)
	85
65	86	func _getIsMenuShowing() -> bool:
66	87	return ui.visible
67	88
…	…	@@ -82,11 +103,7 @@ func resetUI():
82	103	multiplayer_menu.hide()
83	104	main.show()
84	105
85		func _on_Quit_pressed():
86		get_tree().quit()
87
88
89		func _on_Settings_pressed():
	106	func _on_settings_pressed():
90	107	main.hide()
91	108	settings_menu.show()
92	109	settings_action_cancel.grab_focus()
…	…	@@ -96,9 +113,9 @@ func _on_Settings_pressed():
96	113	world_environment = get_tree().get_current_scene().find_child("WorldEnvironment", true, false)
97	114
98	115	if Settings.gi_quality == Settings.GIQuality.HIGH:
99		gi_high.button_pressed = true
	116	gi_full.button_pressed = true
100	117	elif Settings.gi_quality == Settings.GIQuality.LOW:
101		gi_low.button_pressed = true
	118	gi_half.button_pressed = true
102	119	elif Settings.gi_quality == Settings.GIQuality.DISABLED:
103	120	gi_disabled.button_pressed = true
104	121
…	…	@@ -142,7 +159,7 @@ func _UpdateHyperGossipInfo():
142	159	multiplayer_LabelGossipStatus.text = hyperGossipURL
143	160
144	161
145		func _on_Multiplayer_pressed():
	162	func _on_multiplayer_pressed():
146	163	main.hide()
147	164	# Check for HyperGateway Node
148	165	if(hyperGatewayNode == null):
…	…	@@ -159,39 +176,39 @@ func _on_Multiplayer_pressed():
159	176	func ChangeGIProbeVisibility(_visible : bool):
160	177	pass
161	178
162		func _on_Apply_pressed():
	179	func _on_settings_apply_pressed():
163	180	main.show()
164	181	# play_button.grab_focus()
165	182	settings_menu.hide()
166	183
167		if shadows_4096.pressed:
	184	if shadows_4096.button_pressed:
168	185	Settings.shadows_quality = Settings.ShadowsQuality.SHADOWS_4096
169	186	ProjectSettings["rendering/shadows/directional_shadow/size"] = 4096
170	187	ProjectSettings["rendering/shadows/shadow_atlas/size"] = 4096
171	188	ProjectSettings["rendering/shadows/directional_shadow/soft_shadow_quality"] = 2
172		elif shadows_2048.pressed:
	189	elif shadows_2048.button_pressed:
173	190	Settings.shadows_quality = Settings.ShadowsQuality.SHADOWS_2048
174	191	ProjectSettings["rendering/shadows/directional_shadow/size"] = 2048
175	192	ProjectSettings["rendering/shadows/shadow_atlas/size"] = 2048
176	193	ProjectSettings["rendering/shadows/directional_shadow/soft_shadow_quality"] = 2
177		elif shadows_1024.pressed:
	194	elif shadows_1024.button_pressed:
178	195	Settings.shadows_quality = Settings.ShadowsQuality.SHADOWS_1024
179	196	ProjectSettings["rendering/shadows/directional_shadow/size"] = 1024
180	197	ProjectSettings["rendering/shadows/shadow_atlas/size"] = 1024
181	198	ProjectSettings["rendering/shadows/directional_shadow/soft_shadow_quality"] = 2
182		elif shadows_disabled.pressed:
	199	elif shadows_disabled.button_pressed:
183	200	Settings.shadows_quality = Settings.ShadowsQuality.DISABLED
184	201	ProjectSettings["rendering/shadows/directional_shadow/size"] = 0
185	202	ProjectSettings["rendering/shadows/shadow_atlas/size"] = 0
186	203	ProjectSettings["rendering/shadows/directional_shadow/soft_shadow_quality"] = 2
187	204
188		if gi_high.pressed:
	205	if gi_full.button_pressed:
189	206	Settings.gi_quality = Settings.GIQuality.HIGH
190	207	ProjectSettings["rendering/quality/voxel_cone_tracing/high_quality"] = true
191		elif gi_low.pressed:
	208	elif gi_half.button_pressed:
192	209	Settings.gi_quality = Settings.GIQuality.LOW
193	210	ProjectSettings["rendering/quality/voxel_cone_tracing/high_quality"] = false
194		elif gi_disabled.pressed:
	211	elif gi_disabled.button_pressed:
195	212	Settings.gi_quality = Settings.GIQuality.DISABLED
196	213
197	214	if aa_8x.button_pressed:
…	…	@@ -211,17 +228,17 @@ func _on_Apply_pressed():
211	228	ProjectSettings["rendering/anti_aliasing/quality/msaa"] = 0
212	229	get_viewport().msaa = Viewport.MSAA_DISABLED
213	230
214		if bloom_high.pressed:
	231	if bloom_high.button_pressed:
215	232	Settings.bloom_quality = Settings.BloomQuality.HIGH
216	233	if(world_environment != null):
217	234	world_environment.environment.glow_enabled = true
218	235	ProjectSettings["rendering/environment/glow/upscale_mode"] = 1
219		elif bloom_low.pressed:
	236	elif bloom_low.button_pressed:
220	237	Settings.bloom_quality = Settings.BloomQuality.LOW
221	238	if(world_environment != null):
222	239	world_environment.environment.glow_enabled = true
223	240	ProjectSettings["rendering/environment/glow/upscale_mode"] = 0
224		elif bloom_disabled.pressed:
	241	elif bloom_disabled.button_pressed:
225	242	Settings.bloom_quality = Settings.BloomQuality.DISABLED
226	243	if(world_environment != null):
227	244	world_environment.environment.glow_enabled = false
…	…	@@ -230,19 +247,12 @@ func _on_Apply_pressed():
230	247	Settings.save_settings()
231	248
232	249
233		func _on_Cancel_pressed():
	250	func _on_settings_cancel_pressed():
234	251	main.show()
235	252	# play_button.grab_focus()
236	253	settings_menu.hide()
237	254
238
239		func _on_Multiplayer_Cancel_pressed():
240		main.show()
241		# play_button.grab_focus()
242		multiplayer_menu.hide()
243
244
245		func _on_Multiplayer_Apply_pressed():
	255	func _on_multiplayer_ok_pressed():
246	256	main.show()
247	257	# play_button.grab_focus()
248	258	multiplayer_menu.hide()
…	…	@@ -258,7 +268,6 @@ func _on_Start_pressed():
258	268
259	269	func _on_Stop_pressed():
260	270	hyperGatewayNode.stop()
261		multiplayer_PortInput
262	271	_UpdateHyperGatewayInfo()
263	272	_UpdateHyperGossipInfo()
264	273

menu/main/menu_main.scn +0 -0

(no content changes — binary or rename)

hyper-godot4-test commits / 9daa8bd

Changed files (11) +58 -325