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

fixes for unnamed entities, disable unlitProvider and asset ktx2decoder

Browse Source
This commit is contained in:
Nick Fisher
2023-08-18 12:02:14 +08:00
parent 4d98778c7c
commit 33dfc0b2b1
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ios/src/AssetManager.cpp
View File

@@ -47,6 +47,7 @@ AssetManager::AssetManager(const ResourceLoaderWrapper* const resourceLoaderWrap
_scene(scene) { _scene(scene) {
_stbDecoder = createStbProvider(_engine); _stbDecoder = createStbProvider(_engine);
_ktxDecoder = createKtx2Provider(_engine);
_gltfResourceLoader = new ResourceLoader({.engine = _engine, _gltfResourceLoader = new ResourceLoader({.engine = _engine,
.normalizeSkinningWeights = true }); .normalizeSkinningWeights = true });
@@ -54,13 +55,13 @@ AssetManager::AssetManager(const ResourceLoaderWrapper* const resourceLoaderWrap
_engine, UBERARCHIVE_DEFAULT_DATA, UBERARCHIVE_DEFAULT_SIZE); _engine, UBERARCHIVE_DEFAULT_DATA, UBERARCHIVE_DEFAULT_SIZE);
EntityManager &em = EntityManager::get(); EntityManager &em = EntityManager::get();
_unlitProvider = new UnlitMaterialProvider(_engine); //_unlitProvider = new UnlitMaterialProvider(_engine);
// auto rb = _resourceLoaderWrapper->load("file:///mnt/hdd_2tb/home/hydroxide/projects/polyvox/flutter/polyvox_filament/materials/toon.filamat"); // auto rb = _resourceLoaderWrapper->load("file:///mnt/hdd_2tb/home/hydroxide/projects/polyvox/flutter/polyvox_filament/materials/toon.filamat");
// auto toonProvider = new FileMaterialProvider(_engine, rb.data, (size_t) rb.size); // auto toonProvider = new FileMaterialProvider(_engine, rb.data, (size_t) rb.size);
_assetLoader = AssetLoader::create({_engine, _ubershaderProvider, _ncm, &em }); _assetLoader = AssetLoader::create({_engine, _ubershaderProvider, _ncm, &em });
_gltfResourceLoader->addTextureProvider("image/ktx2", _ktxDecoder);
_gltfResourceLoader->addTextureProvider("image/png", _stbDecoder); _gltfResourceLoader->addTextureProvider("image/png", _stbDecoder);
_gltfResourceLoader->addTextureProvider("image/jpeg", _stbDecoder); _gltfResourceLoader->addTextureProvider("image/jpeg", _stbDecoder);
} }
@@ -68,7 +69,7 @@ AssetManager::AssetManager(const ResourceLoaderWrapper* const resourceLoaderWrap
AssetManager::~AssetManager() { AssetManager::~AssetManager() {
_gltfResourceLoader->asyncCancelLoad(); _gltfResourceLoader->asyncCancelLoad();
_ubershaderProvider->destroyMaterials(); _ubershaderProvider->destroyMaterials();
_unlitProvider->destroyMaterials(); //_unlitProvider->destroyMaterials();
destroyAll(); destroyAll();
AssetLoader::destroy(&_assetLoader); AssetLoader::destroy(&_assetLoader);
@@ -395,12 +396,18 @@ void AssetManager::setMorphTargetWeights(EntityId entityId, const char* const en
utils::Entity AssetManager::findEntityByName(SceneAsset asset, const char* entityName) { utils::Entity AssetManager::findEntityByName(SceneAsset asset, const char* entityName) {
utils::Entity entity; utils::Entity entity;
for (size_t i = 0, c = asset.mAsset->getEntityCount(); i != c; ++i) { for (size_t i = 0, c = asset.mAsset->getEntityCount(); i != c; ++i) {
auto entity = asset.mAsset->getEntities()[i]; auto entity = asset.mAsset->getEntities()[i];
auto name = _ncm->getName(_ncm->getInstance(entity)); auto nameInstance = _ncm->getInstance(entity);
if(!nameInstance.isValid()) {
if(strcmp(entityName,name)==0) { continue;
return entity; }
} auto name = _ncm->getName(nameInstance);
if(!name) {
continue;
}
if(strcmp(entityName,name)==0) {
return entity;
}
} }
return entity; return entity;
} }
@@ -741,7 +748,7 @@ unique_ptr<vector<string>> AssetManager::getMorphTargetNames(EntityId entity, co
auto inst = _ncm->getInstance(e); auto inst = _ncm->getInstance(e);
const char *name = _ncm->getName(inst); const char *name = _ncm->getName(inst);
if (strcmp(name, meshName) == 0) { if (name && strcmp(name, meshName) == 0) {
size_t count = asset.mAsset->getMorphTargetCountAt(e); size_t count = asset.mAsset->getMorphTargetCountAt(e);
for (int j = 0; j < count; j++) { for (int j = 0; j < count; j++) {
const char *morphName = asset.mAsset->getMorphTargetNameAt(e, j); const char *morphName = asset.mAsset->getMorphTargetNameAt(e, j);