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

merge

Browse Source
This commit is contained in:
Nick Fisher
2022-12-19 15:05:58 +08:00
parent 32226b2cef 5eea5d33a3
commit 9c1673026e
2 changed files with 71 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ios/include/PolyvoxFilamentApi.h
View File

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

3
ios/include/SceneAsset.hpp
View File

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