Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update the procedural animations module to get the custom method call track support.

Browse Source
This commit is contained in:
Relintai 2020-09-02 00:32:54 +02:00
parent 2d15234eb8
commit 93e370fb77
7 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "36b746d90393299b81ecb991f4aa94a8d742fd11", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "0ddd4908fd3af76a50b2ddd0b112236bebed57f7"}, "ui_extensions": {"master": "ca7df8435154d1146be36c4fc97e6cc7092d3eb9"}, "voxelman": {"master": "eea83093525be78a24ce8183cc6a931fed323f55"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "6c99ddcaa6203e77163b4770e7af95bc2a181e3d"}, "procedural_animations": {"master": "8426e2c976e9f9cb82bca636c0ec6e79ad7b3bcb"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}}
{"engine": {"3.2": "36b746d90393299b81ecb991f4aa94a8d742fd11", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "0ddd4908fd3af76a50b2ddd0b112236bebed57f7"}, "ui_extensions": {"master": "ca7df8435154d1146be36c4fc97e6cc7092d3eb9"}, "voxelman": {"master": "eea83093525be78a24ce8183cc6a931fed323f55"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "6c99ddcaa6203e77163b4770e7af95bc2a181e3d"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}}

4
game/modules/core/materials/1_standard_material.tres
View File

File diff suppressed because one or more lines are too long

16
game/modules/species/Human/models/armature.gd Normal file
View File

@ -0,0 +1,16 @@
extends Spatial
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass

20
game/modules/species/Human/models/armature_huf.tscn
View File

