maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Fisher
2023-12-17 13:11:40 +08:00
parent b899ce544e 8dcad76acf
commit 8c3d113ab4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ios/include/SceneAsset.hpp
View File

@@ -67,7 +67,7 @@ namespace polyvox {
size_t skinIndex = 0; size_t skinIndex = 0;
int lengthInFrames; int lengthInFrames;
float frameLengthInMs = 0; float frameLengthInMs = 0;
vector<const math::quatf> frameData; vector<math::quatf> frameData;
}; };
struct SceneAsset { struct SceneAsset {

2
ios/src/FilamentViewer.cpp
View File

@@ -77,7 +77,7 @@
#include <sstream> #include <sstream>
#include <istream> #include <istream>
#include <fstream> #include <fstream>
#include <filesystem>
#include <mutex> #include <mutex>
#include "Log.hpp" #include "Log.hpp"