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

merge

Browse Source
This commit is contained in:
Nick Fisher
2023-04-18 15:12:23 +08:00
parent 28b78edbbd 653a36fdd0
commit 7f4ca7e69b
7 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ios/include/SceneAssetLoader.hpp
View File

@@ -35,8 +35,6 @@ namespace polyvox {
private:
LoadResource _loadResource;
FreeResource _freeResource;
MaterialProvider* _materialProvider;
EntityManager* _entityManager;
AssetLoader* _assetLoader;
ResourceLoader* _resourceLoader;
NameComponentManager* _ncm;

3
ios/lib/libimageio.a
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:738f663c400320f6c295f124543e698a241d8bac6065ac4b5c577f2248b97397
size 823816

1
ios/lib/libpng.a
View File

@@ -1 +0,0 @@
libpng16.a

3
ios/lib/libtinyexr.a
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f9bff9a37abee1a3b792e882a327b114ebedc1458f7052675e8031ae16c786c
size 1310496

26
ios/src/SceneAssetLoader.cpp
View File

@@ -16,8 +16,7 @@ SceneAssetLoader::SceneAssetLoader(LoadResource loadResource,
NameComponentManager *ncm,
Engine *engine,
Scene *scene)
: _loadResource(loadResource), _freeResource(freeResource), _materialProvider(materialProvider), _entityManager(entityManager),
_resourceLoader(resourceLoader), _ncm(ncm),
: _loadResource(loadResource), _freeResource(freeResource), _resourceLoader(resourceLoader), _ncm(ncm),
_engine(engine), _scene(scene) {
_assetLoader = AssetLoader::create({_engine, materialProvider, _ncm, entityManager});
}
@@ -111,21 +110,20 @@ SceneAsset *SceneAssetLoader::fromGlb(const char *uri) {
Log("Resources loaded.");
const Entity *entities = asset->getEntities();
// const Entity *entities = asset->getEntities();
RenderableManager &rm = _engine->getRenderableManager();
// RenderableManager &rm = _engine->getRenderableManager();
MaterialKey config;
auto mi_new = _materialProvider->createMaterialInstance(&config, nullptr);
// MaterialKey config;
// auto mi_new = _materialProvider->createMaterialInstance(&config, nullptr);
// why did I need to explicitly enable culling?
for (int i = 0; i < asset->getEntityCount(); i++) {
auto entityInstance = rm.getInstance(entities[i]);
auto mi = rm.getMaterialInstanceAt(entityInstance, 0);
// auto m = mi->getMaterial();
// auto shading = m->getShading();
// Log("Shading %d", shading);
}
// for (int i = 0; i < asset->getEntityCount(); i++) {
// auto entityInstance = rm.getInstance(entities[i]);
// auto mi = rm.getMaterialInstanceAt(entityInstance, 0);
// // auto m = mi->getMaterial();
// // auto shading = m->getShading();
// // Log("Shading %d", shading);
// }
auto lights = asset->getLightEntities();
_scene->addEntities(lights, asset->getLightEntityCount());