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

fix morph animations

Browse Source
This commit is contained in:
Nick Fisher
2023-04-20 15:45:59 +08:00
parent e0d3aba6d8
commit 7225cb53b1
12 changed files with 366 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
ios/src/AssetManager.cpp
View File

@@ -91,11 +91,6 @@ EntityId AssetManager::loadGltf(const char *uri,
string(relativeResourcePath) + string("/") + string(resourceUris[i]);
ResourceBuffer buf = _loadResource(uri.c_str());
// using FunctionCallback = std::function<void(void*, unsigned int, void
// *)>; auto cb = [&] (void * ptr, unsigned int len, void * misc) {
// };
// FunctionCallback fcb = cb;
ResourceLoader::BufferDescriptor b(buf.data, buf.size);
_gltfResourceLoader->addResourceData(resourceUris[i], std::move(b));
_freeResource(buf.id);
@@ -223,39 +218,44 @@ void AssetManager::updateAnimations() {
if(!asset.mAnimating) {
continue;
}
asset.mAnimating = false;
// // morph animation
// AnimationStatus morphAnimation = asset.mAnimations[0];
// auto elapsed = (now - morphAnimation.mStart).count();
// dynamically constructed morph animation
AnimationStatus& morphAnimation = asset.mAnimations[0];
// int lengthInFrames = static_cast<int>(morphAnimation.mDuration / asset.mMorphAnimationBuffer.mFrameLengthInMs);
if(morphAnimation.mAnimating) {
auto elapsed = float(
std::chrono::duration_cast<std::chrono::milliseconds>(
now - morphAnimation.mStart
).count()) / 1000.0f;
int lengthInFrames = static_cast<int>(
morphAnimation.mDuration * 1000.0f /
asset.mMorphAnimationBuffer.mFrameLengthInMs
);
// if(elapsed >= morphAnimation.mDuration) {
// if(morphAnimation.mLoop) {
// morphAnimation.mStart = now;
// if(morphAnimation.mReverse) {
// morphAnimation.mFrameNumber = lengthInFrames;
// }
// asset.mAnimating = true;
// } else {
// morphAnimation.mStart = time_point_t::max();
// }
// } else {
// asset.mAnimating = true;
// }
// int frameNumber = static_cast<int>(elapsed / asset.mMorphAnimationBuffer.mFrameLengthInMs);
// if(frameNumber < lengthInFrames) {
// if(morphAnimation.mReverse) {
// frameNumber = lengthInFrames - frameNumber;
// }
// rm.setMorphWeights(
// *(asset.mMorphAnimationBuffer.mInstance),
// asset.mMorphAnimationBuffer.mFrameData.data() + (morphAnimation.mFrameNumber * asset.mMorphAnimationBuffer.mNumMorphWeights),
// asset.mMorphAnimationBuffer.mNumMorphWeights);
// }
// if more time has elapsed than the animation duration && not looping
// mark the animation as complete
if(elapsed >= morphAnimation.mDuration && !morphAnimation.mLoop) {
morphAnimation.mStart = time_point_t::max();
morphAnimation.mAnimating = false;
} else {
asset.mAnimating = true;
int frameNumber = static_cast<int>(elapsed * 1000.0f / asset.mMorphAnimationBuffer.mFrameLengthInMs) % lengthInFrames;
// offset from the end if reverse
if(morphAnimation.mReverse) {
frameNumber = lengthInFrames - frameNumber;
}
Log("setting weights for framenumber %d, elapsed is %f, lengthInFrames is %d, mNumMorphWeights %d", frameNumber, elapsed, lengthInFrames,asset.mMorphAnimationBuffer.mNumMorphWeights );
// set the weights appropriately
rm.setMorphWeights(
rm.getInstance(asset.mMorphAnimationBuffer.mMeshTarget),
asset.mMorphAnimationBuffer.mFrameData.data() + (frameNumber * asset.mMorphAnimationBuffer.mNumMorphWeights),
asset.mMorphAnimationBuffer.mNumMorphWeights);
}
}
// // bone animation
// AnimationStatus boneAnimation = asset.mAnimations[1];
@@ -292,35 +292,35 @@ void AssetManager::updateAnimations() {
// GLTF animations
Animator* animator = asset.mAnimator;
for(int j = 2; j < asset.mAnimations.size(); j++) {
AnimationStatus& anim = asset.mAnimations[j];
int j = -1;
for(AnimationStatus& anim : asset.mAnimations) {
j++;
if(j < 2) {
continue;
}
if(!anim.mAnimating) {
continue;
}
auto elapsed = float(std::chrono::duration_cast<std::chrono::milliseconds>(now - anim.mStart).count()) / 1000.0f;
if(elapsed < anim.mDuration) {
if(anim.mLoop) {
animator->applyAnimation(j-2, anim.mDuration - elapsed);
} else {
animator->applyAnimation(j-2, elapsed);
}
asset.mAnimating = true;
} else if(anim.mLoop) {
animator->applyAnimation(j-2, float(elapsed) ); //% anim.mDuration
if(anim.mLoop || elapsed < anim.mDuration) {
asset.mAnimator->applyAnimation(j-2, elapsed);
asset.mAnimating = true;
} else if(elapsed - anim.mDuration < 0.3) {
// cross-fade
// animator->applyCrossFade(j-2, anim.mDuration - 0.05, elapsed / 0.3);
// asset.mAnimating = true;
anim.mStart = time_point_t::max();
// anim.mStart = time_point_t::max();
} else {
// stop
anim.mStart = time_point_t::max();
}
}
asset.mAnimator->updateBoneMatrices();
if(asset.mAnimating) {
asset.mAnimator->updateBoneMatrices();
}
}
}
@@ -379,27 +379,33 @@ bool AssetManager::setMorphAnimationBuffer(
Log("ERROR: asset not found for entity.");
return false;
}
auto asset = _assets[pos->second];
auto& asset = _assets[pos->second];
auto entity = findEntityByName(asset, entityName);
if(!entity) {
Log("Warning: failed to find entity %s", entityName);
return false;
}
RenderableManager &rm = _engine->getRenderableManager();
auto inst = rm.getInstance(entity);
asset.mMorphAnimationBuffer.mInstance = &inst;
asset.mMorphAnimationBuffer.mNumFrames = numFrames;
asset.mMorphAnimationBuffer.mFrameLengthInMs = frameLengthInMs;
asset.mMorphAnimationBuffer.mMeshTarget = entity;
asset.mMorphAnimationBuffer.mFrameData.clear();
asset.mMorphAnimationBuffer.mFrameData.insert(
asset.mMorphAnimationBuffer.mFrameData.begin(),
morphData,
morphData + (numFrames * numMorphWeights)
);
asset.mMorphAnimationBuffer.mFrameLengthInMs = frameLengthInMs;
asset.mMorphAnimationBuffer.mNumMorphWeights = numMorphWeights;
AnimationStatus& animation = asset.mAnimations[0];
animation.mDuration = (frameLengthInMs * numFrames) / 1000.0f;
animation.mStart = high_resolution_clock::now();
animation.mAnimating = true;
asset.mAnimating = true;
Log("set start to %d, dur is %f",
std::chrono::duration_cast<std::chrono::milliseconds>(animation.mStart.time_since_epoch()).count(),
animation.mDuration
);
return true;
}
@@ -524,13 +530,12 @@ void AssetManager::playAnimation(EntityId e, int index, bool loop, bool reverse)
return;
}
auto& asset = _assets[pos->second];
Log("prev start %d", std::chrono::duration_cast<std::chrono::milliseconds>(asset.mAnimations[index+2].mStart.time_since_epoch()).count());
asset.mAnimations[index+2].mAnimating = true;
asset.mAnimations[index+2].mStart = std::chrono::high_resolution_clock::now();
asset.mAnimations[index+2].mLoop = loop;
asset.mAnimations[index+2].mReverse = reverse;
Log("new start %d", std::chrono::duration_cast<std::chrono::milliseconds>(asset.mAnimations[index+2].mStart.time_since_epoch()).count());
// Log("new start %d, dur is %f", std::chrono::duration_cast<std::chrono::milliseconds>(asset.mAnimations[index+2].mStart.time_since_epoch()).count(), asset.mAnimations[index+2].mDuration);
asset.mAnimating = true;
}

