Skip to content

Commit

Permalink
use shared data context between artboard and state machine
Browse files Browse the repository at this point in the history 
this PR changes multiple files addressing three things:
the first two are pretty basic changes: rename the method `dataContextFromInstance` to `setDataContextFromInstance` and remove the side effect of setting the parent of the data context in `internalDataContext`.
The other change is commented in the code: instead of creating a new data context for nested state machines, it is shared between the nested artboard and its state machines. This was already so in the cpp runtime, but the flutter bridge wasn't doing the same.

Diffs=
eed8230f8 use shared data context between artboard and state machine (#8299)
  • Loading branch information
bodymovin committed Oct 8, 2024
1 parent e7dc892 commit d6a7da3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .rive_head
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
56d95d2006868350ebb0c080447d07647d1a5855
eed8230f84e2894d0436dd1d94566c59f4dfcb6f
2 changes: 1 addition & 1 deletion wasm/submodules/rive-runtime
Submodule rive-runtime updated 13 files
+1 −1 .rive_head
+1 −1 include/rive/animation/nested_state_machine.hpp
+1 −1 include/rive/animation/state_machine_instance.hpp
+7 −7 include/rive/artboard.hpp
+2 −2 include/rive/nested_artboard.hpp
+1 −1 include/rive/scene.hpp
+2 −2 src/animation/nested_state_machine.cpp
+1 −1 src/animation/state_machine_instance.cpp
+14 −16 src/artboard.cpp
+1 −1 src/data_bind/context/context_value_list.cpp
+5 −5 src/nested_artboard.cpp
+1 −1 src/scene.cpp
+1 −1 viewer/src/viewer_content/scene_content.cpp

0 comments on commit d6a7da3

Please sign in to comment.