decouple assets from viewer to allow independent addition/removal/animation/etc

ios/src/FilamentViewer.hpp

@@ -30,6 +30,10 @@
 #include <string>
 #include <chrono>
 
+#include "SceneAssetLoader.hpp"
+#include "SceneAsset.hpp"
+#include "SceneResources.hpp"
+
 using namespace std;
 using namespace filament;
 using namespace filament::math;
@@ -39,55 +43,6 @@ using namespace camutils;
 
 
 namespace polyvox {
-
-    typedef std::chrono::time_point<std::chrono::high_resolution_clock> time_point_t;
-
-    struct EmbeddedAnimationBuffer  {        
-      EmbeddedAnimationBuffer(int animationIndex, float duration, bool loop) : animationIndex(animationIndex), duration(duration), loop(loop) {}
-      bool hasStarted = false;
-      int animationIndex;
-      float duration = 0;
-      time_point_t lastTime;
-      bool loop;
-    };
-
-    
-
-    struct ResourceBuffer {
-        ResourceBuffer(const void* data, const uint32_t size, const uint32_t id) : data(data), size(size), id(id) {};
-
-        ResourceBuffer& operator=(ResourceBuffer other)
-        {
-          data = other.data;
-          size = other.size;
-          id = other.id;
-          return *this;
-        }
-        const void* data;
-        uint32_t size;
-        uint32_t id;
-    };
-
-    using LoadResource = std::function<ResourceBuffer(const char* uri)>;
-    using FreeResource = std::function<void (ResourceBuffer)>;
-
-    struct MorphAnimationBuffer {
-      
-      MorphAnimationBuffer(float* frameData,
-                           int numWeights,
-                           int numFrames,
-                           float frameLength) : frameData(frameData), numWeights(numWeights), numFrames(numFrames), frameLengthInMs(frameLength) {
-      }
-      
-      int frameIndex = -1;
-      int numFrames;
-      float frameLengthInMs;
-      time_point_t startTime;
-      
-      float* frameData;
-      int numWeights;
-    };
-
     class FilamentViewer {
         public:
             FilamentViewer(void* layer, LoadResource loadResource, FreeResource freeResource);
@@ -99,42 +54,16 @@ namespace polyvox {
             void loadIbl(const char* const iblUri);
             void removeIbl();
             
-            void loadGlb(const char* const uri);
-            void loadGltf(const char* const uri, const char* relativeResourcePath);
-            void removeAsset();
+            SceneAsset* loadGlb(const char* const uri);
+            SceneAsset* loadGltf(const char* const uri, const char* relativeResourcePath);
+            void removeAsset(SceneAsset* asset);
 
             void updateViewportAndCameraProjection(int height, int width, float scaleFactor);
             void render();
-            unique_ptr<vector<string>> getTargetNames(const char* meshName);
-            unique_ptr<vector<string>> getAnimationNames();
+
             Manipulator<float>* manipulator;
             
-            
-            ///
-            /// Manually set the weights for all morph targets in the assets to the provided values.
-            /// See [animateWeights] if you want to automatically
-            ///
-            void applyWeights(float* weights, int count);
-
-            ///
-            /// Update the asset's morph target weights every "frame" (which is an arbitrary length of time, i.e. this is not the same as a frame at the framerate of the underlying rendering framework).
-            /// Accordingly:
-            ///       length(data) = numWeights * numFrames
-            ///       total_animation_duration_in_ms = number_of_frames * frameLengthInMs
-            ///
-            void animateWeights(float* data, int numWeights, int numFrames, float frameLengthInMs);
-
-            ///  
-            /// Play an embedded animation (i.e. an animation node embedded in the GLTF asset). If [loop] is true, the animation will repeat indefinitely.
-            ///
-            void playAnimation(int index, bool loop);
-
-            ///
-            /// Immediately stop the currently playing animation. NOOP if no animation is playing.
-            ///
-            void stopAnimation();
-
-            bool setCamera(const char* nodeName);
+            bool setCamera(SceneAsset* asset, const char* nodeName);
             void destroySwapChain();
             void createSwapChain(void* surface);
 
@@ -161,10 +90,10 @@ namespace polyvox {
     
             SwapChain* _swapChain = nullptr;
 
-            Animator* _animator;
+            vector<SceneAsset*> _assets;
 
             AssetLoader* _assetLoader;
-            FilamentAsset* _asset = nullptr;
+            SceneAssetLoader* _sceneAssetLoader;
             NameComponentManager* _ncm;
             std::mutex mtx; // mutex to ensure thread safety when removing assets
 
@@ -184,24 +113,15 @@ namespace polyvox {
             
             float _cameraFocalLength = 0.0f;
 
-            void updateMorphAnimation();
-            void updateEmbeddedAnimation();
-            
-            // animation flags;
-            bool isAnimating;
-            unique_ptr<MorphAnimationBuffer> _morphAnimationBuffer;
-            unique_ptr<EmbeddedAnimationBuffer> _embeddedAnimationBuffer;
-
+            // these flags relate to the textured quad we use for rendering unlit background images
             Texture* _imageTexture = nullptr;
             Entity* _imageEntity = nullptr;
             VertexBuffer* _imageVb = nullptr;
             IndexBuffer* _imageIb = nullptr;
             Material* _imageMaterial = nullptr;
             TextureSampler _imageSampler;
-
             ColorGrading *colorGrading = nullptr;
 
-
     };