From 6f30ff31c8f523c644aaec07ad8b571f3fa117f6 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Fri, 23 Aug 2019 11:55:06 -0700 Subject: [PATCH] Fix warnings --- libs/gltfio/src/MaterialGenerator.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libs/gltfio/src/MaterialGenerator.cpp b/libs/gltfio/src/MaterialGenerator.cpp index 590d6f0dba..b9fe168c9f 100644 --- a/libs/gltfio/src/MaterialGenerator.cpp +++ b/libs/gltfio/src/MaterialGenerator.cpp @@ -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) {