@ -1,9 +1,10 @@
[gd_scene load_steps=43 format=2]
[gd_scene load_steps=44 format=2]
[ext_resource path="res://modules/core/model_visuals/test_base_v3.tres" type="ModelVisual" id=1]
[ext_resource path="res://player/CharacterSkeletonAttachPoint.gd" type="Script" id=2]
[ext_resource path="res://modules/core/materials/3_standard_character_material.tres" type="Material" id=3]
[ext_resource path="res://modules/species/Human/models/dead.tres" type="ProceduralAnimation" id=4]
[ext_resource path="res://modules/species/Human/models/armature.gd" type="Script" id=5]
[ext_resource path="res://modules/species/Human/models/armature.gltf" type="PackedScene" id=6]
[ext_resource path="res://modules/core/materials/9_standard_character_material_notex.tres" type="Material" id=7]
[ext_resource path="res://player/CharacterSkeletonGD.gd" type="Script" id=8]
@ -146,6 +147,7 @@ materials = [ ExtResource( 3 ), ExtResource( 3 ), ExtResource( 7 ) ]
viss = [ ExtResource( 1 ) ]
[node name="armature" parent="." instance=ExtResource( 6 )]
script = ExtResource( 5 )
[node name="Skeleton" parent="armature/Armature" index="0"]
transform = Transform( 1, -6.84064e-18, 1.54087e-25, 6.84064e-18, 1, 1.05378e-42, -1.54087e-25, 0, 1, 0, 0, 0 )
@ -161,7 +163,7 @@ bones/27/bound_children = [ NodePath("NeckAttachment") ]
visible = false
[node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="1"]
transform = Transform( 0.181136, 0.139526, -0.97351, 0.0749719, -0.988963, -0.127792, -0.980595, -0.0498382, -0.189597, 0.24161, 0.77148, -0.0154696 )
transform = Transform( 0.190725, 0.147102, -0.970559, 0.0931773, -0.986957, -0.131278, -0.97721, -0.065396, -0.201944, 0.244939, 0.774361, -0.0217047 )
bone_name = "left_hand"
[node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"]
@ -170,14 +172,14 @@ script = ExtResource( 2 )
positions = [ ]
[node name="ShieldAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"]
transform = Transform( -0.033434, 0.117982, 0.992452, -0.0600025, -0.991454, 0.115842, 0.997637, -0.0556766, 0.0402275, 0.213215, 1.01009, -0.00206984 )
transform = Transform( -0.0433176, 0.125638, 0.99113, -0.0774754, -0.989496, 0.122045, 0.996052, -0.0715015, 0.0525965, 0.214702, 1.0125, -0.00449639 )
bone_name = "left_forearm"
[node name="LeftHandShield" type="Spatial" parent="armature/Armature/Skeleton/ShieldAttachment"]
transform = Transform( 0.122585, 0.992132, -0.0242311, 0.987746, -0.124342, -0.0941345, -0.0964273, -0.0123912, -0.995239, 0.0157415, 0.108918, 0.0213161 )
[node name="RightHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="3"]
transform = Transform( -0.0649316, -0.0823187, -0.994488, -0.0668053, -0.993997, 0.0866401, -0.995651, 0.0720629, 0.0590426, -0.247556, 0.770189, -0.00517137 )
transform = Transform( -0.0270232, -0.0924786, -0.995348, -0.0997119, -0.990496, 0.0947352, -0.99465, 0.101808, 0.0175453, -0.248237, 0.77238, -0.0111511 )
bone_name = "right_hand"
[node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"]
@ -195,7 +197,7 @@ script = ExtResource( 2 )
positions = [ ]
[node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"]
transform = Transform( 0.999993, -0.00198339, -0.00310197, 0.00218934, 0.997693, 0.0678594, 0.00296022, -0.0678657, 0.99769, 0.000901015, 1.31614, 0.000222996 )
transform = Transform( 0.999992, 0.00218317, -0.00333621, -0.0019591, 0.997835, 0.0657461, 0.00347252, -0.065739, 0.997831, 0.000876503, 1.31821, 0.00123351 )
bone_name = "neck"
[node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"]
@ -204,28 +206,28 @@ script = ExtResource( 2 )
positions = [ ]
[node name="RightHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="6"]
transform = Transform( 0.999677, 0.0254267, 1.20605e-08, -0.0254267, 0.999677, 4.71701e-07, -6.27463e-11, -4.71855e-07, 1, 0.00239963, 0.774668, 0 )
transform = Transform( 0.999504, 0.0314799, 1.49316e-08, -0.0314799, 0.999504, 4.7162e-07, -7.76685e-11, -4.71856e-07, 1, 0, 0.776724, 0 )
bone_name = "pelvis"
[node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/RightHipAttachment"]
transform = Transform( 0.993372, -0.0110498, 0.114411, 0.0109836, 0.999939, 0.00120905, -0.114417, 5.56017e-05, 0.993433, -0.141825, 0.176866, 0.16621 )
[node name="LeftHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="7"]
transform = Transform( 0.999677, 0.0254267, 1.20605e-08, -0.0254267, 0.999677, 4.71701e-07, -6.27463e-11, -4.71855e-07, 1, 0.00239963, 0.774668, 0 )
transform = Transform( 0.999504, 0.0314799, 1.49316e-08, -0.0314799, 0.999504, 4.7162e-07, -7.76685e-11, -4.71856e-07, 1, 0, 0.776724, 0 )
bone_name = "pelvis"
[node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/LeftHipAttachment"]
transform = Transform( 0.99343, -0.00240871, -0.114417, 0.00240855, 0.999997, -0.000139626, 0.114417, -0.00013687, 0.993433, 0.144429, 0.18077, 0.165634 )
[node name="RightBackAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="8"]
transform = Transform( 0.999993, -0.00247975, -0.00282842, 0.00246176, 0.999977, -0.00635236, 0.0028441, 0.00634534, 0.999976, 0.00136621, 1.12855, -0.000967377 )
transform = Transform( 0.999993, 0.00165794, -0.00337115, -0.00168643, 0.999963, -0.00847085, 0.00335698, 0.00847647, 0.999959, 0.000565477, 1.13062, -0.000356666 )
bone_name = "spine_2"
[node name="RightBackAP" type="Spatial" parent="armature/Armature/Skeleton/RightBackAttachment"]
transform = Transform( 0.999997, -0.00244424, -0.000479204, 0.00243884, 0.999966, -3.47705e-05, 0.000479292, 3.44458e-05, 1, 0.000560207, -0.00363708, -0.120332 )
[node name="LeftBackAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="9"]
transform = Transform( 0.999993, -0.00247975, -0.00282842, 0.00246176, 0.999977, -0.00635236, 0.0028441, 0.00634534, 0.999976, 0.00136621, 1.12855, -0.000967377 )
transform = Transform( 0.999993, 0.00165794, -0.00337115, -0.00168643, 0.999963, -0.00847085, 0.00335698, 0.00847647, 0.999959, 0.000565477, 1.13062, -0.000356666 )
bone_name = "spine_2"
[node name="LeftBackAP" type="Spatial" parent="armature/Armature/Skeleton/LeftBackAttachment"]

3
game/modules/species/Human/models/cast-end.tres
View File

@ -216,16 +216,19 @@ keyframe/0/animation_keyframe_index = 40
keyframe/0/next_keyframe = 1
keyframe/0/transition = 1.0
keyframe/0/time = 1.0
keyframe/0/method_name = ""
keyframe/0/position = Vector2( 360, -60 )
keyframe/1/name = ""
keyframe/1/animation_keyframe_index = 41
keyframe/1/next_keyframe = 2
keyframe/1/transition = 1.0
keyframe/1/time = 1.0
keyframe/1/method_name = ""
keyframe/1/position = Vector2( 600, -60 )
keyframe/2/name = ""
keyframe/2/animation_keyframe_index = 40
keyframe/2/next_keyframe = -1
keyframe/2/transition = 1.0
keyframe/2/time = 1.0
keyframe/2/method_name = ""
keyframe/2/position = Vector2( 840, -60 )

1
game/modules/species/Human/models/rest.tres
View File

@ -215,4 +215,5 @@ keyframe/0/animation_keyframe_index = 0
keyframe/0/next_keyframe = -1
keyframe/0/transition = 1.0
keyframe/0/time = 0.0
keyframe/0/method_name = ""
keyframe/0/position = Vector2( 360, -60 )

5
game/modules/species/Human/models/run-loop.tres
View File

@ -216,28 +216,33 @@ keyframe/0/animation_keyframe_index = 60
keyframe/0/next_keyframe = 1
keyframe/0/transition = 1.0
keyframe/0/time = 0.17
keyframe/0/method_name = ""
keyframe/0/position = Vector2( 180, -40 )
keyframe/1/name = ""
keyframe/1/animation_keyframe_index = 61
keyframe/1/next_keyframe = 2
keyframe/1/transition = 1.0
keyframe/1/time = 0.23
keyframe/1/method_name = ""
keyframe/1/position = Vector2( 380, -40 )
keyframe/2/name = ""
keyframe/2/animation_keyframe_index = 62
keyframe/2/next_keyframe = 3
keyframe/2/transition = 1.0
keyframe/2/time = 0.17
keyframe/2/method_name = ""
keyframe/2/position = Vector2( 580, -40 )
keyframe/3/name = ""
keyframe/3/animation_keyframe_index = 63
keyframe/3/next_keyframe = 4
keyframe/3/transition = 1.0
keyframe/3/time = 0.23
keyframe/3/method_name = ""
keyframe/3/position = Vector2( 780, -40 )
keyframe/4/name = ""
keyframe/4/animation_keyframe_index = 60
keyframe/4/next_keyframe = -1
keyframe/4/transition = 1.0
keyframe/4/time = 0.0
keyframe/4/method_name = ""
keyframe/4/position = Vector2( 980, -40 )