Merge branch 'develop' of github.com:nmfisher/polyvox_filament into develop

2023-12-17 13:11:40 +08:00
parent b899ce544e 8dcad76acf
commit 8c3d113ab4
2 changed files with 2 additions and 2 deletions
--- a/ios/include/SceneAsset.hpp
+++ b/ios/include/SceneAsset.hpp
@@ -67,7 +67,7 @@ namespace polyvox {
        size_t skinIndex = 0;
        int lengthInFrames;
        float frameLengthInMs = 0;
-        vector<const math::quatf> frameData;
+        vector<math::quatf> frameData;
    };

    struct SceneAsset {
--- a/ios/src/FilamentViewer.cpp
+++ b/ios/src/FilamentViewer.cpp
@@ -77,7 +77,7 @@
 #include <sstream>
 #include <istream>
 #include <fstream>
-
+#include <filesystem>
 #include <mutex>

 #include "Log.hpp"