Fix warnings
This commit is contained in:
@@ -34,8 +34,8 @@ namespace {
|
||||
|
||||
class MaterialGenerator : public MaterialProvider {
|
||||
public:
|
||||
MaterialGenerator(filament::Engine* engine);
|
||||
~MaterialGenerator();
|
||||
explicit MaterialGenerator(filament::Engine* engine);
|
||||
~MaterialGenerator() override;
|
||||
|
||||
MaterialSource getSource() const noexcept override { return GENERATE_SHADERS; }
|
||||
|
||||
@@ -76,7 +76,7 @@ void MaterialGenerator::destroyMaterials() {
|
||||
mCache.clear();
|
||||
}
|
||||
|
||||
static std::string shaderFromKey(const MaterialKey& config) {
|
||||
std::string shaderFromKey(const MaterialKey& config) {
|
||||
std::string shader = "void material(inout MaterialInputs material) {\n";
|
||||
|
||||
if (config.hasNormalTexture && !config.unlit) {
|
||||
@@ -195,7 +195,7 @@ static std::string shaderFromKey(const MaterialKey& config) {
|
||||
return shader;
|
||||
}
|
||||
|
||||
static Material* createMaterial(Engine* engine, const MaterialKey& config, const UvMap& uvmap,
|
||||
Material* createMaterial(Engine* engine, const MaterialKey& config, const UvMap& uvmap,
|
||||
const char* name) {
|
||||
std::string shader = shaderFromKey(config);
|
||||
gltfio::details::processShaderString(&shader, uvmap, config);
|
||||
@@ -294,7 +294,7 @@ static Material* createMaterial(Engine* engine, const MaterialKey& config, const
|
||||
}
|
||||
}
|
||||
|
||||
switch(config.alphaMode) {
|
||||
switch (config.alphaMode) {
|
||||
case AlphaMode::OPAQUE:
|
||||
builder.blending(MaterialBuilder::BlendingMode::OPAQUE);
|
||||
break;
|
||||
@@ -304,6 +304,10 @@ static Material* createMaterial(Engine* engine, const MaterialKey& config, const
|
||||
case AlphaMode::BLEND:
|
||||
builder.blending(MaterialBuilder::BlendingMode::FADE);
|
||||
builder.depthWrite(true);
|
||||
break;
|
||||
default:
|
||||
// Ignore
|
||||
break;
|
||||
}
|
||||
|
||||
if (config.unlit) {
|
||||
|
||||
Reference in New Issue
Block a user