2
ios/src/FilamentViewer.cpp
View File

@@ -790,7 +790,7 @@ void FilamentViewer::render(uint64_t frameTimeInNanos) {
}
if(_frameCount == 60) {
// Log("1 sec average for asset animation update %f", _elapsed);
Log("1 sec average for asset animation update %f", _elapsed);
_elapsed = 0;
_frameCount = 0;
}

436
ios/src/PolyvoxFilamentApi.cpp
View File

@@ -5,54 +5,35 @@
#include "Log.hpp"
#include "ThreadPool.hpp"
#include <thread>
#include "dart/dart_api_dl.h"
using namespace polyvox;
#define FLUTTER_PLUGIN_EXPORT __attribute__((visibility("default")))
static ThreadPool* _tp;
static Dart_Port _port;
// static ThreadPool* _tp;
extern "C" {
#include "PolyvoxFilamentApi.h"
FLUTTER_PLUGIN_EXPORT intptr_t init_dart_api_dl(void* data) {
return Dart_InitializeApiDL(data);
}
FLUTTER_PLUGIN_EXPORT void register_filament_port(Dart_Port port) {
_port = port;
}
FLUTTER_PLUGIN_EXPORT void* create_filament_viewer(void* context, ResourceBuffer (*loadResource)(char const*), void (*freeResource)(unsigned int)) {
if(!_tp) {
_tp = new ThreadPool();
}
std::packaged_task<void*()> lambda([=]() mutable {
// if(!_tp) {
// _tp = new ThreadPool();
// }
// //std::packaged_task<void*()> lambda([=]() mutable {
return (void*) new FilamentViewer(context, loadResource, freeResource);
});
auto fut = _tp->add_task(lambda);
fut.wait();
return fut.get();
// });
// auto fut = _tp->add_task(lambda);
// fut.wait();
// //return fut.get();
}
// Dart_CObject dart_object;
// dart_object.type = Dart_CObject_kInt64;
// dart_object.value.as_int64 = (size_t)viewer;
// const bool result = Dart_PostCObject_DL(_port, &dart_object);
// if (!result) {
// std::cout << "TTS: C : Posting message to port failed." << std::endl;
// }
FLUTTER_PLUGIN_EXPORT void create_render_target(void* viewer, uint32_t textureId, uint32_t width, uint32_t height) {
std::packaged_task<void()> lambda([=]() mutable {
// //std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->createRenderTarget(textureId, width, height);
});
auto fut = _tp->add_task(lambda);
fut.wait();
// });
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void delete_filament_viewer(void* viewer) {
@@ -60,270 +41,271 @@ extern "C" {
}
FLUTTER_PLUGIN_EXPORT void set_background_color(void* viewer, const float r, const float g, const float b, const float a) {
std::packaged_task<void()> lambda([=]() mutable {
// //std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->setBackgroundColor(r, g, b, a);
});
auto fut = _tp->add_task(lambda);
fut.wait();
// });
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void clear_background_image(void* viewer) {
std::packaged_task<void()> lambda([=]() mutable {
// //std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->clearBackgroundImage();
});
auto fut = _tp->add_task(lambda);
fut.wait();
// });
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_background_image(void* viewer, const char* path) {
std::packaged_task<void()> lambda([=]() mutable {
// //std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->setBackgroundImage(path);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_background_image_position(void* viewer, float x, float y, bool clamp) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->setBackgroundImagePosition(x, y, clamp);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void load_skybox(void* viewer, const char* skyboxPath) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->loadSkybox(skyboxPath);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void load_ibl(void* viewer, const char* iblPath, float intensity) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->loadIbl(iblPath, intensity);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void remove_skybox(void* viewer) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->removeSkybox();
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void remove_ibl(void* viewer) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->removeIbl();
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT EntityId add_light(void* 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([=]() mutable {
//std::packaged_task<EntityId()> lambda([=]() mutable {
return ((FilamentViewer*)viewer)->addLight((LightManager::Type)type, colour, intensity, posX, posY, posZ, dirX, dirY, dirZ, shadows);
});
auto fut = _tp->add_task(lambda);
fut.wait();
return fut.get();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
//return fut.get();
}
FLUTTER_PLUGIN_EXPORT void remove_light(void* viewer, int32_t entityId) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->removeLight(entityId);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void clear_lights(void* viewer) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->clearLights();
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT EntityId load_glb(void* assetManager, const char* assetPath, bool unlit) {
std::packaged_task<EntityId()> lambda([=]() mutable {
//std::packaged_task<EntityId()> lambda([=]() mutable {
return ((AssetManager*)assetManager)->loadGlb(assetPath, unlit);
});
auto fut = _tp->add_task(lambda);
fut.wait();
return fut.get();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
//return fut.get();
}
FLUTTER_PLUGIN_EXPORT EntityId load_gltf(void* assetManager, const char* assetPath, const char* relativePath) {
std::packaged_task<EntityId()> lambda([=]() mutable {
//std::packaged_task<EntityId()> lambda([=]() mutable {
return ((AssetManager*)assetManager)->loadGltf(assetPath, relativePath);
});
auto fut = _tp->add_task(lambda);
fut.wait();
return fut.get();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
//return fut.get();
}
FLUTTER_PLUGIN_EXPORT bool set_camera(void* viewer, EntityId asset, const char* nodeName) {
std::packaged_task<bool()> lambda([=]() mutable {
//std::packaged_task<bool()> lambda([=]() mutable {
return ((FilamentViewer*)viewer)->setCamera(asset, nodeName);
});
auto fut = _tp->add_task(lambda);
fut.wait();
return fut.get();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
//return fut.get();
}
FLUTTER_PLUGIN_EXPORT void set_camera_exposure(void* viewer, float aperture, float shutterSpeed, float sensitivity) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->setCameraExposure(aperture, shutterSpeed, sensitivity);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_camera_position(void* viewer, float x, float y, float z) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->setCameraPosition(x, y, z);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_camera_rotation(void* viewer, float rads, float x, float y, float z) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->setCameraRotation(rads, x, y, z);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_camera_model_matrix(void* viewer, const float* const matrix) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->setCameraModelMatrix(matrix);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_camera_focal_length(void* viewer, float focalLength) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->setCameraFocalLength(focalLength);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void render(
void* viewer,
uint64_t frameTimeInNanos
) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->render(frameTimeInNanos);
});
_tp->add_task(lambda);
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_frame_interval(
void* viewer,
float frameInterval
) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->setFrameInterval(frameInterval);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void destroy_swap_chain(void* viewer) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->destroySwapChain();
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void create_swap_chain(void* viewer, void* surface=nullptr, uint32_t width=0, uint32_t height=0) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->createSwapChain(surface, width, height);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void* get_renderer(void* viewer) {
std::packaged_task<void*()> lambda([=]() mutable {
//std::packaged_task<void*()> lambda([=]() mutable {
return ((FilamentViewer*)viewer)->getRenderer();
});
auto fut = _tp->add_task(lambda);
fut.wait();
return fut.get();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
//return fut.get();
}
FLUTTER_PLUGIN_EXPORT void update_viewport_and_camera_projection(void* viewer, int width, int height, float scaleFactor) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
return ((FilamentViewer*)viewer)->updateViewportAndCameraProjection(width, height, scaleFactor);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void scroll_update(void* viewer, float x, float y, float delta) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->scrollUpdate(x, y, delta);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void scroll_begin(void* viewer) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->scrollBegin();
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void scroll_end(void* viewer) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->scrollEnd();
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void grab_begin(void* viewer, float x, float y, bool pan) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->grabBegin(x, y, pan);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void grab_update(void* viewer, float x, float y) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->grabUpdate(x, y);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void grab_end(void* viewer) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->grabEnd();
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void* get_asset_manager(void* viewer) {
std::packaged_task<void*()> lambda([=]() mutable {
//std::packaged_task<void*()> lambda([=]() mutable {
return (void*)((FilamentViewer*)viewer)->getAssetManager();
});
auto fut = _tp->add_task(lambda);
fut.wait();
return fut.get();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
//return fut.get();
}
FLUTTER_PLUGIN_EXPORT void apply_weights(
@@ -332,14 +314,14 @@ extern "C" {
const char* const entityName,
float* const weights,
int count) {
// std::packaged_task<void()> lambda([=]() mutable {
// //std::packaged_task<void()> lambda([=]() mutable {
// ((AssetManager*)assetManager)->setMorphTargetWeights(asset, entityName, weights, count);
// });
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_morph_animation(
FLUTTER_PLUGIN_EXPORT bool set_morph_animation(
void* assetManager,
EntityId asset,
const char* const entityName,
@@ -348,8 +330,8 @@ extern "C" {
int numFrames,
float frameLengthInMs) {
std::packaged_task<void()> lambda([=]() mutable {
((AssetManager*)assetManager)->setMorphAnimationBuffer(
//std::packaged_task<void()> lambda([=]() mutable {
return ((AssetManager*)assetManager)->setMorphAnimationBuffer(
asset,
entityName,
morphData,
@@ -357,9 +339,9 @@ extern "C" {
numFrames,
frameLengthInMs
);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_bone_animation(
@@ -371,7 +353,7 @@ extern "C" {
const float* const frameData,
int numFrames,
float frameLengthInMs) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((AssetManager*)assetManager)->setBoneAnimationBuffer(
asset,
length,
@@ -381,9 +363,9 @@ extern "C" {
numFrames,
frameLengthInMs
);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
@@ -423,12 +405,12 @@ extern "C" {
bool loop,
bool reverse) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
std::cout << "Playing animation" << std::endl;
((AssetManager*)assetManager)->playAnimation(asset, index, loop, reverse);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_animation_frame(
@@ -436,7 +418,7 @@ extern "C" {
EntityId asset,
int animationIndex,
int animationFrame) {
// std::packaged_task<void()> lambda([=]() mutable {
// //std::packaged_task<void()> lambda([=]() mutable {
// ((AssetManager*)assetManager)->setAnimationFrame(asset, animationIndex, animationFrame);
// });
// auto fut = _tp->add_task(lambda);
@@ -446,13 +428,13 @@ extern "C" {
FLUTTER_PLUGIN_EXPORT int get_animation_count(
void* assetManager,
EntityId asset) {
std::packaged_task<int()> lambda([=]() mutable {
//std::packaged_task<int()> lambda([=]() mutable {
auto names = ((AssetManager*)assetManager)->getAnimationNames(asset);
return names->size();
});
auto fut = _tp->add_task(lambda);
fut.wait();
return fut.get();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
//return fut.get();
}
FLUTTER_PLUGIN_EXPORT void get_animation_name(
@@ -461,49 +443,49 @@ extern "C" {
char* const outPtr,
int index
) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
auto names = ((AssetManager*)assetManager)->getAnimationNames(asset);
string name = names->at(index);
strcpy(outPtr, name.c_str());
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT int get_morph_target_name_count(void* assetManager, EntityId asset, const char* meshName) {
std::packaged_task<int()> lambda([=]() mutable {
//std::packaged_task<int()> lambda([=]() mutable {
unique_ptr<vector<string>> names = ((AssetManager*)assetManager)->getMorphTargetNames(asset, meshName);
return names->size();
});
auto fut = _tp->add_task(lambda);
fut.wait();
return fut.get();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
//return fut.get();
}
FLUTTER_PLUGIN_EXPORT void get_morph_target_name(void* assetManager, EntityId asset, const char* meshName, char* const outPtr, int index ) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
unique_ptr<vector<string>> names = ((AssetManager*)assetManager)->getMorphTargetNames(asset, meshName);
string name = names->at(index);
strcpy(outPtr, name.c_str());
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void remove_asset(void* viewer, EntityId asset) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->removeAsset(asset);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void clear_assets(void* viewer) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((FilamentViewer*)viewer)->clearAssets();
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void load_texture(void* assetManager, EntityId asset, const char* assetPath, int renderableIndex) {
@@ -515,43 +497,43 @@ extern "C" {
}
FLUTTER_PLUGIN_EXPORT void transform_to_unit_cube(void* assetManager, EntityId asset) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((AssetManager*)assetManager)->transformToUnitCube(asset);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_position(void* assetManager, EntityId asset, float x, float y, float z) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((AssetManager*)assetManager)->setPosition(asset, x, y, z);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_rotation(void* assetManager, EntityId asset, float rads, float x, float y, float z) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((AssetManager*)assetManager)->setRotation(asset, rads, x, y, z);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void set_scale(void* assetManager, EntityId asset, float scale) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((AssetManager*)assetManager)->setScale(asset, scale);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
FLUTTER_PLUGIN_EXPORT void stop_animation(void* assetManager, EntityId asset, int index) {
std::packaged_task<void()> lambda([=]() mutable {
//std::packaged_task<void()> lambda([=]() mutable {
((AssetManager*)assetManager)->stopAnimation(asset, index);
});
auto fut = _tp->add_task(lambda);
fut.wait();
//});
// auto fut = _tp->add_task(lambda);
// fut.wait();
}
}