merge moveCameraToAsset changes

ios/include/FilamentViewer.hpp

@@ -86,6 +86,8 @@ namespace polyvox {
             void setBackgroundImage(const char* resourcePath, bool fillHeight);
             void clearBackgroundImage();
             void setBackgroundImagePosition(float x, float y, bool clamp);
+            void moveCameraToAsset(EntityId entityId);
+
             void setCameraExposure(float aperture, float shutterSpeed, float sensitivity);
             void setCameraPosition(float x, float y, float z);
             void setCameraRotation(float rads, float x, float y, float z);

ios/include/PolyvoxFilamentApi.h

@@ -108,6 +108,7 @@ void transform_to_unit_cube(void* assetManager, EntityId asset);
 void set_position(void* assetManager, EntityId asset, float x, float y, float z);
 void set_rotation(void* assetManager, EntityId asset, float rads, float x, float y, float z);
 void set_scale(void* assetManager, EntityId asset, float scale);
+void move_camera_to_asset(const void* const viewer, EntityId asset);
 void set_camera_exposure(const void* const viewer, float aperture, float shutterSpeed, float sensitivity);
 void set_camera_position(const void* const viewer, float x, float y, float z);
 void set_camera_rotation(const void* const viewer, float rads, float x, float y, float z);

ios/src/AssetManager.cpp

@@ -21,6 +21,7 @@
 #include "Log.hpp"
 #include "AssetManager.hpp"
 
+#include "material/UnlitMaterialProvider.hpp"
 #include "material/FileMaterialProvider.hpp"
 // #include "gltfio/materials/uberarchive.h"
 

ios/src/FilamentViewer.cpp

@@ -908,9 +908,23 @@ void FilamentViewer::setCameraPosition(float x, float y, float z) {
   cam.setModelMatrix(_cameraPosition * _cameraRotation);
 }
 
+void FilamentViewer::moveCameraToAsset(EntityId entityId) {
+
+  auto asset = _assetManager->getAssetByEntityId(entityId);
+  if(!asset) {
+      Log("Failed to find asset attached to specified entity id.");
+      return;
+  }
+
+  const filament::Aabb bb = asset->mAsset->getBoundingBox();
+  Camera& cam =_view->getCamera();
+  _cameraPosition = math::mat4f::translation(bb.getCorners());
+  _cameraRotation = math::mat4f();
+  cam.setModelMatrix(_cameraPosition * _cameraRotation);
+}
+
 void FilamentViewer::setCameraRotation(float rads, float x, float y, float z) {
   Camera& cam =_view->getCamera();
-
   _cameraRotation = math::mat4f::rotation(rads, math::float3(x,y,z));
   cam.setModelMatrix(_cameraPosition * _cameraRotation);
 }

ios/src/PolyvoxFilamentApi.cpp

@@ -96,6 +96,10 @@ extern "C" {
       return ((FilamentViewer*)viewer)->setCamera(asset, nodeName);
   }
 
+  void move_camera_to_asset(const void* const viewer, EntityId asset) {
+      ((FilamentViewer*)viewer)->moveCameraToAsset(asset, asset);
+  }
+
   void set_camera_focus_distance(const void* const viewer, float distance) {
       ((FilamentViewer*)viewer)->setCameraFocusDistance(distance);
   }