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

feat: add startOffset parameter to gltf playAnimation

Browse Source
This commit is contained in:
Nick Fisher
2024-07-29 16:13:45 +08:00
parent 96ad9dee18
commit a30e2f295f
16 changed files with 29 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
thermion_dart/lib/thermion_dart/compatibility/native/thermion_dart.g.dart
View File

@@ -456,7 +456,7 @@ external bool set_bone_transform(
@ffi.Native<
ffi.Void Function(ffi.Pointer<ffi.Void>, ffi.Int, ffi.Int, ffi.Bool,
ffi.Bool, ffi.Bool, ffi.Float)>()
ffi.Bool, ffi.Bool, ffi.Float, ffi.Float)>()
external void play_animation(
ffi.Pointer<ffi.Void> sceneManager,
int entity,
@@ -465,6 +465,7 @@ external void play_animation(
bool reverse,
bool replaceActive,
double crossfade,
double startOffset,
);
@ffi.Native<
@@ -1301,19 +1302,6 @@ external void apply_weights_ffi(
int count,
);
@ffi.Native<
ffi.Void Function(ffi.Pointer<ffi.Void>, EntityId, ffi.Int, ffi.Bool,
ffi.Bool, ffi.Bool, ffi.Float)>()
external void play_animation_ffi(
ffi.Pointer<ffi.Void> sceneManager,
int asset,
int index,
bool loop,
bool reverse,
bool replaceActive,
double crossfade,
);
@ffi.Native<
ffi.Void Function(ffi.Pointer<ffi.Void>, EntityId, ffi.Int, ffi.Int)>()
external void set_animation_frame_ffi(

19
thermion_dart/lib/thermion_dart/compatibility/web/ffi/thermion_dart.g.dart
View File

@@ -1592,25 +1592,6 @@ external void apply_weights_ffi(
int count,
);
@ffi.Native<
ffi.Void Function(
ffi.Pointer<ffi.Void>,
EntityId,
ffi.Int,
ffi.Bool,
ffi.Bool,
ffi.Bool,
ffi.Float)>(symbol: '_play_animation_ffi', assetId: 'thermion_dart')
external void play_animation_ffi(
ffi.Pointer<ffi.Void> sceneManager,
int asset,
int index,
bool loop,
bool reverse,
bool replaceActive,
double crossfade,
);
@ffi.Native<
ffi.Void Function(ffi.Pointer<ffi.Void>, EntityId, ffi.Int, ffi.Int)>(
symbol: '_set_animation_frame_ffi', assetId: 'thermion_dart')

4
thermion_dart/lib/thermion_dart/compatibility/web/interop/thermion_viewer_dart_bridge.dart
View File

@@ -339,7 +339,8 @@ class ThermionViewerJSDartBridge {
{bool loop = false,
bool reverse = false,
bool replaceActive = true,
double crossfade = 0.0}) =>
double crossfade = 0.0,
double startOffset = 0.0}) =>
viewer
.playAnimation(
entity,
@@ -348,6 +349,7 @@ class ThermionViewerJSDartBridge {
reverse: reverse,
replaceActive: replaceActive,
crossfade: crossfade,
startOffset: startOffset
)
.toJS;

5
thermion_dart/lib/thermion_dart/compatibility/web/interop/thermion_viewer_js.dart
View File

@@ -368,9 +368,10 @@ class ThermionViewerJS implements ThermionViewer {
{bool loop = false,
bool reverse = false,
bool replaceActive = true,
double crossfade = 0.0}) async {
double crossfade = 0.0,
double startOffset = 0.0}) async {
await _shim
.playAnimation(entity, index, loop, reverse, replaceActive, crossfade)
.playAnimation(entity, index, loop, reverse, replaceActive, crossfade, startOffset)
.toDart;
}

1
thermion_dart/lib/thermion_dart/compatibility/web/interop/thermion_viewer_js_shim.dart
View File

@@ -184,6 +184,7 @@ extension type ThermionViewerJSShim(JSObject _) implements JSObject {
bool reverse,
bool replaceActive,
double crossfade,
double startOffset,
);
@JS('playAnimationByName')

4
thermion_dart/lib/thermion_dart/compatibility/web/interop/thermion_viewer_wasm.dart
View File

@@ -698,7 +698,8 @@ class ThermionViewerWasm implements ThermionViewer {
{bool loop = false,
bool reverse = false,
bool replaceActive = true,
double crossfade = 0.0}) async {
double crossfade = 0.0,
double startOffset = 0.0}) async {
_module.ccall(
"play_animation",
"void",
@@ -709,6 +710,7 @@ class ThermionViewerWasm implements ThermionViewer {
"bool".toJS,
"bool".toJS,
"bool".toJS,
"float".toJS,
"float".toJS
].toJS,
[

3
thermion_dart/lib/thermion_dart/thermion_viewer.dart
View File

@@ -386,7 +386,8 @@ abstract class ThermionViewer {
{bool loop = false,
bool reverse = false,
bool replaceActive = true,
double crossfade = 0.0});
double crossfade = 0.0,
double startOffset = 0.0});
///
/// Schedules the glTF animation at [index] in [entity] to start playing on the next frame.

5
thermion_dart/lib/thermion_dart/thermion_viewer_ffi.dart
View File

@@ -980,9 +980,10 @@ class ThermionViewerFFI extends ThermionViewer {
{bool loop = false,
bool reverse = false,
bool replaceActive = true,
double crossfade = 0.0}) async {
double crossfade = 0.0,
double startOffset = 0.0}) async {
play_animation(
_sceneManager!, entity, index, loop, reverse, replaceActive, crossfade);
_sceneManager!, entity, index, loop, reverse, replaceActive, crossfade, startOffset);
}
///

