Skip to content

Commit

Permalink
Merge branch 'fury-gl:master' into gsoc_docs
Browse files Browse the repository at this point in the history
  • Loading branch information
robinroy03 authored May 30, 2024
2 parents bdc96ef + da7d735 commit 620e53d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions fury/gltf.py
Original file line number Diff line number Diff line change
Expand Up @@ -813,8 +813,8 @@ def transverse_bones(self, bone_id, channel_name, parent_animation: Animation):
if bone_id in self.animation_channels[channel_name]:
transforms = self.animation_channels[channel_name][bone_id]
timestamps = transforms["timestamps"]
metrices = transforms["matrix"]
for time, matrix in zip(timestamps, metrices):
matrices = transforms["matrix"]
for time, matrix in zip(timestamps, matrices):
animation.set_keyframe("transform", time[0], matrix)
else:
animation.set_keyframe("transform", 0.0, orig_transform)
Expand Down Expand Up @@ -934,10 +934,10 @@ def morph_animation(self):
weights = self.morph_weights[i]
animation = Animation()
timestamps = transforms["timestamps"]
metrices = transforms["matrix"]
metrices = np.array(metrices).reshape(-1, len(weights))
matrices = transforms["matrix"]
matrices = np.array(matrices).reshape(-1, len(weights))

for time, weights in zip(timestamps, metrices):
for time, weights in zip(timestamps, matrices):
animation.set_keyframe("morph", time[0], weights)
root_animation.add(animation)

Expand Down
2 changes: 1 addition & 1 deletion fury/tests/test_stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ def test_comm(use_raw_array=True):

def test_queue_and_webserver():
"""Check if the correct
envent ids and the data are stored in the
event ids and the data are stored in the
correct positions
"""
max_size = 3
Expand Down

0 comments on commit 620e53d

Please sign in to comment.