Add material cache reset for mesh

Author: psiberx

scripts/Base/Overrides/meshMeshAppearance.reds

@@ -3,6 +3,6 @@ public native class meshMeshAppearance extends ISerializable {
   public native let chunkMaterials: array<CName>;
   public native let tags: array<CName>;
 
-  public native func SetMesh(mesh: ref<CMesh>)
-  public native func ResetMaterialCache()
+  public static native func SetMesh(self: ref<meshMeshAppearance>, mesh: ref<CMesh>)
+  public static native func ResetMaterialCache(self: ref<meshMeshAppearance>)
 }

src/App/Depot/MeshEx.hpp

@@ -8,13 +8,31 @@ namespace App
 {
 struct MeshAppearanceEx : Red::meshMeshAppearance
 {
-    void SetMesh(const Red::Handle<Red::CMesh>& aMesh)
+    static void SetMesh(const Red::Handle<Red::meshMeshAppearance>& aSelf, const Red::Handle<Red::CMesh>& aMesh)
     {
-        Raw::MeshAppearance::Owner::Set(this, aMesh);
+        Raw::MeshAppearance::Owner::Set(aSelf, aMesh);
     }
 
-    void ResetMaterialCache()
+    static void ResetMaterialCache(const Red::Handle<Red::meshMeshAppearance>& aSelf)
     {
+        auto& materialJob = Raw::MeshAppearance::MaterialJob::Ref(aSelf);
+        auto& materialLock = Raw::MeshAppearance::MaterialLock::Ref(aSelf);
+        auto& materialPtr = Raw::MeshAppearance::MaterialData::Ref(aSelf);
+        auto& materialMap = Raw::MeshAppearance::MaterialMap::Ref(aSelf);
+        auto& materialCached = Raw::MeshAppearance::ForceCache::Ref(aSelf);
+
+        Red::WaitForJob(materialJob, std::chrono::milliseconds(5000));
+
+        std::scoped_lock _(materialLock);
+
+        if (materialPtr.data)
+        {
+            Raw::RenderData::Release(materialPtr.data);
+            materialPtr.data = nullptr;
+        }
+
+        materialMap.Clear();
+        materialCached = false;
     }
 };
 }

src/App/Entity/ComponentWrapper.cpp

@@ -1,4 +1,5 @@
 #include "ComponentWrapper.hpp"
+#include "App/Depot/MeshEx.hpp"
 #include "Red/Mesh.hpp"
 
 namespace
@@ -389,26 +390,7 @@ bool App::ComponentWrapper::ResetMaterialCache() const
     if (!meshApp)
         return false;
 
-    {
-        auto& materialJob = Raw::MeshAppearance::MaterialJob::Ref(meshApp);
-        auto& materialLock = Raw::MeshAppearance::MaterialLock::Ref(meshApp);
-        auto& materialPtr = Raw::MeshAppearance::MaterialData::Ref(meshApp);
-        auto& materialMap = Raw::MeshAppearance::MaterialMap::Ref(meshApp);
-        auto& materialCached = Raw::MeshAppearance::ForceCache::Ref(meshApp);
-
-        Red::WaitForJob(materialJob, std::chrono::milliseconds(5000));
-
-        std::scoped_lock _(materialLock);
-
-        if (materialPtr.data)
-        {
-            Raw::RenderData::Release(materialPtr.data);
-            materialPtr.data = nullptr;
-        }
-
-        materialMap.Clear();
-        materialCached = false;
-    }
+    MeshAppearanceEx::ResetMaterialCache(meshApp);
 
     return true;
 }

xmake.lua

@@ -1,7 +1,7 @@
 set_xmakever("2.5.9")
 
 set_project("Codeware")
-set_version("1.18.0", {build = "%y%m%d%H%M"})
+set_version("1.18.1", {build = "%y%m%d%H%M"})
 
 set_arch("x64")
 set_languages("cxx2a")