Re-instantiate artboard when playing state machine (#126)

defold-rive/include/common/atlas.h

@@ -21,7 +21,7 @@
 #include <rive/assets/file_asset.hpp>
 #include <rive/file_asset_loader.hpp>
 
-#include "renderer.h"
+#include "defold/renderer.h"
 
 namespace dmGameSystemDDF {
     struct TextureSet;

defold-rive/pluginsrc/rive_renderer_null.cpp

@@ -1,7 +1,7 @@
 
 #include <rive/refcnt.hpp>
 
-#include <renderer.h>
+#include <defold/renderer.h>
 
 namespace dmRive
 {

defold-rive/src/comp_rive.cpp

@@ -45,9 +45,8 @@
 #include <common/tess_renderer.h>
 
 // Defold Rive Renderer
-#include "renderer.h"
-
-#include <private/defold_graphics.h>
+#include <defold/renderer.h>
+#include <defold/defold_graphics.h>
 
 // DMSDK
 #include <dmsdk/script.h>
@@ -235,6 +234,26 @@ namespace dmRive
         return GetComponentFromIndex(world, index);
     }
 
+    static void InstantiateArtboard(RiveComponent* component)
+    {
+        dmRive::RiveSceneData* data = (dmRive::RiveSceneData*) component->m_Resource->m_Scene->m_Scene;
+
+        if (component->m_Resource->m_DDF->m_Artboard)
+        {
+            component->m_ArtboardInstance = data->m_File->artboardNamed(component->m_Resource->m_DDF->m_Artboard);
+
+            if (!component->m_ArtboardInstance)
+            {
+                dmLogWarning("Could not find artboard with name '%s'", component->m_Resource->m_DDF->m_Artboard);
+            }
+        }
+
+        if (!component->m_ArtboardInstance)
+        {
+            component->m_ArtboardInstance = data->m_File->artboardDefault();
+        }
+    }
+
     dmGameObject::CreateResult CompRiveCreate(const dmGameObject::ComponentCreateParams& params)
     {
         RiveWorld* world = (RiveWorld*)params.m_World;
@@ -263,22 +282,8 @@ namespace dmRive
         component->m_DoRender = 0;
         component->m_RenderConstants = 0;
 
-        dmRive::RiveSceneData* data = (dmRive::RiveSceneData*) component->m_Resource->m_Scene->m_Scene;
-
-        if (component->m_Resource->m_DDF->m_Artboard)
-        {
-            component->m_ArtboardInstance = data->m_File->artboardNamed(component->m_Resource->m_DDF->m_Artboard);
+        InstantiateArtboard(component);
 
-            if (!component->m_ArtboardInstance)
-            {
-                dmLogWarning("Could not find artboard with name '%s'", component->m_Resource->m_DDF->m_Artboard);
-            }
-        }
-
-        if (!component->m_ArtboardInstance)
-        {
-            component->m_ArtboardInstance = data->m_File->artboardDefault();
-        }
         component->m_ArtboardInstance->advance(0.0f);
 
         if (component->m_Resource->m_CreateGoBones)
@@ -578,7 +583,7 @@ namespace dmRive
         return dmGameObject::CREATE_RESULT_OK;
     }
 
-    static bool GetSender(RiveComponent* component, dmMessage::URL* out_sender)  
+    static bool GetSender(RiveComponent* component, dmMessage::URL* out_sender)
     {
         dmMessage::URL sender;
         sender.m_Socket = dmGameObject::GetMessageSocket(dmGameObject::GetCollection(component->m_Instance));
@@ -603,7 +608,6 @@ namespace dmRive
 
         component->m_AnimationInstance.reset();
         component->m_StateMachineInstance.reset();
-
         component->m_StateMachineInputs.SetSize(0);
     }
 
@@ -1030,11 +1034,14 @@ namespace dmRive
         CompRiveAnimationReset(component);
         CompRiveClearCallback(component);
 
+        // For now, we need to create a new state machine instance when playing a state machine, because of nested artboards+state machine events
+        InstantiateArtboard(component);
+
         component->m_Callback              = callback_info;
         component->m_CallbackId++;
         component->m_AnimationInstance     = nullptr;
-        component->m_StateMachineInstance  = component->m_ArtboardInstance->stateMachineAt(state_machine_index);
         component->m_AnimationPlaybackRate = playback_rate;
+        component->m_StateMachineInstance  = component->m_ArtboardInstance->stateMachineAt(state_machine_index);
 
         // update the list of current state machine inputs
         uint32_t count = component->m_StateMachineInstance->inputCount();

defold-rive/src/comp_rive.h

@@ -55,6 +55,8 @@ namespace dmRive
         std::unique_ptr<rive::LinearAnimationInstance>  m_AnimationInstance;
         std::unique_ptr<rive::StateMachineInstance>     m_StateMachineInstance;
 
+        dmArray<std::unique_ptr<rive::StateMachineInstance>> m_AllSMSInstances;
+
         dmGameObject::Playback                  m_AnimationPlayback;
         float                                   m_AnimationPlaybackRate;
 

defold-rive/src/private/renderer_context_metal.mm

@@ -7,7 +7,7 @@
 
 #include <dmsdk/graphics/graphics_vulkan.h>
 
-#include <private/defold_graphics.h>
+#include <defold/defold_graphics.h>
 
 #import <Metal/Metal.h>
 #import <QuartzCore/CAMetalLayer.h>

defold-rive/src/private/renderer_context_opengl.cpp

@@ -24,7 +24,7 @@
 #include <rive/renderer/gl/render_context_gl_impl.hpp>
 #include <rive/renderer/gl/render_target_gl.hpp>
 
-#include <private/defold_graphics.h>
+#include <defold/defold_graphics.h>
 
 #ifdef RIVE_DESKTOP_GL
     #define GLFW_INCLUDE_NONE

defold-rive/src/private/renderer_private.cpp

@@ -10,13 +10,13 @@
 
 #include <rive/renderer/rive_render_image.hpp>
 
-#include <private/defold_graphics.h>
-#include <private/defold_render.h>
-#include <private/shaders/rivemodel_blit.vpc.gen.h>
-#include <private/shaders/rivemodel_blit.fpc.gen.h>
+#include <defold/defold_graphics.h>
+#include <defold/defold_render.h>
+#include <defold/shaders/rivemodel_blit.vpc.gen.h>
+#include <defold/shaders/rivemodel_blit.fpc.gen.h>
 
 #include <common/vertices.h>
-#include <renderer.h>
+#include <defold/renderer.h>
 
 #include <assert.h>
 

defold-rive/src/private/renderer_wbgpu.cpp

@@ -9,7 +9,7 @@
 
 #include <dmsdk/graphics/graphics_vulkan.h>
 
-#include <private/defold_graphics.h>
+#include <defold/defold_graphics.h>
 
 namespace dmRive
 {

defold-rive/src/res_rive_data.h

@@ -16,7 +16,7 @@
 #include <stdint.h>
 #include <dmsdk/dlib/array.h>
 #include <dmsdk/dlib/hash.h>
-#include "renderer.h"
+#include "defold/renderer.h"
 
 namespace rive
 {

defold-rive/src/res_rive_scene.cpp

@@ -18,7 +18,7 @@
 #include <dmsdk/dlib/log.h>
 #include <dmsdk/resource/resource.h>
 
-#include "renderer.h"
+#include "defold/renderer.h"
 
 namespace dmRive
 {

defold-rive/src/res_rive_scene.h

@@ -15,7 +15,7 @@
 
 #include <dmsdk/gamesys/resources/res_textureset.h>
 
-#include "renderer.h"
+#include "defold/renderer.h"
 
 #include "rive_ddf.h" // generated from the rive_ddf.proto
 

defold-rive/src/script_rive.cpp

@@ -27,7 +27,7 @@
 #include "comp_rive.h"
 #include "rive_ddf.h"
 
-#include <private/defold_graphics.h>
+#include <defold/defold_graphics.h>
 
 namespace dmRive
 {