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

use child entity for morph animations rather than name & expose Emscripten scripts via moduleArgs

Browse Source
This commit is contained in:
Nick Fisher
2024-05-17 14:36:52 +08:00
parent bb514b13d3
commit 8b1a1974b1
3 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dart_filament/native/src/SceneManager.cpp
View File

@@ -445,7 +445,6 @@ namespace flutter_filament
const auto &pos = _instances.find(entityId);
if (pos == _instances.end())
{
// Log("Failed to find FilamentInstance for entity %d", entityId);
return nullptr;
}
return pos->second;
@@ -1197,32 +1196,38 @@ namespace flutter_filament
return names;
}
unique_ptr<std::vector<std::string>> SceneManager::getMorphTargetNames(EntityId entityId, const char *meshName)
unique_ptr<std::vector<std::string>> SceneManager::getMorphTargetNames(EntityId assetEntityId, EntityId child)
{
unique_ptr<std::vector<std::string>> names = std::make_unique<std::vector<std::string>>();
const auto *instance = getInstanceByEntityId(entityId);
const auto *instance = getInstanceByEntityId(assetEntityId);
if (!instance)
{
auto asset = getAssetByEntityId(entityId);
auto asset = getAssetByEntityId(assetEntityId);
if (!asset)
{
Log("Warning - failed to find specified asset. This is unexpected and probably indicates you are passing the wrong entity");
return names;
}
instance = asset->getInstance();
if(!instance) {
Log("Warning - failed to find instance for specified asset. This is unexpected and probably indicates you are passing the wrong entity");
return names;
}
}
const auto *asset = instance->getAsset();
const utils::Entity *entities = asset->getEntities();
const utils::Entity target = Entity::import(child);
for (int i = 0; i < asset->getEntityCount(); i++)
{
utils::Entity e = entities[i];
const char *name = asset->getName(e);
if (name && strcmp(name, meshName) == 0)
if (e == target)
{
size_t count = asset->getMorphTargetCountAt(e);
for (int j = 0; j < count; j++)