Android, iOS, macOS supported

This commit is contained in:
Nick Fisher
2023-10-03 00:34:29 +08:00
parent 0b9091fca5
commit bde15ab233
123 changed files with 479 additions and 538 deletions

View File

@@ -1,4 +1,7 @@
#include "ResourceBuffer.hpp"
extern "C" {
#include "PolyvoxFilamentFFIApi.h"
}
#include "FilamentViewer.hpp"
#include "filament/LightManager.h"
@@ -10,8 +13,6 @@
using namespace polyvox;
#define FLUTTER_PLUGIN_EXPORT __attribute__((visibility("default")))
class RenderLoop
{
public:
@@ -27,15 +28,12 @@ public:
{
std::unique_lock<std::mutex> lock(_access);
if(_tasks.empty()) {
_cond.wait_for(lock, std::chrono::duration<int, std::milli>(_frameIntervalInMilliseconds));
_cond.wait_for(lock, std::chrono::duration<float, std::milli>(_frameIntervalInMilliseconds));
continue;
}
task = std::move(_tasks.front());
_tasks.pop_front();
// std::this_thread::sleep_for(
// std::chrono::milliseconds(_frameIntervalInMilliseconds));
_tasks.pop_front();
}
task();
} });
}
@@ -45,16 +43,22 @@ public:
_t->join();
}
void *const createViewer(void *const context, const ResourceLoaderWrapper *const loader, void (*renderCallback)(void *), void *const owner)
{
void* const createViewer(
void* const context,
void* const platform,
const ResourceLoaderWrapper* const loader,
void (*renderCallback)(void*), void* const owner
) {
_renderCallback = renderCallback;
_renderCallbackOwner = owner;
std::packaged_task<FilamentViewer *const()> lambda([&]() mutable
{ return new FilamentViewer(context, loader); });
std::packaged_task<FilamentViewer*()> lambda([&]() mutable
{
return new FilamentViewer(context, loader, platform);
});
auto fut = add_task(lambda);
fut.wait();
_viewer = fut.get();
return (void *const)_viewer;
return (void* const)_viewer;
}
void setRendering(bool rendering)
@@ -64,10 +68,14 @@ public:
void doRender()
{
render(_viewer, 0);
render(_viewer, 0, nullptr, nullptr, nullptr);
_renderCallback(_renderCallbackOwner);
}
void setFrameIntervalInMilliseconds(float frameIntervalInMilliseconds) {
_frameIntervalInMilliseconds = frameIntervalInMilliseconds;
}
template <class Rt>
auto add_task(std::packaged_task<Rt()> &pt) -> std::future<Rt>
{
@@ -82,10 +90,10 @@ public:
private:
bool _stop = false;
bool _rendering = false;
int _frameIntervalInMilliseconds = 1000 / 60;
float _frameIntervalInMilliseconds = 1000.0 / 60.0;
std::mutex _access;
FilamentViewer *_viewer = nullptr;
void (*_renderCallback)(void *const) = nullptr;
void (*_renderCallback)(void* const) = nullptr;
void *_renderCallbackOwner = nullptr;
std::thread *_t = nullptr;
std::condition_variable _cond;
@@ -94,28 +102,34 @@ private:
extern "C"
{
#include "PolyvoxFilamentApi.h"
static RenderLoop *_rl;
FLUTTER_PLUGIN_EXPORT void *const create_filament_viewer_ffi(void *const context, const ResourceLoaderWrapper *const loader, void (*renderCallback)(void *const renderCallbackOwner), void *const renderCallbackOwner)
{
FLUTTER_PLUGIN_EXPORT void* const create_filament_viewer_ffi(
void* const context,
void* const platform,
const ResourceLoaderWrapper* const loader,
void (*renderCallback)(void* const renderCallbackOwner),
void* const renderCallbackOwner) {
if (!_rl)
{
_rl = new RenderLoop();
}
return _rl->createViewer(context, loader, renderCallback, renderCallbackOwner);
return _rl->createViewer(context, platform, loader, renderCallback, renderCallbackOwner);
}
FLUTTER_PLUGIN_EXPORT void create_swap_chain_ffi(void *const viewer, void *const surface, uint32_t width, uint32_t height)
FLUTTER_PLUGIN_EXPORT void create_swap_chain_ffi(void* const viewer, void* const surface, uint32_t width, uint32_t height)
{
Log("Creating swapchain %dx%d", width, height);
std::packaged_task<void()> lambda([&]() mutable
{ create_swap_chain(viewer, surface, width, height); });
{
create_swap_chain(viewer, surface, width, height);
});
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void create_render_target_ffi(void *const viewer, uint32_t nativeTextureId, uint32_t width, uint32_t height)
FLUTTER_PLUGIN_EXPORT void create_render_target_ffi(void* const viewer, uint32_t nativeTextureId, uint32_t width, uint32_t height)
{
std::packaged_task<void()> lambda([&]() mutable
{ create_render_target(viewer, nativeTextureId, width, height); });
@@ -123,15 +137,18 @@ extern "C"
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void update_viewport_and_camera_projection_ffi(void *const viewer, const uint32_t width, const uint32_t height, const float scaleFactor)
FLUTTER_PLUGIN_EXPORT void update_viewport_and_camera_projection_ffi(void* const viewer, const uint32_t width, const uint32_t height, const float scaleFactor)
{
Log("Update viewport %dx%d", width, height);
std::packaged_task<void()> lambda([&]() mutable
{ update_viewport_and_camera_projection(viewer, width, height, scaleFactor); });
{
update_viewport_and_camera_projection(viewer, width, height, scaleFactor);
});
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_rendering_ffi(void *const viewer, bool rendering)
FLUTTER_PLUGIN_EXPORT void set_rendering_ffi(void* const viewer, bool rendering)
{
if (!_rl)
{
@@ -151,15 +168,21 @@ extern "C"
}
}
FLUTTER_PLUGIN_EXPORT void render_ffi(void *const viewer)
FLUTTER_PLUGIN_EXPORT void set_frame_interval_ffi(float frameIntervalInMilliseconds) {
_rl->setFrameIntervalInMilliseconds(frameIntervalInMilliseconds);
}
FLUTTER_PLUGIN_EXPORT void render_ffi(void* const viewer)
{
std::packaged_task<void()> lambda([&]() mutable
{ _rl->doRender(); });
{
_rl->doRender();
});
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_background_color_ffi(void *const viewer, const float r, const float g, const float b, const float a)
FLUTTER_PLUGIN_EXPORT void set_background_color_ffi(void* const viewer, const float r, const float g, const float b, const float a)
{
std::packaged_task<void()> lambda([&]() mutable
{ set_background_color(viewer, r, g, b, a); });
@@ -167,80 +190,84 @@ extern "C"
fut.wait();
}
FLUTTER_PLUGIN_EXPORT EntityId load_glb_ffi(void *const assetManager, const char *path)
FLUTTER_PLUGIN_EXPORT EntityId load_glb_ffi(void* const assetManager, const char *path, bool unlit)
{
std::packaged_task<EntityId()> lambda([&]() mutable
{ return load_glb(assetManager, path, false); });
{ return load_glb(assetManager, path, unlit); });
auto fut = _rl->add_task(lambda);
fut.wait();
return fut.get();
}
FLUTTER_PLUGIN_EXPORT void clear_background_image_ffi(void *const viewer)
FLUTTER_PLUGIN_EXPORT void clear_background_image_ffi(void* const viewer)
{
std::packaged_task<void()> lambda([&]
{ clear_background_image(viewer); });
{
clear_background_image(viewer);
});
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_background_image_ffi(void *const viewer, const char *path, bool fillHeight)
FLUTTER_PLUGIN_EXPORT void set_background_image_ffi(void* const viewer, const char *path, bool fillHeight)
{
std::packaged_task<void()> lambda([&]
{ set_background_image(viewer, path, fillHeight); });
{
set_background_image(viewer, path, fillHeight);
});
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_background_image_position_ffi(void *const viewer, float x, float y, bool clamp)
FLUTTER_PLUGIN_EXPORT void set_background_image_position_ffi(void* const viewer, float x, float y, bool clamp)
{
std::packaged_task<void()> lambda([&]
{ set_background_image_position(viewer, x, y, clamp); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_tone_mapping_ffi(void *const viewer, int toneMapping)
FLUTTER_PLUGIN_EXPORT void set_tone_mapping_ffi(void* const viewer, int toneMapping)
{
std::packaged_task<void()> lambda([&]
{ set_tone_mapping(viewer, toneMapping); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_bloom_ffi(void *const viewer, float strength)
FLUTTER_PLUGIN_EXPORT void set_bloom_ffi(void* const viewer, float strength)
{
std::packaged_task<void()> lambda([&]
{ set_bloom(viewer, strength); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void load_skybox_ffi(void *const viewer, const char *skyboxPath)
FLUTTER_PLUGIN_EXPORT void load_skybox_ffi(void* const viewer, const char *skyboxPath)
{
std::packaged_task<void()> lambda([&]
{ load_skybox(viewer, skyboxPath); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void load_ibl_ffi(void *const viewer, const char *iblPath, float intensity)
FLUTTER_PLUGIN_EXPORT void load_ibl_ffi(void* const viewer, const char *iblPath, float intensity)
{
std::packaged_task<void()> lambda([&]
{ load_ibl(viewer, iblPath, intensity); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void remove_skybox_ffi(void *const viewer)
FLUTTER_PLUGIN_EXPORT void remove_skybox_ffi(void* const viewer)
{
std::packaged_task<void()> lambda([&]
{ remove_skybox(viewer); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void remove_ibl_ffi(void *const viewer)
FLUTTER_PLUGIN_EXPORT void remove_ibl_ffi(void* const viewer)
{
std::packaged_task<void()> lambda([&]
{ remove_ibl(viewer); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
EntityId add_light_ffi(void *const viewer, uint8_t type, float colour, float intensity, float posX, float posY, float posZ, float dirX, float dirY, float dirZ, bool shadows)
EntityId add_light_ffi(void* const viewer, uint8_t type, float colour, float intensity, float posX, float posY, float posZ, float dirX, float dirY, float dirZ, bool shadows)
{
std::packaged_task<EntityId()> lambda([&]
{ return add_light(viewer, type, colour, intensity, posX, posY, posZ, dirX, dirY, dirZ, shadows); });
@@ -248,14 +275,16 @@ extern "C"
fut.wait();
return fut.get();
}
FLUTTER_PLUGIN_EXPORT void remove_light_ffi(void *const viewer, EntityId entityId)
FLUTTER_PLUGIN_EXPORT void remove_light_ffi(void* const viewer, EntityId entityId)
{
std::packaged_task<void()> lambda([&]
{ remove_light(viewer, entityId); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void clear_lights_ffi(void *const viewer)
FLUTTER_PLUGIN_EXPORT void clear_lights_ffi(void* const viewer)
{
std::packaged_task<void()> lambda([&]
{ clear_lights(viewer); });
@@ -263,14 +292,14 @@ extern "C"
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void remove_asset_ffi(void *const viewer, EntityId asset)
FLUTTER_PLUGIN_EXPORT void remove_asset_ffi(void* const viewer, EntityId asset)
{
std::packaged_task<void()> lambda([&]
{ remove_asset(viewer, asset); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void clear_assets_ffi(void *const viewer)
FLUTTER_PLUGIN_EXPORT void clear_assets_ffi(void* const viewer)
{
std::packaged_task<void()> lambda([&]
{ clear_assets(viewer); });
@@ -278,7 +307,7 @@ extern "C"
fut.wait();
}
FLUTTER_PLUGIN_EXPORT bool set_camera_ffi(void *const viewer, EntityId asset, const char *nodeName)
FLUTTER_PLUGIN_EXPORT bool set_camera_ffi(void* const viewer, EntityId asset, const char *nodeName)
{
std::packaged_task<bool()> lambda([&]
{ return set_camera(viewer, asset, nodeName); });
@@ -324,7 +353,7 @@ extern "C"
}
void set_morph_target_weights_ffi(
void *const assetManager,
void* const assetManager,
EntityId asset,
const char *const entityName,
const float *const morphData,
@@ -333,28 +362,28 @@ extern "C"
// TODO
}
void play_animation_ffi(void *const assetManager, EntityId asset, int index, bool loop, bool reverse, bool replaceActive, float crossfade)
void play_animation_ffi(void* const assetManager, EntityId asset, int index, bool loop, bool reverse, bool replaceActive, float crossfade)
{
std::packaged_task<void()> lambda([&]
{ play_animation(assetManager, asset, index, loop, reverse, replaceActive, crossfade); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
void set_animation_frame_ffi(void *const assetManager, EntityId asset, int animationIndex, int animationFrame)
void set_animation_frame_ffi(void* const assetManager, EntityId asset, int animationIndex, int animationFrame)
{
std::packaged_task<void()> lambda([&]
{ set_animation_frame(assetManager, asset, animationIndex, animationFrame); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
void stop_animation_ffi(void *const assetManager, EntityId asset, int index)
void stop_animation_ffi(void* const assetManager, EntityId asset, int index)
{
std::packaged_task<void()> lambda([&]
{ stop_animation(assetManager, asset, index); });
auto fut = _rl->add_task(lambda);
fut.wait();
}
int get_animation_count_ffi(void *const assetManager, EntityId asset)
int get_animation_count_ffi(void* const assetManager, EntityId asset)
{
std::packaged_task<int()> lambda([&]
{ return get_animation_count(assetManager, asset); });
@@ -362,7 +391,7 @@ extern "C"
fut.wait();
return fut.get();
}
void get_animation_name_ffi(void *const assetManager, EntityId asset, char *const outPtr, int index)
void get_animation_name_ffi(void* const assetManager, EntityId asset, char *const outPtr, int index)
{
std::packaged_task<void()> lambda([&] {
get_animation_name(assetManager, asset, outPtr, index);
@@ -370,4 +399,8 @@ extern "C"
auto fut = _rl->add_task(lambda);
fut.wait();
}
FLUTTER_PLUGIN_EXPORT void ios_dummy_ffi() {
Log("Dummy called");
}
}