Use correct type for material (#179)

* Use correct type for material * Rebuilt libs Make sure to copy the correct libs only. For some reason osx also returns a libSpineExt_53.a when in fact we only want libspinec.a
defold · Jul 19, 2024 · de4c3bd · de4c3bd
1 parent f90150d
commit de4c3bd
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 6 deletions.
diff --git a/defold-spine/lib/arm64-android/libspinec.a b/defold-spine/lib/arm64-android/libspinec.a
diff --git a/defold-spine/lib/arm64-ios/libspinec.a b/defold-spine/lib/arm64-ios/libspinec.a
diff --git a/defold-spine/lib/arm64-osx/libSpineExt_53.a b/defold-spine/lib/arm64-osx/libSpineExt_53.a
diff --git a/defold-spine/lib/arm64-osx/libspinec.a b/defold-spine/lib/arm64-osx/libspinec.a
diff --git a/defold-spine/lib/armv7-android/libspinec.a b/defold-spine/lib/armv7-android/libspinec.a
diff --git a/defold-spine/lib/js-web/libspinec.a b/defold-spine/lib/js-web/libspinec.a
diff --git a/defold-spine/lib/wasm-web/libspinec.a b/defold-spine/lib/wasm-web/libspinec.a
diff --git a/defold-spine/lib/x86-win32/spinec.lib b/defold-spine/lib/x86-win32/spinec.lib
diff --git a/defold-spine/lib/x86_64-ios/libspinec.a b/defold-spine/lib/x86_64-ios/libspinec.a
diff --git a/defold-spine/lib/x86_64-linux/libspinec.a b/defold-spine/lib/x86_64-linux/libspinec.a
diff --git a/defold-spine/lib/x86_64-osx/libspinec.a b/defold-spine/lib/x86_64-osx/libspinec.a
diff --git a/defold-spine/lib/x86_64-win32/spinec.lib b/defold-spine/lib/x86_64-win32/spinec.lib
diff --git a/defold-spine/src/comp_spine_model.cpp b/defold-spine/src/comp_spine_model.cpp
@@ -144,8 +144,11 @@ namespace dmSpine
         return dmGameObject::CREATE_RESULT_OK;
     }
 
+    static inline dmGameSystem::MaterialResource* GetMaterialResource(const SpineModelComponent* component) {
+        return component->m_Material ? component->m_Material : component->m_Resource->m_Material;
+    }
     static inline dmRender::HMaterial GetMaterial(const SpineModelComponent* component) {
-        return component->m_Material ? component->m_Material : component->m_Resource->m_Material->m_Material;
+        return GetMaterialResource(component)->m_Material;
     }
 
     static void ReHash(SpineModelComponent* component)
@@ -1234,8 +1237,7 @@ namespace dmSpine
         }
         else if (params.m_PropertyId == PROP_MATERIAL)
         {
-            dmRender::HMaterial material = GetMaterial(component);
-            return dmGameSystem::GetResourceProperty(context->m_Factory, material, out_value);
+            return dmGameSystem::GetResourceProperty(context->m_Factory, GetMaterialResource(component), out_value);
         }
         return dmGameSystem::GetMaterialConstant(GetMaterial(component), params.m_PropertyId, params.m_Options.m_Index, out_value, false, CompSpineModelGetConstantCallback, component);
     }

diff --git a/defold-spine/src/comp_spine_model.h b/defold-spine/src/comp_spine_model.h
@@ -68,7 +68,7 @@ namespace dmSpine
         spAnimationState*                       m_AnimationStateInstance;
         dmArray<dmSpine::SpineAnimationTrack>   m_AnimationTracks;
         dmGameSystem::HComponentRenderConstants m_RenderConstants;
-        dmRender::HMaterial                     m_Material;
+        dmGameSystem::MaterialResource*         m_Material;
         /// Node instances corresponding to the bones
         dmArray<dmGameObject::HInstance>        m_BoneInstances;
         dmArray<spBone*>                        m_Bones;                        // We shouldn't really have to have a duplicate array of these

diff --git a/utils/build_libs.sh b/utils/build_libs.sh
@@ -58,10 +58,10 @@ function copy_results() {
     local platform_ne=$2
     local target_dir=$3
 
-    for path in ./build/$platform_ne/*.a; do
+    for path in ./build/$platform_ne/*${LIBRARY_NAME}.a; do
         copyfile $path $target_dir
     done
-    for path in ./build/$platform_ne/*.lib; do
+    for path in ./build/$platform_ne/*${LIBRARY_NAME}.lib; do
         copyfile $path $target_dir
     done
 }