update macOS
This commit is contained in:
@@ -20,7 +20,7 @@ extern "C" {
|
|||||||
#if defined(__cplusplus) && !defined(__ANDROID__) && !defined(__APPLE__)
|
#if defined(__cplusplus) && !defined(__ANDROID__) && !defined(__APPLE__)
|
||||||
ResourceBuffer(const void* const data, const int32_t size, const int32_t id) : data(data), size(size), id(id) {};
|
ResourceBuffer(const void* const data, const int32_t size, const int32_t id) : data(data), size(size), id(id) {};
|
||||||
ResourceBuffer(const ResourceBuffer& rb) : data(rb.data), size(rb.size), id(rb.id) { };
|
ResourceBuffer(const ResourceBuffer& rb) : data(rb.data), size(rb.size), id(rb.id) { };
|
||||||
ResourceBuffer(const ResourceBuffer&& rb) : data(rb.data), size(rb.size), id(rb.id) { };
|
ResourceBuffer(const ResourceBuffer&& rb) noexcept : data(rb.data), size(rb.size), id(rb.id) { };
|
||||||
ResourceBuffer& operator=(const ResourceBuffer& other) = delete;
|
ResourceBuffer& operator=(const ResourceBuffer& other) = delete;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
#include <filament/Engine.h>
|
#include <filament/Engine.h>
|
||||||
#include <filament/TransformManager.h>
|
#include <filament/TransformManager.h>
|
||||||
@@ -262,7 +263,7 @@ void AssetManager::updateAnimations() {
|
|||||||
|
|
||||||
for (auto& asset : _assets) {
|
for (auto& asset : _assets) {
|
||||||
|
|
||||||
vector<int> completed;
|
std::vector<int> completed;
|
||||||
int index = 0;
|
int index = 0;
|
||||||
for(auto& anim : asset.mAnimations) {
|
for(auto& anim : asset.mAnimations) {
|
||||||
|
|
||||||
@@ -333,8 +334,9 @@ void AssetManager::updateAnimations() {
|
|||||||
asset.mAnimator->updateBoneMatrices();
|
asset.mAnimator->updateBoneMatrices();
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
for(auto& it : completed) {
|
|
||||||
asset.mAnimations.erase(asset.mAnimations.begin() + it);
|
for(int i = completed.size() - 1; i >= 0; i--) {
|
||||||
|
asset.mAnimations.erase(asset.mAnimations.begin() + i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,56 +2,54 @@
|
|||||||
#include "PolyvoxFilamentFFIApi.h"
|
#include "PolyvoxFilamentFFIApi.h"
|
||||||
|
|
||||||
#include "FilamentViewer.hpp"
|
#include "FilamentViewer.hpp"
|
||||||
#include "filament/LightManager.h"
|
|
||||||
#include "Log.hpp"
|
#include "Log.hpp"
|
||||||
#include "ThreadPool.hpp"
|
#include "ThreadPool.hpp"
|
||||||
|
#include "filament/LightManager.h"
|
||||||
|
|
||||||
#include <thread>
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
#include <mutex>
|
||||||
|
#include <thread>
|
||||||
|
|
||||||
using namespace polyvox;
|
using namespace polyvox;
|
||||||
|
|
||||||
class RenderLoop
|
class RenderLoop {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
explicit RenderLoop()
|
explicit RenderLoop() {
|
||||||
{
|
_t = new std::thread([this]() {
|
||||||
_t = new std::thread([this]()
|
|
||||||
{
|
|
||||||
while (!_stop) {
|
while (!_stop) {
|
||||||
|
{
|
||||||
if (_rendering) {
|
if (_rendering) {
|
||||||
doRender();
|
doRender();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
std::function<void()> task;
|
std::function<void()> task;
|
||||||
{
|
{
|
||||||
std::unique_lock<std::mutex> lock(_access);
|
std::unique_lock<std::mutex> lock(_access);
|
||||||
if (_tasks.empty()) {
|
if (_tasks.empty()) {
|
||||||
_cond.wait_for(lock, std::chrono::duration<float, std::milli>(_frameIntervalInMilliseconds));
|
_cond.wait_for(lock, std::chrono::duration<float, std::milli>(
|
||||||
|
_frameIntervalInMilliseconds));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
task = std::move(_tasks.front());
|
task = std::move(_tasks.front());
|
||||||
_tasks.pop_front();
|
_tasks.pop_front();
|
||||||
}
|
}
|
||||||
task();
|
task();
|
||||||
} });
|
|
||||||
}
|
}
|
||||||
~RenderLoop()
|
});
|
||||||
{
|
}
|
||||||
|
~RenderLoop() {
|
||||||
_stop = true;
|
_stop = true;
|
||||||
_t->join();
|
_t->join();
|
||||||
}
|
}
|
||||||
|
|
||||||
void* const createViewer(
|
void *const createViewer(void *const context, void *const platform,
|
||||||
void* const context,
|
|
||||||
void* const platform,
|
|
||||||
const char *uberArchivePath,
|
const char *uberArchivePath,
|
||||||
const ResourceLoaderWrapper *const loader,
|
const ResourceLoaderWrapper *const loader,
|
||||||
void (*renderCallback)(void*), void* const owner
|
void (*renderCallback)(void *), void *const owner) {
|
||||||
) {
|
|
||||||
_renderCallback = renderCallback;
|
_renderCallback = renderCallback;
|
||||||
_renderCallbackOwner = owner;
|
_renderCallbackOwner = owner;
|
||||||
std::packaged_task<FilamentViewer*()> lambda([&]() mutable
|
std::packaged_task<FilamentViewer *()> lambda([&]() mutable {
|
||||||
{
|
std::thread::id this_id = std::this_thread::get_id();
|
||||||
return new FilamentViewer(context, loader, platform, uberArchivePath);
|
return new FilamentViewer(context, loader, platform, uberArchivePath);
|
||||||
});
|
});
|
||||||
auto fut = add_task(lambda);
|
auto fut = add_task(lambda);
|
||||||
@@ -70,18 +68,14 @@ public:
|
|||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
void setRendering(bool rendering)
|
void setRendering(bool rendering) {
|
||||||
{
|
std::packaged_task<void()> lambda(
|
||||||
std::packaged_task<void()> lambda([&]() mutable
|
[&]() mutable { this->_rendering = rendering; });
|
||||||
{
|
|
||||||
this->_rendering = rendering;
|
|
||||||
});
|
|
||||||
auto fut = add_task(lambda);
|
auto fut = add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
void doRender()
|
void doRender() {
|
||||||
{
|
|
||||||
render(_viewer, 0, nullptr, nullptr, nullptr);
|
render(_viewer, 0, nullptr, nullptr, nullptr);
|
||||||
_renderCallback(_renderCallbackOwner);
|
_renderCallback(_renderCallbackOwner);
|
||||||
}
|
}
|
||||||
@@ -91,12 +85,11 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
template <class Rt>
|
template <class Rt>
|
||||||
auto add_task(std::packaged_task<Rt()> &pt) -> std::future<Rt>
|
auto add_task(std::packaged_task<Rt()> &pt) -> std::future<Rt> {
|
||||||
{
|
|
||||||
std::unique_lock<std::mutex> lock(_access);
|
std::unique_lock<std::mutex> lock(_access);
|
||||||
auto ret = pt.get_future();
|
auto ret = pt.get_future();
|
||||||
_tasks.push_back([pt = std::make_shared<std::packaged_task<Rt()>>(std::move(pt))]
|
_tasks.push_back([pt = std::make_shared<std::packaged_task<Rt()>>(
|
||||||
{ (*pt)(); });
|
std::move(pt))] { (*pt)(); });
|
||||||
_cond.notify_one();
|
_cond.notify_one();
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@@ -114,363 +107,341 @@ private:
|
|||||||
std::deque<std::function<void()>> _tasks;
|
std::deque<std::function<void()>> _tasks;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern "C"
|
extern "C" {
|
||||||
{
|
|
||||||
|
|
||||||
static RenderLoop *_rl;
|
static RenderLoop *_rl;
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void *const create_filament_viewer_ffi(
|
FLUTTER_PLUGIN_EXPORT void *const create_filament_viewer_ffi(
|
||||||
void* const context,
|
void *const context, void *const platform, const char *uberArchivePath,
|
||||||
void* const platform,
|
|
||||||
const char* uberArchivePath,
|
|
||||||
const ResourceLoaderWrapper *const loader,
|
const ResourceLoaderWrapper *const loader,
|
||||||
void (*renderCallback)(void *const renderCallbackOwner),
|
void (*renderCallback)(void *const renderCallbackOwner),
|
||||||
void *const renderCallbackOwner) {
|
void *const renderCallbackOwner) {
|
||||||
if (!_rl)
|
if (!_rl) {
|
||||||
{
|
|
||||||
_rl = new RenderLoop();
|
_rl = new RenderLoop();
|
||||||
}
|
}
|
||||||
return _rl->createViewer(context, platform,uberArchivePath, loader, renderCallback, renderCallbackOwner);
|
return _rl->createViewer(context, platform, uberArchivePath, loader,
|
||||||
|
renderCallback, renderCallbackOwner);
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void destroy_filament_viewer_ffi(void *const viewer) {
|
FLUTTER_PLUGIN_EXPORT void destroy_filament_viewer_ffi(void *const viewer) {
|
||||||
_rl->destroyViewer();
|
_rl->destroyViewer();
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
Log("Creating swapchain %dx%d", width, height);
|
||||||
std::packaged_task<void()> lambda([&]() mutable
|
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);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void destroy_swap_chain_ffi(void* const viewer)
|
FLUTTER_PLUGIN_EXPORT void destroy_swap_chain_ffi(void *const viewer) {
|
||||||
{
|
|
||||||
Log("Destroying swapchain");
|
Log("Destroying swapchain");
|
||||||
std::packaged_task<void()> lambda([&]() mutable
|
std::packaged_task<void()> lambda(
|
||||||
{
|
[&]() mutable {
|
||||||
destroy_swap_chain(viewer);
|
destroy_swap_chain(viewer);
|
||||||
});
|
});
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void create_render_target_ffi(void* const viewer, intptr_t nativeTextureId, uint32_t width, uint32_t height)
|
FLUTTER_PLUGIN_EXPORT void create_render_target_ffi(void *const viewer,
|
||||||
{
|
intptr_t nativeTextureId,
|
||||||
std::packaged_task<void()> lambda([&]() mutable
|
uint32_t width,
|
||||||
{ create_render_target(viewer, nativeTextureId, width, height); });
|
uint32_t height) {
|
||||||
|
std::packaged_task<void()> lambda([&]() mutable {
|
||||||
|
create_render_target(viewer, nativeTextureId, width, height);
|
||||||
|
});
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
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);
|
Log("Update viewport %dx%d", width, height);
|
||||||
std::packaged_task<void()> lambda([&]() mutable
|
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);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
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)
|
if (!_rl) {
|
||||||
{
|
|
||||||
Log("No render loop!"); // PANIC?
|
Log("No render loop!"); // PANIC?
|
||||||
}
|
} else {
|
||||||
else
|
if (rendering) {
|
||||||
{
|
|
||||||
if (rendering)
|
|
||||||
{
|
|
||||||
Log("Set rendering to true");
|
Log("Set rendering to true");
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
Log("Set rendering to false");
|
Log("Set rendering to false");
|
||||||
}
|
}
|
||||||
_rl->setRendering(rendering);
|
_rl->setRendering(rendering);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void set_frame_interval_ffi(float frameIntervalInMilliseconds) {
|
FLUTTER_PLUGIN_EXPORT void
|
||||||
|
set_frame_interval_ffi(float frameIntervalInMilliseconds) {
|
||||||
_rl->setFrameIntervalInMilliseconds(frameIntervalInMilliseconds);
|
_rl->setFrameIntervalInMilliseconds(frameIntervalInMilliseconds);
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void render_ffi(void* const viewer)
|
FLUTTER_PLUGIN_EXPORT void render_ffi(void *const viewer) {
|
||||||
{
|
std::packaged_task<void()> lambda([&]() mutable { _rl->doRender(); });
|
||||||
std::packaged_task<void()> lambda([&]() mutable
|
auto fut = _rl->add_task(lambda);
|
||||||
{
|
fut.wait();
|
||||||
_rl->doRender();
|
}
|
||||||
|
|
||||||
|
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); });
|
||||||
|
auto fut = _rl->add_task(lambda);
|
||||||
|
fut.wait();
|
||||||
|
}
|
||||||
|
|
||||||
|
FLUTTER_PLUGIN_EXPORT EntityId load_gltf_ffi(void *const assetManager,
|
||||||
|
const char *path,
|
||||||
|
const char *relativeResourcePath) {
|
||||||
|
std::packaged_task<EntityId()> lambda([&]() mutable {
|
||||||
|
return load_gltf(assetManager, path, relativeResourcePath);
|
||||||
});
|
});
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
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)
|
|
||||||
{
|
|
||||||
std::packaged_task<void()> lambda([&]() mutable
|
|
||||||
{ set_background_color(viewer, r, g, b, a); });
|
|
||||||
auto fut = _rl->add_task(lambda);
|
|
||||||
fut.wait();
|
|
||||||
}
|
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT EntityId load_gltf_ffi(void* const assetManager, const char *path, const char *relativeResourcePath)
|
|
||||||
{
|
|
||||||
std::packaged_task<EntityId()> lambda([&]() mutable
|
|
||||||
{ return load_gltf(assetManager, path, relativeResourcePath); });
|
|
||||||
auto fut = _rl->add_task(lambda);
|
|
||||||
fut.wait();
|
|
||||||
return fut.get();
|
return fut.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT EntityId load_glb_ffi(void* const assetManager, const char *path, bool unlit)
|
FLUTTER_PLUGIN_EXPORT EntityId load_glb_ffi(void *const assetManager,
|
||||||
{
|
const char *path, bool unlit) {
|
||||||
std::packaged_task<EntityId()> lambda([&]() mutable
|
std::packaged_task<EntityId()> lambda(
|
||||||
{ return load_glb(assetManager, path, unlit); });
|
[&]() mutable { return load_glb(assetManager, path, unlit); });
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
return fut.get();
|
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); });
|
||||||
std::packaged_task<void()> lambda([&]
|
auto fut = _rl->add_task(lambda);
|
||||||
{
|
fut.wait();
|
||||||
clear_background_image(viewer);
|
}
|
||||||
|
|
||||||
|
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); });
|
||||||
|
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) {
|
||||||
|
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) {
|
||||||
|
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) {
|
||||||
|
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) {
|
||||||
|
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) {
|
||||||
|
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) {
|
||||||
|
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) {
|
||||||
|
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) {
|
||||||
|
std::packaged_task<EntityId()> lambda([&] {
|
||||||
|
return add_light(viewer, type, colour, intensity, posX, posY, posZ, dirX,
|
||||||
|
dirY, dirZ, shadows);
|
||||||
});
|
});
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
|
||||||
});
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
std::packaged_task<EntityId()> lambda([&]
|
|
||||||
{ return add_light(viewer, type, colour, intensity, posX, posY, posZ, dirX, dirY, dirZ, shadows); });
|
|
||||||
auto fut = _rl->add_task(lambda);
|
|
||||||
fut.wait();
|
|
||||||
return fut.get();
|
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([&]
|
std::packaged_task<void()> lambda([&] { remove_light(viewer, entityId); });
|
||||||
{ remove_light(viewer, entityId); });
|
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
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); });
|
||||||
std::packaged_task<void()> lambda([&]
|
|
||||||
{ clear_lights(viewer); });
|
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
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([&]
|
std::packaged_task<void()> lambda([&] { remove_asset(viewer, asset); });
|
||||||
{ remove_asset(viewer, asset); });
|
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
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); });
|
||||||
std::packaged_task<void()> lambda([&]
|
|
||||||
{ clear_assets(viewer); });
|
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
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([&]
|
std::packaged_task<bool()> lambda(
|
||||||
{ return set_camera(viewer, asset, nodeName); });
|
[&] { return set_camera(viewer, asset, nodeName); });
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
return fut.get();
|
return fut.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void set_bone_animation_ffi(
|
FLUTTER_PLUGIN_EXPORT void set_bone_animation_ffi(
|
||||||
void *assetManager,
|
void *assetManager, EntityId asset, const float *const frameData,
|
||||||
EntityId asset,
|
int numFrames, int numBones, const char **const boneNames,
|
||||||
const float *const frameData,
|
const char **const meshName, int numMeshTargets, float frameLengthInMs) {
|
||||||
int numFrames,
|
std::packaged_task<void()> lambda([&] {
|
||||||
int numBones,
|
set_bone_animation(assetManager, asset, frameData, numFrames, numBones,
|
||||||
const char **const boneNames,
|
boneNames, meshName, numMeshTargets, frameLengthInMs);
|
||||||
const char **const meshName,
|
});
|
||||||
int numMeshTargets,
|
|
||||||
float frameLengthInMs)
|
|
||||||
{
|
|
||||||
std::packaged_task<void()> lambda([&]
|
|
||||||
{ set_bone_animation(
|
|
||||||
assetManager, asset, frameData, numFrames, numBones,
|
|
||||||
boneNames, meshName, numMeshTargets, frameLengthInMs); });
|
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void get_morph_target_name_ffi(void *assetManager, EntityId asset, const char *meshName, char *const outPtr, int index)
|
FLUTTER_PLUGIN_EXPORT void
|
||||||
{
|
get_morph_target_name_ffi(void *assetManager, EntityId asset,
|
||||||
std::packaged_task<void()> lambda([&]
|
const char *meshName, char *const outPtr, int index) {
|
||||||
{ get_morph_target_name(assetManager, asset, meshName, outPtr, index); });
|
std::packaged_task<void()> lambda([&] {
|
||||||
|
get_morph_target_name(assetManager, asset, meshName, outPtr, index);
|
||||||
|
});
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT int get_morph_target_name_count_ffi(void *assetManager, EntityId asset, const char *meshName)
|
FLUTTER_PLUGIN_EXPORT int
|
||||||
{
|
get_morph_target_name_count_ffi(void *assetManager, EntityId asset,
|
||||||
std::packaged_task<int()> lambda([&]
|
const char *meshName) {
|
||||||
{ return get_morph_target_name_count(assetManager, asset, meshName); });
|
std::packaged_task<int()> lambda([&] {
|
||||||
|
return get_morph_target_name_count(assetManager, asset, meshName);
|
||||||
|
});
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
return fut.get();
|
return fut.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_morph_target_weights_ffi(
|
void set_morph_target_weights_ffi(void *const assetManager, EntityId asset,
|
||||||
void* const assetManager,
|
|
||||||
EntityId asset,
|
|
||||||
const char *const entityName,
|
const char *const entityName,
|
||||||
const float *const morphData,
|
const float *const morphData,
|
||||||
int numWeights)
|
int numWeights) {
|
||||||
{
|
|
||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void play_animation_ffi(void* const assetManager, EntityId asset, int index, bool loop, bool reverse, bool replaceActive, float crossfade)
|
FLUTTER_PLUGIN_EXPORT void play_animation_ffi(void *const assetManager,
|
||||||
{
|
EntityId asset, int index,
|
||||||
std::packaged_task<void()> lambda([&]
|
bool loop, bool reverse,
|
||||||
{ play_animation(assetManager, asset, index, loop, reverse, replaceActive, crossfade); });
|
bool replaceActive,
|
||||||
|
float crossfade) {
|
||||||
|
std::packaged_task<void()> lambda([&] {
|
||||||
|
play_animation(assetManager, asset, index, loop, reverse, replaceActive,
|
||||||
|
crossfade);
|
||||||
|
});
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void set_animation_frame_ffi(void* const assetManager, EntityId asset, int animationIndex, int animationFrame)
|
FLUTTER_PLUGIN_EXPORT void set_animation_frame_ffi(void *const assetManager,
|
||||||
{
|
EntityId asset,
|
||||||
std::packaged_task<void()> lambda([&]
|
int animationIndex,
|
||||||
{ set_animation_frame(assetManager, asset, animationIndex, animationFrame); });
|
int animationFrame) {
|
||||||
|
std::packaged_task<void()> lambda([&] {
|
||||||
|
set_animation_frame(assetManager, asset, animationIndex, animationFrame);
|
||||||
|
});
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void stop_animation_ffi(void* const assetManager, EntityId asset, int index)
|
FLUTTER_PLUGIN_EXPORT void stop_animation_ffi(void *const assetManager,
|
||||||
{
|
EntityId asset, int index) {
|
||||||
std::packaged_task<void()> lambda([&]
|
std::packaged_task<void()> lambda(
|
||||||
{ stop_animation(assetManager, asset, index); });
|
[&] { stop_animation(assetManager, asset, index); });
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT int get_animation_count_ffi(void* const assetManager, EntityId asset)
|
FLUTTER_PLUGIN_EXPORT int get_animation_count_ffi(void *const assetManager,
|
||||||
{
|
EntityId asset) {
|
||||||
std::packaged_task<int()> lambda([&]
|
std::packaged_task<int()> lambda(
|
||||||
{ return get_animation_count(assetManager, asset); });
|
[&] { return get_animation_count(assetManager, asset); });
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
return fut.get();
|
return fut.get();
|
||||||
}
|
}
|
||||||
FLUTTER_PLUGIN_EXPORT void get_animation_name_ffi(void* const assetManager, EntityId asset, char *const outPtr, int index)
|
FLUTTER_PLUGIN_EXPORT void get_animation_name_ffi(void *const assetManager,
|
||||||
{
|
EntityId asset,
|
||||||
std::packaged_task<void()> lambda([&] {
|
char *const outPtr,
|
||||||
get_animation_name(assetManager, asset, outPtr, index);
|
int index) {
|
||||||
});
|
std::packaged_task<void()> lambda(
|
||||||
|
[&] { get_animation_name(assetManager, asset, outPtr, index); });
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void set_post_processing_ffi(void* const viewer, bool enabled) {
|
FLUTTER_PLUGIN_EXPORT void set_post_processing_ffi(void *const viewer,
|
||||||
std::packaged_task<void()> lambda([&] {
|
bool enabled) {
|
||||||
set_post_processing(viewer, enabled);
|
std::packaged_task<void()> lambda(
|
||||||
});
|
[&] { set_post_processing(viewer, enabled); });
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT void pick_ffi(void* const viewer, int x, int y, EntityId* entityId) {
|
FLUTTER_PLUGIN_EXPORT void pick_ffi(void *const viewer, int x, int y,
|
||||||
std::packaged_task<void()> lambda([&] {
|
EntityId *entityId) {
|
||||||
pick(viewer, x, y, entityId);
|
std::packaged_task<void()> lambda([&] { pick(viewer, x, y, entityId); });
|
||||||
});
|
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
FLUTTER_PLUGIN_EXPORT const char* get_name_for_entity_ffi(void* const assetManager, const EntityId entityId) {
|
FLUTTER_PLUGIN_EXPORT const char *
|
||||||
std::packaged_task<const char*()> lambda([&] {
|
get_name_for_entity_ffi(void *const assetManager, const EntityId entityId) {
|
||||||
return get_name_for_entity(assetManager, entityId);
|
std::packaged_task<const char *()> lambda(
|
||||||
});
|
[&] { return get_name_for_entity(assetManager, entityId); });
|
||||||
auto fut = _rl->add_task(lambda);
|
auto fut = _rl->add_task(lambda);
|
||||||
fut.wait();
|
fut.wait();
|
||||||
return fut.get();
|
return fut.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FLUTTER_PLUGIN_EXPORT void ios_dummy_ffi() { Log("Dummy called"); }
|
||||||
FLUTTER_PLUGIN_EXPORT void ios_dummy_ffi() {
|
|
||||||
Log("Dummy called");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user