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

set default layer for loadGlb to 0,. add setMaterialProperty for int, add SceneManager::createUnlitMaterialInstance

Browse Source
This commit is contained in:
Nick Fisher
2024-09-20 14:02:30 +08:00
parent ef48dbce30
commit e8a1b976e1
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
thermion_dart/native/src/SceneManager.cpp
View File

@@ -2489,7 +2489,7 @@ EntityId SceneManager::createGeometry(
Log("Failed to create material instance");
return Entity::smuggle(Entity());
}
}
}
// Set up texture and sampler if UVs are available
if (uvs != nullptr && numUvs > 0)
@@ -2548,7 +2548,7 @@ EntityId SceneManager::createGeometry(
materialInstance->setParameter(property, value);
}
void SceneManager::setMaterialProperty(EntityId entityId, int materialIndex, const char *property, filament::math::float4 value)
void SceneManager::setMaterialProperty(EntityId entityId, int materialIndex, const char *property, int32_t value)
{
auto entity = Entity::import(entityId);
const auto &rm = _engine->getRenderableManager();
@@ -2568,6 +2568,26 @@ EntityId SceneManager::createGeometry(
materialInstance->setParameter(property, value);
}
void SceneManager::setMaterialProperty(EntityId entityId, int materialIndex, const char *property, filament::math::float4& value)
{
auto entity = Entity::import(entityId);
const auto &rm = _engine->getRenderableManager();
auto renderableInstance = rm.getInstance(entity);
if (!renderableInstance.isValid())
{
Log("Error setting material property for entity %d: no renderable");
return;
}
auto materialInstance = rm.getMaterialInstanceAt(renderableInstance, materialIndex);
if (!materialInstance->getMaterial()->hasParameter(property))
{
Log("Parameter %s not found", property);
return;
}
materialInstance->setParameter(property, filament::math::float4 { value.x, value.y, value.z, value.w });
}
void SceneManager::destroy(MaterialInstance* instance) {
_engine->destroy(instance);
}
@@ -2579,11 +2599,17 @@ EntityId SceneManager::createGeometry(
Log("Invalid material configuration");
return nullptr;
}
materialInstance->setParameter("baseColorFactor", RgbaType::sRGB, filament::math::float4{0.0f, 1.0f, 1.0f, 1.0f});
materialInstance->setParameter("baseColorFactor", RgbaType::sRGB, filament::math::float4{1.0f, 0.0f, 1.0f, 1.0f});
materialInstance->setParameter("baseColorIndex", 0);
return materialInstance;
}
MaterialInstance* SceneManager::createUnlitMaterialInstance() {
UvMap uvmap;
auto instance = _unlitMaterialProvider->createMaterialInstance(nullptr, &uvmap);
return instance;
}
} // namespace thermion_filament