Skip to content

Commit

Permalink
[EDITOR & SERVER] Change animation data for new structure (#528)
Browse files Browse the repository at this point in the history
* add dancer layer to LED map

* support new led map structure

* attach led effects to models and allow model used by multiple dancers

* EDITOR-#512 [BLENDER] animation data update (#513)

* enabled LED keyframe loading, bugs fixed

* update animation data when applying changes to position map and control map

* bug fixes

* clear viewport before importing models, fetch uncompressed glb files instead of draco.glb files

* fixed type init in load

* display fade in timeline as ld_control_frame keyframes

* added models to asset as collections to enable lazy import

* add rev keyframe

* separate init_control_map from load

* change alpha display, minor fixes

* enabled lazy loading, revision management (untested)

* fixed iteration bug

* add ld_model_name bpy prop

* EDITOR-#512 [BLENDER] animation data update (#513)

* enabled LED keyframe loading, bugs fixed

* update animation data when applying changes to position map and control map

* bug fixes

* clear viewport before importing models, fetch uncompressed glb files instead of draco.glb files

* fixed type init in load

* display fade in timeline as ld_control_frame keyframes

* added models to asset as collections to enable lazy import

* add rev keyframe

* separate init_control_map from load

* change alpha display, minor fixes

* enabled lazy loading, revision management (untested)

* fixed iteration bug

* add ld_model_name bpy prop

* improve code and adjust model structure

* improve load and anim data

---------

Co-authored-by: Joseph Tseng <[email protected]>
  • Loading branch information
tom1484 and Chalkman071 authored Feb 6, 2024
1 parent 99944b4 commit 8904902
Show file tree
Hide file tree
Showing 32 changed files with 1,460 additions and 6,004 deletions.
2 changes: 1 addition & 1 deletion editor-blender/api/control_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ async def save_frame(
EDIT_CONTROL_FRAME_TIME,
{
"input": MutEditControlFrameTimeInput(
frameID=id, start=start
frameId=id, start=start
)
},
)
Expand Down
2 changes: 1 addition & 1 deletion editor-blender/api/pos_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ async def save_frame(
EDIT_POS_FRAME_TIME,
{
"input": MutEditPositionFrameTimeInput(
frameID=id, start=start
frameId=id, start=start
)
},
)
Expand Down
12 changes: 12 additions & 0 deletions editor-blender/core/actions/property/animation_data/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from .control import (
add_single_ctrl_keyframe,
delete_single_ctrl_keyframe,
edit_single_ctrl_keyframe,
set_ctrl_keyframes_from_state,
)
from .position import (
add_single_pos_keyframe,
delete_single_pos_keyframe,
edit_single_pos_keyframe,
set_pos_keyframes_from_state,
)
Loading

0 comments on commit 8904902

Please sign in to comment.