OverviewFilesCommitsIssuesDocsReleasesPeers

hyper-godot4-test commits / bf0b0f3

who knows what Godot 4 is doing anymore
bf0b0f399e0d86ebfe4cf2d30f90c51c14d38053
by Dresk Spidflisk <dreskspidflisk@gmail.com> · 2022-04-28T21:31:47.000Z

Changed files (11) +87 -90

assets/maps/map_cyber1/map_cyber1_environment.scn +0 -0
(no content changes — binary or rename)
assets/maps/map_cyber1/map_cyber1_environment.tscn +0 -12
……@@ -1,12 +0,0 @@
1[gd_scene load_steps=2 format=3 uid="uid://cxn43lx644yab"]
2
3[ext_resource type="Environment" uid="uid://kt6gwojt2hio" path="res://assets/maps/map_cyber1/map_cyber1_environment.res" id="1_gxeta"]
4
5[node name="WorldEnvironment" type="WorldEnvironment"]
6environment = ExtResource( "1_gxeta" )
7
8[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
9transform = Transform3D(1.95686e-08, 0.754228, 0.656612, 2.24778e-08, -0.656612, 0.754228, 1, 8.88178e-16, -2.98023e-08, 0, 0, 0)
10light_color = Color(1, 0, 0.117647, 1)
11light_angular_distance = 4.44
12shadow_enabled = true
assets/maps/map_test/map_test_environment.res +0 -0
(no content changes — binary or rename)
assets/maps/map_test/map_test_environment.scn +0 -0
(no content changes — binary or rename)
game/map_decorations/teleport.scn +0 -0
(no content changes — binary or rename)
game/maps/map_core.gd +6 -4
……@@ -17,11 +17,13 @@ func getSpawnLocation() -> Vector3:
1717 return spawnNode.global_transform.origin
1818
1919func getInstanceOfMapWorldEnvironmentScene():
20 var new_environment_node = WorldEnvironment.new()
21 var path = "res://assets/maps/" + map_name + "/" + map_name + "_environment.res"
22 new_environment_node.environment = load(path)
20 # var new_environment_node = WorldEnvironment.new()
21 var path = "res://assets/maps/" + map_name + "/" + map_name + "_environment.scn"
22 var newNode = load(path).instantiate()
23 # new_environment_node.environment = load(path)
24 # new_environment_node.name = "WorldEnvironment"
2325
24 return new_environment_node
26 return newNode
2527
2628func updateMapWorldEnvironmentScene():
2729 # First check to see if we need to delete any existing World Environments
game/maps/map_cyber/map_cyber.tscn +1 -1
……@@ -1,6 +1,6 @@
11[gd_scene load_steps=7 format=3 uid="uid://bnmqs28j8wtp1"]
22
3[ext_resource type="PackedScene" uid="uid://denmfe20xh0b4" path="res://assets/maps/map_cyber/level0.scn" id="2"]
3[ext_resource type="PackedScene" path="res://assets/maps/map_cyber/level0.scn" id="2"]
44[ext_resource type="PackedScene" uid="uid://cexotumax31qe" path="res://game/map_decorations/spawnpad.tscn" id="3"]
55[ext_resource type="Script" path="res://game/maps/map_core.gd" id="4"]
66[ext_resource type="PackedScene" uid="uid://csegj0tubaqd1" path="res://game/map_decorations/teleport.scn" id="5"]
game/maps/map_cyber1/map_cyber1.tscn +4 -4
……@@ -2,8 +2,8 @@
22
33[ext_resource type="Script" path="res://game/maps/map_core.gd" id="1_7e0sh"]
44[ext_resource type="PackedScene" uid="uid://ymtm57x2epu0" path="res://assets/maps/map_cyber1/map_cyber1.scn" id="1_16m0b"]
5[ext_resource type="PackedScene" uid="uid://cxn43lx644yab" path="res://assets/maps/map_cyber1/map_cyber1_environment.tscn" id="1_fj65l"]
65[ext_resource type="PackedScene" uid="uid://cexotumax31qe" path="res://game/map_decorations/spawnpad.tscn" id="2_epjbj"]
6[ext_resource type="PackedScene" uid="uid://dxdrpslwynns8" path="res://assets/maps/map_cyber1/map_cyber1_environment.scn" id="2_kq686"]
77[ext_resource type="PackedScene" uid="uid://csegj0tubaqd1" path="res://game/map_decorations/teleport.scn" id="3_o3mmd"]
88
99[sub_resource type="BoxShape3D" id="BoxShape3D_ildfq"]
……@@ -11,6 +11,9 @@ size = Vector3(500, 500, 500)
1111
1212[node name="map_cyber1" type="Node3D"]
1313script = ExtResource( "1_7e0sh" )
14map_name = "map_cyber1"
15
16[node name="WorldEnvironment" parent="." instance=ExtResource( "2_kq686" )]
1417
1518[node name="PlayerSpawnNodes" type="Node3D" parent="."]
1619
……@@ -31,11 +34,8 @@ teleportation_destination = "map_cyber"
3134[node name="CollisionShape" type="CollisionShape3D" parent="Area"]
3235shape = SubResource( "BoxShape3D_ildfq" )
3336
34[node name="WorldEnvironment" parent="." instance=ExtResource( "1_fj65l" )]
35
3637[node name="asset_map_cyber1" parent="." instance=ExtResource( "1_16m0b" )]
3738transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000886917, -9.53674e-07, -0.0444121)
3839
39[editable path="WorldEnvironment"]
4040[editable path="asset_map_cyber1"]
4141[editable path="asset_map_cyber1/asset_map_cyber1"]
game/player/player_animation_tree.tres +1 -1
……@@ -187,4 +187,4 @@ nodes/walk_scale/node = SubResource( "AnimationNodeTimeScale_bvg56" )
187187nodes/walk_scale/position = Vector2(-640, 360)
188188nodes/wall_run/node = SubResource( "AnimationNodeTransition_ur2dc" )
189189nodes/wall_run/position = Vector2(720, -60)
190node_connections = [&"output", 0, &"wall_run", &"roll", 0, &"air_transition", &"roll", 1, &"roll_scale", &"Blend2", 0, &"Animation 8", &"Blend2", 1, &"Animation 9", &"Blend2 2", 0, &"Animation 12", &"Blend2 2", 1, &"Animation 10", &"TimeScale 3", 0, &"strafe", &"aim_transition", 0, &"TimeScale 3", &"aim_transition", 1, &"iwr_blend", &"air_blend", 0, &"jump_scale", &"air_blend", 1, &"falling_scale", &"air_blend", 2, &"landing_scale", &"iwr_blend", 0, &"Animation 2", &"iwr_blend", 1, &"walk_scale", &"iwr_blend", 2, &"run_scale", &"roll_scale", 0, &"Animation", &"jump_scale", 0, &"Animation 6", &"walk_scale", 0, &"Animation 4", &"wall_run", 0, &"Blend2", &"wall_run", 1, &"Blend2 2", &"wall_run", 2, &"roll", &"air_transition", 0, &"air_blend", &"air_transition", 1, &"aim_transition", &"run_scale", 0, &"Animation 5", &"landing_scale", 0, &"Animation 3", &"falling_scale", 0, &"Animation 7"]
190node_connections = [&"output", 0, &"wall_run", &"roll", 0, &"air_transition", &"roll", 1, &"roll_scale", &"air_blend", 0, &"jump_scale", &"air_blend", 1, &"falling_scale", &"air_blend", 2, &"landing_scale", &"roll_scale", 0, &"Animation", &"wall_run", 0, &"Blend2", &"wall_run", 1, &"Blend2 2", &"wall_run", 2, &"roll", &"falling_scale", 0, &"Animation 7", &"run_scale", 0, &"Animation 5", &"air_transition", 0, &"air_blend", &"air_transition", 1, &"aim_transition", &"jump_scale", 0, &"Animation 6", &"walk_scale", 0, &"Animation 4", &"TimeScale 3", 0, &"strafe", &"Blend2", 0, &"Animation 8", &"Blend2", 1, &"Animation 9", &"Blend2 2", 0, &"Animation 12", &"Blend2 2", 1, &"Animation 10", &"iwr_blend", 0, &"Animation 2", &"iwr_blend", 1, &"walk_scale", &"iwr_blend", 2, &"run_scale", &"aim_transition", 0, &"TimeScale 3", &"aim_transition", 1, &"iwr_blend", &"landing_scale", 0, &"Animation 3"]
game/player/player_core.tscn +30 -23
……@@ -1,4 +1,4 @@
1[gd_scene load_steps=37 format=3 uid="uid://th4ivyj7adfg"]
1[gd_scene load_steps=38 format=3 uid="uid://th4ivyj7adfg"]
22
33[ext_resource type="PackedScene" uid="uid://cpk1cfupvkvxd" path="res://assets/models/tumble/model_tumble.tscn" id="1"]
44[ext_resource type="AnimationNodeBlendTree" uid="uid://4lcyy2yqlv2m" path="res://game/player/player_animation_tree.tres" id="14_4b160"]
……@@ -40,6 +40,31 @@
4040height = 1.58
4141radius = 0.3
4242
43[sub_resource type="AnimationLibrary" id="AnimationLibrary_3jl3u"]
44_data = {
45"default": ExtResource( "15_khbab" ),
46"dive-roll": ExtResource( "16_8624j" ),
47"falling": ExtResource( "17_8nvgv" ),
48"idle": ExtResource( "18_ti6sk" ),
49"jump": ExtResource( "18_cd8xy" ),
50"landing": ExtResource( "19_s06o7" ),
51"run": ExtResource( "20_c1ief" ),
52"sprint": ExtResource( "21_logsa" ),
53"strafe-left": ExtResource( "22_vb2y3" ),
54"strafe_right": ExtResource( "23_njdo4" ),
55"walk-backward": ExtResource( "24_yc4q7" ),
56"walk-diagonal-left": ExtResource( "25_y8rok" ),
57"walk-diagonal-left-back": ExtResource( "26_q8krr" ),
58"walk-diagonal-right": ExtResource( "27_arv07" ),
59"walk-diagonal-right-back": ExtResource( "28_soxwl" ),
60"walk-forward": ExtResource( "29_hyowf" ),
61"wall-grab-f": ExtResource( "30_8o6lq" ),
62"wall-grab-l": ExtResource( "31_tqbd2" ),
63"wall-grab-r": ExtResource( "32_1j1wk" ),
64"wall-run-l": ExtResource( "33_35j74" ),
65"wall-run-r": ExtResource( "34_rq5gl" )
66}
67
4368[node name="PlayerCore" type="CharacterBody3D"]
4469script = ExtResource( "24" )
4570
……@@ -113,7 +138,7 @@ transform = Transform3D(-0.454202, 0.376862, -0.807264, 0.862653, -0.0403142, -0
113138transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.769087, 0)
114139visible = false
115140light_energy = 5.194
116omni_range = 2.23
141omni_range = 50.9
117142
118143[node name="AnimationTree" type="AnimationTree" parent="."]
119144tree_root = ExtResource( "14_4b160" )
……@@ -138,26 +163,8 @@ parameters/wall_run/current = 2
138163
139164[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
140165root_node = NodePath("../Model")
141anims/default = ExtResource( "15_khbab" )
142anims/dive-roll = ExtResource( "16_8624j" )
143anims/falling = ExtResource( "17_8nvgv" )
144anims/idle = ExtResource( "18_ti6sk" )
145anims/jump = ExtResource( "18_cd8xy" )
146anims/landing = ExtResource( "19_s06o7" )
147anims/run = ExtResource( "20_c1ief" )
148anims/sprint = ExtResource( "21_logsa" )
149anims/strafe-left = ExtResource( "22_vb2y3" )
150anims/strafe_right = ExtResource( "23_njdo4" )
151anims/walk-backward = ExtResource( "24_yc4q7" )
152anims/walk-diagonal-left = ExtResource( "25_y8rok" )
153anims/walk-diagonal-left-back = ExtResource( "26_q8krr" )
154anims/walk-diagonal-right = ExtResource( "27_arv07" )
155anims/walk-diagonal-right-back = ExtResource( "28_soxwl" )
156anims/walk-forward = ExtResource( "29_hyowf" )
157anims/wall-grab-f = ExtResource( "30_8o6lq" )
158anims/wall-grab-l = ExtResource( "31_tqbd2" )
159anims/wall-grab-r = ExtResource( "32_1j1wk" )
160anims/wall-run-l = ExtResource( "33_35j74" )
161anims/wall-run-r = ExtResource( "34_rq5gl" )
166libraries = {
167"": SubResource( "AnimationLibrary_3jl3u" )
168}
162169
163170[connection signal="timeout" from="MoveNetworkTimer" to="." method="_on_MoveNetworkTimer_timeout"]
game/player/player_core_local.tscn +45 -45
……@@ -82,25 +82,25 @@ _data = {
8282
8383[node name="Skeleton3D" parent="Model/Armature" index="0"]
8484bones/0/position = Vector3(0, 0.235168, 0)
85bones/1/position = Vector3(-0.0294857, 0.0211438, 0.772159)
86bones/1/rotation = Quaternion(0.000344006, 0.566095, 0.824339, 0.000950204)
87bones/2/rotation = Quaternion(0.106372, 1.20848e-05, -0.000133848, 0.994326)
88bones/3/rotation = Quaternion(0.000773373, 0.999177, -0.0402888, -0.00469782)
85bones/1/position = Vector3(-0.029438, 0.0211749, 0.771888)
86bones/1/rotation = Quaternion(0.000375906, 0.565812, 0.824534, 0.00103834)
87bones/2/rotation = Quaternion(0.106818, 1.32386e-05, -0.000146255, 0.994279)
88bones/3/rotation = Quaternion(0.000845101, 0.999184, -0.0400496, -0.00513328)
8989bones/3/scale = Vector3(1, 1, 1)
90bones/4/rotation = Quaternion(0.127912, 0.00466565, -0.000360719, 0.991774)
91bones/5/rotation = Quaternion(-0.000682313, 0.995039, 0.0993858, 0.00440634)
92bones/6/rotation = Quaternion(0.0942382, 5.65126e-05, 5.81163e-06, 0.99555)
93bones/7/rotation = Quaternion(0.000637103, 0.99143, 0.130566, 0.00441509)
94bones/8/position = Vector3(0.021036, 0.147372, 0.0929216)
90bones/4/rotation = Quaternion(0.128212, 0.0050986, -0.000394213, 0.991734)
91bones/5/rotation = Quaternion(-0.000745599, 0.99504, 0.0993588, 0.004815)
92bones/6/rotation = Quaternion(0.0941808, 6.17544e-05, 6.35412e-06, 0.995555)
93bones/7/rotation = Quaternion(0.000696197, 0.991409, 0.130705, 0.00482462)
94bones/8/position = Vector3(0.021036, 0.147294, 0.0929496)
9595bones/8/rotation = Quaternion(-0.574533, -0.380402, -0.372139, 0.621867)
96bones/9/rotation = Quaternion(0.0377122, 0.753412, -0.615348, 0.228681)
97bones/9/scale = Vector3(1.00609, 0.987752, 1.00609)
98bones/10/rotation = Quaternion(1.49667e-07, -0.124096, 9.1207e-11, 0.99227)
99bones/11/rotation = Quaternion(0.438577, -0.103178, 0.0505045, 0.891322)
100bones/11/scale = Vector3(0.999515, 0.989107, 1.0113)
101bones/12/rotation = Quaternion(9.76131e-07, 0.0864995, -4.92131e-07, 0.996252)
102bones/13/rotation = Quaternion(-0.0721799, 0.0731169, -0.127922, 0.986448)
103bones/13/scale = Vector3(0.994905, 1.01004, 0.995154)
96bones/9/rotation = Quaternion(0.037767, 0.752982, -0.615964, 0.228428)
97bones/9/scale = Vector3(1.00607, 0.987783, 1.00607)
98bones/10/rotation = Quaternion(1.48976e-07, -0.126743, -7.47887e-10, 0.991936)
99bones/11/rotation = Quaternion(0.43762, -0.103929, 0.0507368, 0.891692)
100bones/11/scale = Vector3(0.999515, 0.989137, 1.01123)
101bones/12/rotation = Quaternion(9.76345e-07, 0.0887699, -4.90995e-07, 0.996052)
102bones/13/rotation = Quaternion(-0.0705242, 0.0741511, -0.127807, 0.986506)
103bones/13/scale = Vector3(0.994858, 1.01004, 0.995203)
104104bones/16/rotation = Quaternion(-0.00581887, 0.0016982, -0.00528009, 0.999968)
105105bones/17/rotation = Quaternion(0.0065653, -0.00667406, 0.0208095, 0.99974)
106106bones/18/rotation = Quaternion(0.178116, 0.150551, -0.33769, 0.911907)
……@@ -115,16 +115,16 @@ bones/28/rotation = Quaternion(0.000326484, -0.00915123, 0.0211577, 0.999734)
115115bones/30/rotation = Quaternion(0.119319, -0.0143615, 0.0193321, 0.992564)
116116bones/31/rotation = Quaternion(-0.0149339, 0.0107445, -0.0181568, 0.999666)
117117bones/32/rotation = Quaternion(0.0224833, -0.00492395, 0.00846113, 0.999699)
118bones/33/position = Vector3(-0.0210362, 0.147372, 0.0929216)
118bones/33/position = Vector3(-0.0210362, 0.147294, 0.0929496)
119119bones/33/rotation = Quaternion(-0.574533, 0.380401, 0.372139, 0.621867)
120bones/34/rotation = Quaternion(0.178206, 0.761345, -0.598046, -0.175891)
121bones/34/scale = Vector3(1.00597, 0.987432, 1.00597)
122bones/35/rotation = Quaternion(2.3905e-07, 0.10966, 6.66501e-07, 0.993969)
123bones/36/rotation = Quaternion(0.341911, 0.108682, -0.0390558, 0.932609)
124bones/36/scale = Vector3(0.999974, 0.992927, 1.00736)
125bones/37/rotation = Quaternion(-3.68208e-07, -0.129935, -1.96961e-07, 0.991522)
126bones/38/rotation = Quaternion(-0.314978, -0.129064, 0.264728, 0.902247)
127bones/38/scale = Vector3(0.999465, 1.00217, 0.998279)
120bones/34/rotation = Quaternion(0.177806, 0.761236, -0.598295, -0.175918)
121bones/34/scale = Vector3(1.00592, 0.987462, 1.00592)
122bones/35/rotation = Quaternion(2.38357e-07, 0.110399, 6.66859e-07, 0.993887)
123bones/36/rotation = Quaternion(0.338102, 0.109359, -0.038779, 0.933929)
124bones/36/scale = Vector3(0.999974, 0.993164, 1.00712)
125bones/37/rotation = Quaternion(-3.68039e-07, -0.129643, -1.96955e-07, 0.991561)
126bones/38/rotation = Quaternion(-0.314132, -0.128754, 0.264375, 0.90269)
127bones/38/scale = Vector3(0.99943, 1.00221, 0.998245)
128128bones/40/rotation = Quaternion(0.152494, -0.0320192, 0.0648275, 0.985656)
129129bones/41/rotation = Quaternion(-0.0058182, -0.00169902, 0.00528057, 0.999968)
130130bones/42/rotation = Quaternion(0.00656411, 0.00667606, -0.0208096, 0.99974)
……@@ -137,28 +137,28 @@ bones/53/rotation = Quaternion(0.000341449, 0.00913482, -0.0211588, 0.999734)
137137bones/55/rotation = Quaternion(0.119319, 0.0143618, -0.0193322, 0.992564)
138138bones/56/rotation = Quaternion(-0.0149346, -0.0107439, 0.0181571, 0.999666)
139139bones/57/rotation = Quaternion(0.0224814, 0.00492577, -0.00846109, 0.999699)
140bones/58/position = Vector3(0.177163, -0.0775409, -0.0479375)
140bones/58/position = Vector3(0.177163, -0.0776189, -0.0479095)
141141bones/58/rotation = Quaternion(-3.44743e-07, 0.696936, 0.717133, 3.4553e-07)
142bones/59/position = Vector3(-0.177162, -0.0775411, -0.0479378)
142bones/59/position = Vector3(-0.177162, -0.0776191, -0.0479098)
143143bones/59/rotation = Quaternion(-3.44744e-07, 0.696936, 0.717133, 3.4553e-07)
144bones/60/position = Vector3(2.97518e-07, -0.125272, -0.301014)
144bones/60/position = Vector3(2.97301e-07, -0.12535, -0.300986)
145145bones/60/rotation = Quaternion(0.0142813, -4.9445e-07, 7.0621e-09, 0.999898)
146bones/63/rotation = Quaternion(-0.00545264, -0.262396, 0.964565, -0.0270896)
147bones/63/scale = Vector3(1.00951, 0.980962, 1.00951)
148bones/64/rotation = Quaternion(2.8338e-08, -0.0026095, 9.66004e-09, 0.999997)
149bones/65/rotation = Quaternion(0.635927, -0.00310922, 0.00190361, 0.771741)
150bones/65/scale = Vector3(1.00055, 0.976808, 1.02331)
151bones/66/rotation = Quaternion(5.88382e-09, -0.0076667, -9.25636e-08, 0.999971)
152bones/67/rotation = Quaternion(-0.565286, -0.00767686, -0.0273053, 0.824407)
153bones/67/scale = Vector3(0.989904, 1.00448, 1.00603)
154bones/69/rotation = Quaternion(0.0181281, -0.65148, 0.751912, 0.0993692)
155bones/69/scale = Vector3(1.00922, 0.9821, 1.00922)
156bones/70/rotation = Quaternion(-2.8665e-08, 0.023263, 9.11086e-09, 0.999729)
157bones/71/rotation = Quaternion(0.527125, 0.023009, -0.0146543, 0.84935)
158bones/71/scale = Vector3(1.00085, 0.976242, 1.02367)
159bones/72/rotation = Quaternion(2.15633e-08, 0.00702815, -2.83905e-08, 0.999975)
160bones/73/rotation = Quaternion(-0.212118, 0.00687551, 0.135746, 0.967746)
161bones/73/scale = Vector3(0.992242, 1.01384, 0.993809)
146bones/63/rotation = Quaternion(-0.00526412, -0.265308, 0.963798, -0.0260235)
147bones/63/scale = Vector3(1.00972, 0.980523, 1.00972)
148bones/64/rotation = Quaternion(2.83777e-08, -0.0022857, 9.51757e-09, 0.999997)
149bones/65/rotation = Quaternion(0.642537, -0.00283286, 0.00169495, 0.766248)
150bones/65/scale = Vector3(1.00059, 0.976407, 1.0237)
151bones/66/rotation = Quaternion(6.48539e-09, -0.00773406, -9.25361e-08, 0.99997)
152bones/67/rotation = Quaternion(-0.539795, -0.00780617, -0.0250915, 0.841386)
153bones/67/scale = Vector3(0.989649, 1.00553, 1.00526)
154bones/69/rotation = Quaternion(0.0180978, -0.652815, 0.750776, 0.0992007)
155bones/69/scale = Vector3(1.00929, 0.981996, 1.00929)
156bones/70/rotation = Quaternion(-2.86251e-08, 0.0234514, 8.86064e-09, 0.999725)
157bones/71/rotation = Quaternion(0.530914, 0.0231835, -0.0149243, 0.846977)
158bones/71/scale = Vector3(1.00085, 0.975863, 1.02406)
159bones/72/rotation = Quaternion(2.12851e-08, 0.00707667, -2.82736e-08, 0.999975)
160bones/73/rotation = Quaternion(-0.217105, 0.00690931, 0.136129, 0.966585)
161bones/73/scale = Vector3(0.99221, 1.01379, 0.99384)
162162
163163[node name="SkeletonIK3D" parent="Model/Armature/Skeleton3D" index="2"]
164164target_node = NodePath("../../../../GrapplingHook/IKTarget")