Skip to content

Commit

Permalink
export AnimationPlayer as child of animated object
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason0214 committed Aug 3, 2018
1 parent f91ef8e commit f3df39d
Show file tree
Hide file tree
Showing 15 changed files with 88 additions and 68 deletions.
6 changes: 3 additions & 3 deletions io_scene_godot/converters/animation.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class AnimationPlayer(NodeTemplate):
def __init__(self, name, parent):
super().__init__(name, "AnimationPlayer", parent)
# use parent node as the animation root node
self['root_node'] = NodePath(self.get_path(), self.parent.get_path())
self['root_node'] = NodePath(self.get_path(), parent.get_path())
# blender actions not in nla_tracks are treated as default
self.default_animation = None

Expand Down Expand Up @@ -243,8 +243,8 @@ def get_animation_player(escn_file, export_settings, godot_node):

if animation_player is None:
animation_player = AnimationPlayer(
godot_node.get_name() + 'Animation',
godot_node.parent,
name='AnimationPlayer',
parent=godot_node,
)

escn_file.add_node(animation_player)
Expand Down
6 changes: 3 additions & 3 deletions tests/reference_exports/animation_bone_transform.escn

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions tests/reference_exports/animation_camera.escn
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ surfaces/0 = {
step = 0.1
length = 2.91667
tracks/0/type = "value"
tracks/0/path = NodePath("Camera:far")
tracks/0/path = NodePath(".:far")
tracks/0/interp = 1
tracks/0/keys = {
"times":PoolRealArray(0.541667, 0.583333, 0.625, 0.666667, 0.708333, 0.75, 0.791667, 0.833333),
Expand All @@ -42,7 +42,7 @@ tracks/0/keys = {
"values":[100.0, 95.9174, 83.8392, 65.4366, 44.5634, 26.1609, 14.0826, 10.0]
}
tracks/1/type = "value"
tracks/1/path = NodePath("Camera:near")
tracks/1/path = NodePath(".:near")
tracks/1/interp = 1
tracks/1/keys = {
"times":PoolRealArray(0.0416667, 0.0833333, 0.125, 0.166667, 0.208333, 0.25, 0.291667, 0.333333, 0.375, 0.416667),
Expand All @@ -51,7 +51,7 @@ tracks/1/keys = {
"values":[0.1, 1.46695, 5.56822, 12.1535, 20.5309, 29.5691, 37.9465, 44.5318, 48.633, 50.0]
}
tracks/2/type = "value"
tracks/2/path = NodePath("Camera:size")
tracks/2/path = NodePath(".:size")
tracks/2/interp = 1
tracks/2/keys = {
"times":PoolRealArray(2.5, 2.54167, 2.58333, 2.625, 2.66667, 2.70833, 2.75, 2.79167, 2.83333, 2.875, 2.91667),
Expand All @@ -60,7 +60,7 @@ tracks/2/keys = {
"values":[7.31429, 7.1743, 6.75302, 6.06803, 5.17209, 4.15714, 3.14219, 2.24626, 1.56127, 1.13998, 1.0]
}
tracks/3/type = "value"
tracks/3/path = NodePath("Camera:projection")
tracks/3/path = NodePath(".:projection")
tracks/3/interp = 0
tracks/3/keys = {
"times":PoolRealArray(0.0416667, 2.5),
Expand All @@ -69,7 +69,7 @@ tracks/3/keys = {
"values":[0, 1]
}
tracks/4/type = "value"
tracks/4/path = NodePath("Camera:fov")
tracks/4/path = NodePath(".:fov")
tracks/4/interp = 1
tracks/4/keys = {
"times":PoolRealArray(0.0416667, 1.29167, 1.33333, 1.375, 1.41667, 1.45833, 1.5, 1.54167, 1.58333, 1.625, 1.66667, 1.70833, 1.75, 1.79167, 1.83333, 1.875, 1.91667, 1.95833, 2.0, 2.04167, 2.08333, 2.125, 2.16667, 2.20833, 2.25, 2.29167, 2.33333, 2.375, 2.41667, 2.45833, 2.5, 2.54167, 2.58333, 2.625, 2.66667, 2.70833, 2.75, 2.79167, 2.83333, 2.875, 2.91667),
Expand All @@ -95,7 +95,7 @@ projection = 0
fov = 49.1343
transform = Transform(0.685921, -0.324014, 0.651558, 0.0, 0.895396, 0.445271, -0.727676, -0.305421, 0.61417, 7.48113, 5.34367, 6.50764)

[node name="CameraAnimation" type="AnimationPlayer" parent="."]
[node name="AnimationPlayer" type="AnimationPlayer" parent="Camera"]

root_node = NodePath("..:")
anims/CameraAction = SubResource(3)
4 changes: 2 additions & 2 deletions tests/reference_exports/animation_light_type_change.escn
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ surfaces/0 = {
step = 0.1
length = 2.91667
tracks/0/type = "value"
tracks/0/path = NodePath("Lamp:light_color")
tracks/0/path = NodePath(".:light_color")
tracks/0/interp = 1
tracks/0/keys = {
"times":PoolRealArray(0.0833333, 0.458333, 0.5, 0.541667, 0.583333, 0.625, 0.666667, 0.708333, 0.75, 0.791667, 0.833333),
Expand All @@ -60,7 +60,7 @@ transform = Transform(-0.290865, -0.771101, 0.566393, -0.0551891, 0.604525, 0.79
shadow_enabled = true
light_negative = false

[node name="LampAnimation" type="AnimationPlayer" parent="."]
[node name="AnimationPlayer" type="AnimationPlayer" parent="Lamp"]

root_node = NodePath("..:")
anims/LampAction = SubResource(3)
4 changes: 2 additions & 2 deletions tests/reference_exports/animation_object_transform.escn

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions tests/reference_exports/animation_parented_objects.escn
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ surfaces/0 = {
step = 0.1
length = 3.33333
tracks/0/type = "transform"
tracks/0/path = NodePath("Cube:")
tracks/0/path = NodePath(".:")
tracks/0/interp = 1
tracks/0/keys = [0.0416667, 1.0, 0.0971814, 1.97777, 0.785397, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.0833333, 1.0, 0.0972337, 1.98111, 0.786094, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.125, 1.0, 0.0973914, 1.9912, 0.788191, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.166667, 1.0, 0.0976552, 2.00806, 0.791698, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.208333, 1.0, 0.0980257, 2.03174, 0.796624, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.25, 1.0, 0.0985032, 2.06226, 0.802973, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.291667, 1.0, 0.0990878, 2.09963, 0.810746, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.333333, 1.0, 0.0997793, 2.14383, 0.819942, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.375, 1.0, 0.100577, 2.19485, 0.830555, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.416667, 1.0, 0.101481, 2.25263, 0.842573, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.458333, 1.0, 0.10249, 2.3171, 0.855984, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.5, 1.0, 0.103602, 2.38816, 0.870765, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.541667, 1.0, 0.104814, 2.46569, 0.886893, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.583333, 1.0, 0.106126, 2.54954, 0.904336, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.625, 1.0, 0.107534, 2.63953, 0.923056, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.666667, 1.0, 0.109035, 2.73546, 0.943011, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.708333, 1.0, 0.110625, 2.83708, 0.96415, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.75, 1.0, 0.112299, 2.94413, 0.986416, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.791667, 1.0, 0.114054, 3.05628, 1.00975, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.833333, 1.0, 0.115883, 3.17322, 1.03407, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.875, 1.0, 0.117781, 3.29456, 1.05931, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.916667, 1.0, 0.119742, 3.41991, 1.08539, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.958333, 1.0, 0.121759, 3.54885, 1.11221, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.123825, 3.6809, 1.13968, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.04167, 1.0, 0.125932, 3.8156, 1.1677, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.08333, 1.0, 0.128073, 3.95244, 1.19616, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.125, 1.0, 0.130239, 4.0909, 1.22496, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.16667, 1.0, 0.132422, 4.23044, 1.25399, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.20833, 1.0, 0.134614, 4.37054, 1.28313, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.25, 1.0, 0.136806, 4.51064, 1.31228, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.29167, 1.0, 0.138989, 4.65018, 1.34131, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.33333, 1.0, 0.141155, 4.78864, 1.37011, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.375, 1.0, 0.143295, 4.92548, 1.39857, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.41667, 1.0, 0.145403, 5.06018, 1.42659, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.45833, 1.0, 0.147469, 5.19223, 1.45406, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.5, 1.0, 0.149486, 5.32117, 1.48088, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.54167, 1.0, 0.151447, 5.44652, 1.50696, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.58333, 1.0, 0.153345, 5.56786, 1.5322, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.625, 1.0, 0.155174, 5.6848, 1.55652, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.66667, 1.0, 0.156929, 5.79696, 1.57985, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.70833, 1.0, 0.158603, 5.904, 1.60212, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.75, 1.0, 0.160193, 6.00562, 1.62326, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.79167, 1.0, 0.161694, 6.10155, 1.64321, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.83333, 1.0, 0.163102, 6.19154, 1.66193, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.875, 1.0, 0.164413, 6.27539, 1.67938, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.91667, 1.0, 0.165626, 6.35293, 1.6955, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.95833, 1.0, 0.166738, 6.42398, 1.71029, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 0.167747, 6.48845, 1.7237, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 2.04167, 1.0, 0.16865, 6.54623, 1.73572, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 2.08333, 1.0, 0.169449, 6.59725, 1.74633, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 2.125, 1.0, 0.17014, 6.64145, 1.75552, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 2.16667, 1.0, 0.170725, 6.67882, 1.7633, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 2.20833, 1.0, 0.171202, 6.70934, 1.76965, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 2.25, 1.0, 0.171573, 6.73302, 1.77457, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 2.29167, 1.0, 0.171836, 6.74989, 1.77808, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 2.33333, 1.0, 0.171994, 6.75997, 1.78018, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 2.375, 1.0, 0.172047, 6.76331, 1.78087, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0]
tracks/1/type = "transform"
tracks/1/path = NodePath("Cube/CUB2:")
tracks/1/path = NodePath("CUB2:")
tracks/1/interp = 1
tracks/1/keys = [0.0416667, 1.0, 3.5422, -3.40839, -3.35921, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 0.0833333, 1.0, 3.53772, -3.40839, -3.35964, -4.6595e-05, -0.000267629, 0.00054497, 1.0, 1.0, 1.0, 1.0, 0.125, 1.0, 3.52422, -3.40841, -3.36094, -0.00018684, -0.00107316, 0.00218526, 0.999997, 1.0, 1.0, 1.0, 0.166667, 1.0, 3.50163, -3.40847, -3.36314, -0.000421074, -0.00241854, 0.00492483, 0.999985, 1.0, 1.0, 1.0, 0.208333, 1.0, 3.4699, -3.40858, -3.36623, -0.000749152, -0.00430293, 0.00876199, 0.999952, 0.999999, 0.999999, 1.0, 0.25, 1.0, 3.42901, -3.40877, -3.37023, -0.00117042, -0.0067226, 0.0136891, 0.999883, 0.999995, 0.999996, 0.999999, 0.291667, 1.0, 3.37896, -3.40906, -3.37516, -0.00168372, -0.00967087, 0.0196927, 0.999758, 0.999984, 0.999987, 0.999997, 0.333333, 1.0, 3.3198, -3.40947, -3.38101, -0.00228738, -0.0131381, 0.0267533, 0.999553, 0.99996, 0.999968, 0.999992, 0.375, 1.0, 3.25159, -3.41004, -3.38778, -0.00297923, -0.0171119, 0.0348457, 0.999242, 0.999912, 0.999929, 0.999982, 0.416667, 1.0, 3.17444, -3.41079, -3.39549, -0.00375663, -0.0215772, 0.0439396, 0.998794, 0.999825, 0.999858, 0.999965, 0.458333, 1.0, 3.08852, -3.41175, -3.40412, -0.00461654, -0.0265161, 0.0539998, 0.998178, 0.999677, 0.999738, 0.999935, 0.5, 1.0, 2.99402, -3.41296, -3.41368, -0.00555555, -0.031909, 0.0649871, 0.99736, 0.999442, 0.999547, 0.999888, 0.541667, 1.0, 2.8912, -3.41445, -3.42414, -0.00656995, -0.0377342, 0.0768594, 0.996306, 0.999088, 0.99926, 0.999817, 0.583333, 1.0, 2.78035, -3.41625, -3.4355, -0.0076559, -0.0439683, 0.089572, 0.99498, 0.998576, 0.998844, 0.999715, 0.625, 1.0, 2.66183, -3.4184, -3.44772, -0.00880945, -0.0505872, 0.103079, 0.993347, 0.997864, 0.998267, 0.999573, 0.666667, 1.0, 2.53607, -3.42095, -3.4608, -0.0100267, -0.0575656, 0.117334, 0.991372, 0.99691, 0.997493, 0.999382, 0.708333, 1.0, 2.40352, -3.42392, -3.4747, -0.011304, -0.0648782, 0.132292, 0.989021, 0.995671, 0.996488, 0.999135, 0.75, 1.0, 2.26472, -3.42736, -3.48938, -0.0126379, -0.0724994, 0.147907, 0.98626, 0.994108, 0.995221, 0.998823, 0.791667, 1.0, 2.12024, -3.4313, -3.5048, -0.0140255, -0.0804036, 0.164135, 0.983056, 0.99219, 0.993667, 0.998441, 0.833333, 1.0, 1.97073, -3.43579, -3.52091, -0.0154641, -0.0885658, 0.180933, 0.979378, 0.9899, 0.991811, 0.997986, 0.875, 1.0, 1.81685, -3.44086, -3.53768, -0.0169516, -0.096961, 0.198258, 0.975195, 0.987233, 0.989651, 0.997457, 0.916667, 1.0, 1.65935, -3.44656, -3.55503, -0.0184864, -0.105565, 0.216069, 0.970479, 0.984207, 0.987202, 0.996858, 0.958333, 1.0, 1.49899, -3.4529, -3.57291, -0.0200669, -0.114352, 0.234319, 0.965202, 0.980857, 0.984492, 0.996197, 1.0, 1.0, 1.33655, -3.45994, -3.59126, -0.0216914, -0.123297, 0.252961, 0.959343, 0.977245, 0.981573, 0.995486, 1.04167, 1.0, 1.17287, -3.46769, -3.61, -0.0233578, -0.132374, 0.271941, 0.952879, 0.973455, 0.978512, 0.994742, 1.08333, 1.0, 1.00876, -3.47619, -3.62908, -0.0250632, -0.141557, 0.2912, 0.945799, 0.969591, 0.975393, 0.993987, 1.125, 1.0, 0.845081, -3.48546, -3.64841, -0.0268032, -0.150815, 0.310668, 0.938095, 0.965777, 0.972317, 0.993243, 1.16667, 1.0, 0.682646, -3.49552, -3.66794, -0.0285714, -0.160119, 0.330265, 0.929769, 0.962147, 0.969392, 0.992538, 1.20833, 1.0, 0.522281, -3.50638, -3.68757, -0.0303595, -0.169433, 0.349903, 0.920836, 0.958845, 0.966733, 0.991898, 1.25, 1.0, 0.364779, -3.51807, -3.70725, -0.0321564, -0.17872, 0.369479, 0.911323, 0.95601, 0.964452, 0.99135, 1.29167, 1.0, 0.210907, -3.53059, -3.72691, -0.0339484, -0.187941, 0.388884, 0.901274, 0.953773, 0.962653, 0.990918, 1.33333, 1.0, 0.0613914, -3.54394, -3.74647, -0.0357196, -0.197054, 0.407997, 0.890748, 0.952246, 0.961425, 0.990624, 1.375, 1.0, -0.0830858, -3.55814, -3.76587, -0.0374522, -0.206011, 0.426696, 0.879822, 0.951512, 0.960836, 0.990483, 1.41667, 1.0, -0.221889, -3.57317, -3.78505, -0.0391273, -0.214766, 0.444855, 0.86859, 0.951627, 0.960928, 0.990505, 1.45833, 1.0, -0.354436, -3.58903, -3.80395, -0.0407261, -0.223271, 0.46235, 0.857161, 0.952605, 0.961714, 0.990693, 1.5, 1.0, -0.480202, -3.60571, -3.82252, -0.0422308, -0.231475, 0.479066, 0.845655, 0.954426, 0.963178, 0.991044, 1.54167, 1.0, -0.598715, -3.6232, -3.84071, -0.0436258, -0.23933, 0.494895, 0.834204, 0.957028, 0.965271, 0.991546, 1.58333, 1.0, -0.709563, -3.64149, -3.85847, -0.0448987, -0.246789, 0.509745, 0.822946, 0.960319, 0.96792, 0.992183, 1.625, 1.0, -0.812389, -3.66056, -3.87576, -0.046041, -0.253807, 0.523536, 0.812017, 0.964174, 0.971025, 0.992931, 1.66667, 1.0, -0.906887, -3.68039, -3.89255, -0.0470485, -0.260341, 0.536205, 0.801557, 0.968446, 0.974469, 0.993763, 1.70833, 1.0, -0.99281, -3.70097, -3.9088, -0.047921, -0.266354, 0.547705, 0.791694, 0.972973, 0.978123, 0.994648, 1.75, 1.0, -1.06995, -3.72227, -3.92449, -0.0486624, -0.271811, 0.558001, 0.782551, 0.977586, 0.981849, 0.995553, 1.79167, 1.0, -1.13816, -3.74427, -3.93959, -0.04928, -0.276682, 0.567075, 0.774238, 0.982116, 0.98551, 0.996445, 1.83333, 1.0, -1.19733, -3.76696, -3.95409, -0.0497832, -0.280942, 0.574915, 0.766854, 0.986399, 0.988976, 0.997292, 1.875, 1.0, -1.24738, -3.79029, -3.96797, -0.0501829, -0.284572, 0.581522, 0.760482, 0.990286, 0.992123, 0.998063, 1.91667, 1.0, -1.28827, -3.81426, -3.98121, -0.0504905, -0.287555, 0.5869, 0.75519, 0.993645, 0.994846, 0.998731, 1.95833, 1.0, -1.31999, -3.83884, -3.99381, -0.0507166, -0.28988, 0.59106, 0.75103, 0.996368, 0.997054, 0.999274, 2.0, 1.0, -1.34258, -3.86401, -4.00576, -0.0508707, -0.291541, 0.594014, 0.748039, 0.998369, 0.998677, 0.999674, 2.04167, 1.0, -1.35609, -3.88974, -4.01705, -0.0509599, -0.292537, 0.595777, 0.746241, 0.999591, 0.999668, 0.999918, 2.08333, 1.0, -1.36057, -3.91601, -4.02768, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.125, 1.0, -1.34736, -3.9447, -4.03804, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.16667, 1.0, -1.30748, -3.97768, -4.04848, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.20833, 1.0, -1.24071, -4.01495, -4.05898, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.25, 1.0, -1.14701, -4.05646, -4.06952, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.29167, 1.0, -1.0266, -4.10209, -4.08008, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.33333, 1.0, -0.879998, -4.15169, -4.09061, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.375, 1.0, -0.708052, -4.20503, -4.1011, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.41667, 1.0, -0.512001, -4.26182, -4.11148, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.45833, 1.0, -0.293499, -4.3217, -4.12173, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.5, 1.0, -0.0546358, -4.38422, -4.13179, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.54167, 1.0, 0.202055, -4.44886, -4.14162, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.58333, 1.0, 0.473615, -4.51504, -4.15116, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.625, 1.0, 0.756704, -4.58211, -4.16035, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.66667, 1.0, 1.04767, -4.64939, -4.16916, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.70833, 1.0, 1.34263, -4.71615, -4.17753, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.75, 1.0, 1.63759, -4.78167, -4.18542, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.79167, 1.0, 1.92856, -4.84525, -4.19279, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.83333, 1.0, 2.21164, -4.9062, -4.19961, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.875, 1.0, 2.4832, -4.96392, -4.20586, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.91667, 1.0, 2.73989, -5.01784, -4.21153, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 2.95833, 1.0, 2.97876, -5.06749, -4.21659, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 3.0, 1.0, 3.19726, -5.11249, -4.22106, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 3.04167, 1.0, 3.39331, -5.15252, -4.22494, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 3.08333, 1.0, 3.56526, -5.18736, -4.22823, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 3.125, 1.0, 3.71186, -5.21685, -4.23096, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 3.16667, 1.0, 3.83227, -5.24093, -4.23314, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 3.20833, 1.0, 3.92597, -5.25955, -4.2348, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 3.25, 1.0, 3.99274, -5.27275, -4.23595, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 3.29167, 1.0, 4.03262, -5.2806, -4.23662, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0, 3.33333, 1.0, 4.04583, -5.28319, -4.23684, -0.050989, -0.292867, 0.596361, 0.745642, 1.0, 1.0, 1.0]

Expand Down Expand Up @@ -67,7 +67,7 @@ mesh = SubResource(2)
visible = true
transform = Transform(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0971814, 1.97777, 0.785397)

[node name="CubeAnimation" type="AnimationPlayer" parent="."]
[node name="AnimationPlayer" type="AnimationPlayer" parent="Cube"]

root_node = NodePath("..:")
anims/CubeAction = SubResource(3)
Expand Down
4 changes: 2 additions & 2 deletions tests/reference_exports/animation_point_light_shadow.escn
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ surfaces/0 = {
step = 0.1
length = 1.25
tracks/0/type = "value"
tracks/0/path = NodePath("Lamp:shadow_color")
tracks/0/path = NodePath(".:shadow_color")
tracks/0/interp = 1
tracks/0/keys = {
"times":PoolRealArray(0.0416667, 0.0833333, 0.125, 0.166667, 0.208333, 0.25, 0.291667, 0.333333, 0.375, 0.416667),
Expand Down Expand Up @@ -85,7 +85,7 @@ transform = Transform(-0.290865, -0.771101, 0.566393, -0.0551891, 0.604525, 0.79
shadow_enabled = true
light_negative = false

[node name="LampAnimation" type="AnimationPlayer" parent="."]
[node name="AnimationPlayer" type="AnimationPlayer" parent="Lamp"]

root_node = NodePath("..:")
anims/LampAction = SubResource(4)
4 changes: 2 additions & 2 deletions tests/reference_exports/animation_rotation_euler.escn

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/reference_exports/animation_shapekey.escn
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ surfaces/0 = {
step = 0.1
length = 2.5
tracks/0/type = "value"
tracks/0/path = NodePath("Suzanne002:blend_shapes/Key 1")
tracks/0/path = NodePath(".:blend_shapes/Key 1")
tracks/0/interp = 1
tracks/0/keys = {
"times":PoolRealArray(0.0416667, 0.0833333, 0.125, 0.166667, 0.208333, 0.25, 0.291667, 0.333333, 0.375, 0.416667, 0.458333, 0.5, 0.541667, 0.583333, 0.625, 0.666667, 0.708333, 0.75, 0.791667, 0.833333, 0.875, 0.916667, 0.958333, 1.0, 1.04167, 1.08333, 1.125, 1.16667, 1.20833, 1.25, 1.29167, 1.33333, 1.375, 1.41667, 1.45833, 1.5, 1.54167, 1.58333, 1.625, 1.66667, 1.70833, 1.75, 1.79167, 1.83333, 1.875, 1.91667, 1.95833, 2.0, 2.04167, 2.08333, 2.125, 2.16667, 2.20833, 2.25, 2.29167, 2.33333, 2.375, 2.41667, 2.45833, 2.5),
Expand All @@ -52,7 +52,7 @@ mesh = SubResource(1)
visible = true
transform = Transform(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, -0.0656638, 0.257309, -0.440554)

[node name="Suzanne002Animation" type="AnimationPlayer" parent="."]
[node name="AnimationPlayer" type="AnimationPlayer" parent="Suzanne002"]

root_node = NodePath("..:")
anims/Key.002Action = SubResource(2)
Loading

0 comments on commit f3df39d

Please sign in to comment.