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

update ResourceLoader call to new API and fix image material resource names

Browse Source
This commit is contained in:
Nick Fisher
2022-12-05 17:52:07 +08:00
parent dd100653dc
commit de4c6a32e3
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ios/src/FilamentViewer.cpp
View File

@@ -69,7 +69,7 @@
#include "Log.hpp" #include "Log.hpp"
#include "SceneResources.hpp" #include "SceneResources.hpp"
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
#include "material/imagematerials_ios.h" #include "material/image_material.h"
#include "material/unlitopaque.h" #include "material/unlitopaque.h"
#else #else
#include "image/imagematerial.h" #include "image/imagematerial.h"
@@ -218,8 +218,7 @@ FilamentViewer::FilamentViewer(void *layer, LoadResource loadResource,
_ncm = new NameComponentManager(em); _ncm = new NameComponentManager(em);
_assetLoader = AssetLoader::create({_engine, _materialProvider, _ncm, &em}); _assetLoader = AssetLoader::create({_engine, _materialProvider, _ncm, &em});
_resourceLoader = new ResourceLoader({.engine = _engine, _resourceLoader = new ResourceLoader({.engine = _engine,
.normalizeSkinningWeights = true, .normalizeSkinningWeights = true });
.recomputeBoundingBoxes = true});
_stbDecoder = createStbProvider(_engine); _stbDecoder = createStbProvider(_engine);
_resourceLoader->addTextureProvider("image/png", _stbDecoder); _resourceLoader->addTextureProvider("image/png", _stbDecoder);
_resourceLoader->addTextureProvider("image/jpeg", _stbDecoder); _resourceLoader->addTextureProvider("image/jpeg", _stbDecoder);
@@ -284,15 +283,14 @@ void FilamentViewer::createImageRenderable() {
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
_imageMaterial = _imageMaterial =
Material::Builder() Material::Builder()
.package(IMAGEMATERIALS_IOS_IMAGE_FILAMAT_DATA, IMAGEMATERIALS_IOS_IMAGE_FILAMAT_SIZE) .package(IMAGE_MATERIAL_PACKAGE, IMAGE_MATERIAL_IMAGE_SIZE)
.build(*_engine); .build(*_engine);
#else #else
_imageMaterial = _imageMaterial =
Material::Builder() Material::Builder()
.package(IMAGEMATERIAL_IMAGE_DATA, IMAGEMATERIAL_IMAGE_SIZE) .package(IMAGE_MATERIAL_PACKAGE, IMAGE_MATERIAL_IMAGE_SIZE)
.build(*_engine); .build(*_engine);
#endif #endif
// TODO - can we make these resgen names consistent
_imageVb = VertexBuffer::Builder() _imageVb = VertexBuffer::Builder()
.vertexCount(3) .vertexCount(3)