3
thermion_dart/lib/thermion_dart/thermion_viewer_stub.dart
View File

@@ -333,7 +333,8 @@ class ThermionViewerStub extends ThermionViewer {
{bool loop = false,
bool reverse = false,
bool replaceActive = true,
double crossfade = 0.0}) {
double crossfade = 0.0,
double startOffset=0.0}) {
// TODO: implement playAnimation
throw UnimplementedError();
}

2
thermion_dart/native/include/SceneManager.hpp
View File

@@ -129,7 +129,7 @@ namespace thermion_filament
void resetBones(EntityId entityId);
bool setTransform(EntityId entityId, math::mat4f transform);
bool updateBoneMatrices(EntityId entityId);
void playAnimation(EntityId e, int index, bool loop, bool reverse, bool replaceActive, float crossfade = 0.3f);
void playAnimation(EntityId e, int index, bool loop, bool reverse, bool replaceActive, float crossfade = 0.3f, float startOffset = 0.0f);
void stopAnimation(EntityId e, int index);
void setMorphTargetWeights(const char *const entityName, float *weights, int count);
void loadTexture(EntityId entity, const char *resourcePath, int renderableIndex);

2
thermion_dart/native/include/ThermionDartApi.h
View File

@@ -168,7 +168,7 @@ extern "C"
int skinIndex,
int boneIndex,
const float *const transform);
EMSCRIPTEN_KEEPALIVE void play_animation(void *sceneManager, EntityId entity, int index, bool loop, bool reverse, bool replaceActive, float crossfade);
EMSCRIPTEN_KEEPALIVE void play_animation(void *sceneManager, EntityId entity, int index, bool loop, bool reverse, bool replaceActive, float crossfade, float startOffset);
EMSCRIPTEN_KEEPALIVE void set_animation_frame(void *sceneManager, EntityId entity, int animationIndex, int animationFrame);
EMSCRIPTEN_KEEPALIVE void stop_animation(void *sceneManager, EntityId entity, int index);
EMSCRIPTEN_KEEPALIVE int get_animation_count(void *sceneManager, EntityId asset);

2
thermion_dart/native/include/ThermionDartFFIApi.h
View File

@@ -78,8 +78,6 @@ extern "C"
const char *const entityName,
float *const weights,
int count);
EMSCRIPTEN_KEEPALIVE void play_animation_ffi(void *const sceneManager, EntityId asset, int index, bool loop, bool reverse, bool replaceActive, float crossfade);
EMSCRIPTEN_KEEPALIVE void set_animation_frame_ffi(void *const sceneManager, EntityId asset, int animationIndex, int animationFrame);
EMSCRIPTEN_KEEPALIVE void stop_animation_ffi(void *const sceneManager, EntityId asset, int index);
EMSCRIPTEN_KEEPALIVE void get_animation_count_ffi(void *const sceneManager, EntityId asset, void (*callback)(int));

3
thermion_dart/native/include/components/AnimationComponentManager.hpp
View File

@@ -43,6 +43,7 @@ namespace thermion_filament
struct AnimationStatus
{
time_point_t start = time_point_t::max();
float startOffset;
bool loop = false;
bool reverse = false;
float durationInSecs = 0;
@@ -182,7 +183,7 @@ namespace thermion_filament
auto animationStatus = animationComponent.gltfAnimations[i];
auto elapsedInSecs = float(std::chrono::duration_cast<std::chrono::milliseconds>(now - animationStatus.start).count()) / 1000.0f;
auto elapsedInSecs = animationStatus.startOffset + float(std::chrono::duration_cast<std::chrono::milliseconds>(now - animationStatus.start).count()) / 1000.0f;
if (!animationStatus.loop && elapsedInSecs >= animationStatus.durationInSecs)
{

5
thermion_dart/native/src/SceneManager.cpp
View File

@@ -1135,8 +1135,8 @@ namespace thermion_filament
return true;
}
void SceneManager::playAnimation(EntityId entityId, int index, bool loop, bool reverse, bool replaceActive, float crossfade)
void SceneManager::playAnimation(EntityId entityId, int index, bool loop, bool reverse, bool replaceActive, float crossfade, float startOffset)
{
std::lock_guard lock(_mutex);
@@ -1200,6 +1200,7 @@ namespace thermion_filament
}
GltfAnimation animation;
animation.startOffset = startOffset;
animation.index = index;
animation.start = std::chrono::high_resolution_clock::now();
animation.loop = loop;

5
thermion_dart/native/src/ThermionDartApi.cpp
View File

@@ -586,9 +586,10 @@ extern "C"
bool loop,
bool reverse,
bool replaceActive,
float crossfade)
float crossfade,
float startOffset)
{
((SceneManager *)sceneManager)->playAnimation(asset, index, loop, reverse, replaceActive, crossfade);
((SceneManager *)sceneManager)->playAnimation(asset, index, loop, reverse, replaceActive, crossfade, startOffset);
}
EMSCRIPTEN_KEEPALIVE void set_animation_frame(

12
thermion_dart/native/src/ThermionDartFFIApi.cpp
View File

@@ -677,18 +677,6 @@ extern "C"
auto fut = _rl->add_task(lambda);
}
EMSCRIPTEN_KEEPALIVE void play_animation_ffi(void *const sceneManager,
EntityId asset, int index,
bool loop, bool reverse,
bool replaceActive,
float crossfade)
{
std::packaged_task<void()> lambda([=]
{ play_animation(sceneManager, asset, index, loop, reverse, replaceActive,
crossfade); });
auto fut = _rl->add_task(lambda);
}
EMSCRIPTEN_KEEPALIVE void set_animation_frame_ffi(void *const sceneManager,
EntityId asset,
int animationIndex,