Updated to new internal material resource struct

defold · Jul 3, 2023 · 3585d4f · 3585d4f
1 parent ba439d5
commit 3585d4f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/defold-rive/src/comp_rive.cpp b/defold-rive/src/comp_rive.cpp
@@ -167,7 +167,7 @@ namespace dmRive
     }
 
     static inline dmRender::HMaterial GetMaterial(const RiveComponent* component, const RiveModelResource* resource) {
-        return component->m_Material ? component->m_Material : resource->m_Material;
+        return component->m_Material ? component->m_Material : resource->m_Material->m_Material;
     }
 
     static void ReHash(RiveComponent* component)

diff --git a/defold-rive/src/res_rive_model.h b/defold-rive/src/res_rive_model.h
@@ -14,18 +14,19 @@
 #define DM_RES_RIVE_MODEL_H
 
 #include <dmsdk/render/render.h>
+#include <dmsdk/gamesys/resources/res_material.h>
 
 #include "rive_ddf.h" // generated from the rive_ddf.proto
 
 namespace dmRive
 {
     struct RiveModelResource
     {
-        dmRiveDDF::RiveModelDesc*   m_DDF;
-        struct RiveSceneResource*   m_Scene;
-        dmRender::HMaterial         m_Material;
-        uint8_t                     m_CreateGoBones:1;
-        uint8_t                     :7;
+        dmRiveDDF::RiveModelDesc*       m_DDF;
+        struct RiveSceneResource*       m_Scene;
+        dmGameSystem::MaterialResource* m_Material;
+        uint8_t                         m_CreateGoBones:1;
+        uint8_t                         :7;
     };
 }