Small change to GLB interface

extlibs/CMakeLists.txt

@@ -20,6 +20,12 @@ add_library(sp2freetype STATIC ${FREETYPE_SOURCES})
 target_include_directories(sp2freetype PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/freetype-2.9/include")
 target_compile_definitions(sp2freetype PRIVATE "-DFT2_BUILD_LIBRARY")
 
+target_compile_options(box2d PRIVATE -fPIC)
+target_compile_options(bullet PRIVATE -fPIC)
+target_compile_options(lua PRIVATE -fPIC)
+target_compile_options(miniz PRIVATE -fPIC)
+target_compile_options(sp2freetype PRIVATE -fPIC)
+
 if(SP2_OPTIMIZE_LIBS)
     target_compile_options(box2d PRIVATE ${OPTIMIZER_FLAGS})
     target_compile_options(bullet PRIVATE ${OPTIMIZER_FLAGS})

include/sp2/graphics/mesh/glb.h

@@ -31,6 +31,7 @@ class GLBLoader
     };
 
     static const GLBFile& get(string resource_name);
+    static std::shared_ptr<MeshData> getMesh(string resource_name);
 private:
     GLBLoader(string resource_name);
     void handleNode(int node_id, GLBFile::Node& node);
@@ -43,7 +44,8 @@ class GLBLoader
     nlohmann::json json;
     std::vector<uint8_t> bindata;
 
-    static inline std::unordered_map<string, GLBFile> files;
+    static std::unordered_map<string, GLBFile> fileCache;
+    static std::unordered_map<string, std::shared_ptr<MeshData>> meshCache;
 };
 
 }//namespace sp

src/graphics/mesh/glb.cpp

@@ -3,6 +3,9 @@
 
 namespace sp {
 
+std::unordered_map<string, GLBLoader::GLBFile> GLBLoader::fileCache;
+std::unordered_map<string, std::shared_ptr<MeshData>> GLBLoader::meshCache;
+
 std::shared_ptr<MeshData> GLBLoader::GLBFile::flatMesh() const {
     sp::MeshData::Vertices vertices;
     sp::MeshData::Indices indices;
@@ -32,14 +35,24 @@ void GLBLoader::GLBFile::addToFlat(sp::MeshData::Vertices& vertices, sp::MeshDat
         addToFlat(vertices, indices, child, transform);
 }
 
-const GLBLoader::GLBFile& GLBLoader::get(string resource_name) {
-    auto it = files.find(resource_name);
-    if (it != files.end())
+const GLBLoader::GLBFile& GLBLoader::get(string resource_name)
+{
+    auto it = fileCache.find(resource_name);
+    if (it != fileCache.end())
         return it->second;
-    files[resource_name] = GLBLoader(resource_name).result;
+    fileCache[resource_name] = GLBLoader(resource_name).result;
     return get(resource_name);
 }
 
+std::shared_ptr<MeshData> GLBLoader::getMesh(string resource_name)
+{
+    auto it = meshCache.find(resource_name);
+    if (it != meshCache.end())
+        return it->second;
+    meshCache[resource_name] = get(resource_name).flatMesh();
+    return getMesh(resource_name);
+}
+
 GLBLoader::GLBLoader(string resource_name)
 {
     auto resource = io::ResourceProvider::get(resource_name);