merge

ios/include/PolyvoxFilamentApi.h

@@ -3,6 +3,8 @@
 
 #include "ResourceBuffer.hpp"
 
+#include <stddef.h>
+
 typedef struct ResourceBuffer ResourceBuffer;
 
 /// 
@@ -20,7 +22,6 @@ struct BoneAnimation {
 typedef struct BoneAnimation BoneAnimation;
 
 
-extern "C" {
 void* filament_viewer_new(void* context, ResourceBuffer (*loadResource)(const char*), void (*freeResource)(uint32_t));
 void filament_viewer_delete(void* viewer);
 void create_render_target(void* viewer, uint32_t textureId, uint32_t width, uint32_t height);
@@ -104,6 +105,5 @@ extern "C" {
 void set_camera_rotation(void* viewer, float rads, float x, float y, float z);
 void set_camera_focal_length(void* viewer, float focalLength);
 void set_camera_focus_distance(void* viewer, float focusDistance);
-}
       
 #endif

ios/include/SceneAsset.hpp

@@ -19,7 +19,10 @@
 
 #include "ResourceManagement.hpp"
 #include "SceneAssetAnimation.hpp"
+
+extern "C" {
     #include "PolyvoxFilamentApi.h"
+}
 
 namespace polyvox {
     using namespace filament;