Merge pull request #236 from SleepProgger/animation_model_register

Register and unregister models in AnimationSystem
kivy · Aug 8, 2017 · a15d96d · a15d96d
2 parents e63deb6 + 3a2328f
commit a15d96d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/modules/core/kivent_core/systems/animation.pyx b/modules/core/kivent_core/systems/animation.pyx
@@ -6,12 +6,12 @@ from kivent_core.systems.renderers cimport RenderStruct, Renderer
 from kivent_core.rendering.animation cimport FrameList, Frame, FrameStruct
 from kivent_core.rendering.model cimport VertexModel
 from kivent_core.managers.resource_managers import texture_manager
+from kivent_core.managers.resource_managers cimport ModelManager
 from kivent_core.managers.animation_manager cimport AnimationManager
 from kivy.properties import (StringProperty, ObjectProperty, NumericProperty,
         BooleanProperty, ListProperty)
 from kivy.factory import Factory
 
-
 cdef class AnimationComponent(MemComponent):
     '''The component associated with AnimationSystem. Stores the current
     state of the sprite's animation: current frame, duration passed while
@@ -168,6 +168,7 @@ cdef class AnimationSystem(StaticMemGameSystem):
         cdef unsigned int current_index
         cdef unsigned int groupkey
         cdef Renderer renderer
+        cdef ModelManager model_manager = self.gameworld.model_manager
 
 
         for i in range(count):
@@ -210,7 +211,13 @@ cdef class AnimationSystem(StaticMemGameSystem):
                 same_batch = texture_manager.get_texkey_in_group(
                                                 render_comp.texkey,
                                                 groupkey)
+                model_manager.unregister_entity_with_model(
+                    render_comp.entity_id,
+                    (<VertexModel>render_comp.model)._name)
                 render_comp.model = frame_data.model
+                model_manager.register_entity_with_model(
+                    render_comp.entity_id, self.system_id,
+                    (<VertexModel>render_comp.model)._name)
                 renderer = <Renderer>render_comp.renderer
                 if not same_batch:
                     renderer._unbatch_entity(render_comp.entity_id,