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

update to new API re instance

Browse Source
This commit is contained in:
Nick Fisher
2022-12-05 17:52:25 +08:00
parent 9066429d52
commit 4d90ba677b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ios/src/SceneAsset.cpp
View File

@@ -31,7 +31,7 @@ using namespace utils;
SceneAsset::SceneAsset(FilamentAsset *asset, Engine *engine, SceneAsset::SceneAsset(FilamentAsset *asset, Engine *engine,
NameComponentManager *ncm, LoadResource loadResource, FreeResource freeResource) NameComponentManager *ncm, LoadResource loadResource, FreeResource freeResource)
: _asset(asset), _engine(engine), _ncm(ncm), _loadResource(loadResource), _freeResource(freeResource) { : _asset(asset), _engine(engine), _ncm(ncm), _loadResource(loadResource), _freeResource(freeResource) {
_animator = _asset->getAnimator(); _animator = _asset->getInstance()->getAnimator();
for (int i = 0; i < _animator->getAnimationCount(); i++) { for (int i = 0; i < _animator->getAnimationCount(); i++) {
_embeddedAnimationStatus.push_back( _embeddedAnimationStatus.push_back(
EmbeddedAnimationStatus(false,false)); EmbeddedAnimationStatus(false,false));
@@ -185,8 +185,8 @@ void SceneAsset::loadTexture(const char* resourcePath, int renderableIndex) {
void SceneAsset::setTexture() { void SceneAsset::setTexture() {
MaterialInstance* const* inst = _asset->getMaterialInstances(); MaterialInstance* const* inst = _asset->getInstance()->getMaterialInstances();
size_t mic = _asset->getMaterialInstanceCount(); size_t mic = _asset->getInstance()->getMaterialInstanceCount();
Log("Material instance count : %d", mic); Log("Material instance count : %d", mic);
RenderableManager &rm = _engine->getRenderableManager(); RenderableManager &rm = _engine->getRenderableManager();
@@ -263,7 +263,7 @@ unique_ptr<vector<string>> SceneAsset::getTargetNames(const char *meshName) {
Log("No asset, ignoring call."); Log("No asset, ignoring call.");
return nullptr; return nullptr;
} }
Log("Retrieving morph target names for mesh %s", meshName); // Log("Retrieving morph target names for mesh %s", meshName);
unique_ptr<vector<string>> names = make_unique<vector<string>>(); unique_ptr<vector<string>> names = make_unique<vector<string>>();
const Entity *entities = _asset->getEntities(); const Entity *entities = _asset->getEntities();
RenderableManager &rm = _engine->getRenderableManager(); RenderableManager &rm = _engine->getRenderableManager();
@@ -271,7 +271,7 @@ unique_ptr<vector<string>> SceneAsset::getTargetNames(const char *meshName) {
Entity e = entities[i]; Entity e = entities[i];
auto inst = _ncm->getInstance(e); auto inst = _ncm->getInstance(e);
const char *name = _ncm->getName(inst); const char *name = _ncm->getName(inst);
Log("Got entity instance name %s", name); // Log("Got entity instance name %s", name);
if (strcmp(name, meshName) == 0) { if (strcmp(name, meshName) == 0) {
size_t count = _asset->getMorphTargetCountAt(e); size_t count = _asset->getMorphTargetCountAt(e);
for (int j = 0; j < count; j++) { for (int j = 0; j < count; j++) {
@@ -291,14 +291,15 @@ void SceneAsset::transformToUnitCube() {
} }
Log("Transforming asset to unit cube."); Log("Transforming asset to unit cube.");
auto &tm = _engine->getTransformManager(); auto &tm = _engine->getTransformManager();
auto aabb = _asset->getBoundingBox(); FilamentInstance* inst = _asset->getInstance();
auto aabb = inst->getBoundingBox();
auto center = aabb.center(); auto center = aabb.center();
auto halfExtent = aabb.extent(); auto halfExtent = aabb.extent();
auto maxExtent = max(halfExtent) * 2; auto maxExtent = max(halfExtent) * 2;
auto scaleFactor = 2.0f / maxExtent; auto scaleFactor = 2.0f / maxExtent;
auto transform = auto transform =
math::mat4f::scaling(scaleFactor) * math::mat4f::translation(-center); math::mat4f::scaling(scaleFactor) * math::mat4f::translation(-center);
tm.setTransform(tm.getInstance(_asset->getRoot()), transform); tm.setTransform(tm.getInstance(inst->getRoot()), transform);
} }
void SceneAsset::updateTransform() { void SceneAsset::updateTransform() {