From 94eabf6220a3f2da67bba8875d1716852c8573bc Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sun, 25 Mar 2012 14:12:46 +0200 Subject: [PATCH] Merge Specular and Emission buffers --- simgear/scene/material/Effect.hxx | 3 +-- simgear/scene/material/TextureBuilder.cxx | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/simgear/scene/material/Effect.hxx b/simgear/scene/material/Effect.hxx index 69d2273d..6daa279f 100644 --- a/simgear/scene/material/Effect.hxx +++ b/simgear/scene/material/Effect.hxx @@ -86,8 +86,7 @@ public: DEPTH_BUFFER, NORMAL_BUFFER, DIFFUSE_BUFFER, - SPECULAR_BUFFER, - EMISSION_BUFFER, + SPEC_EMIS_BUFFER, LIGHTING_BUFFER, MIDDLE_BLOOM_BUFFER, BLOOM_BUFFER, diff --git a/simgear/scene/material/TextureBuilder.cxx b/simgear/scene/material/TextureBuilder.cxx index ac152921..8e90064a 100644 --- a/simgear/scene/material/TextureBuilder.cxx +++ b/simgear/scene/material/TextureBuilder.cxx @@ -132,7 +132,7 @@ void TextureUnitBuilder::buildAttribute(Effect* effect, Pass* pass, options); } catch (BuilderException& e) { - SG_LOG(SG_INPUT, SG_ALERT, e.getFormattedMessage() << ", " + SG_LOG(SG_INPUT, SG_DEBUG, e.getFormattedMessage() << ", " << "maybe the reader did not set the filename attribute, " << "using white for type '" << type << "' on '" << pass->getName() << "', in " << prop->getPath() ); texture = StateAttributeFactory::instance()->getWhiteTexture(); @@ -857,8 +857,7 @@ namespace TextureBuilder::Registrar installDepthBuffer("depth-buffer", new GBufferBuilder(Effect::DEPTH_BUFFER)); TextureBuilder::Registrar installNormalBuffer("normal-buffer", new GBufferBuilder(Effect::NORMAL_BUFFER)); TextureBuilder::Registrar installDiffuseBuffer("diffuse-buffer", new GBufferBuilder(Effect::DIFFUSE_BUFFER)); - TextureBuilder::Registrar installSpecularBuffer("specular-buffer", new GBufferBuilder(Effect::SPECULAR_BUFFER)); - TextureBuilder::Registrar installEmissionBuffer("emission-buffer", new GBufferBuilder(Effect::EMISSION_BUFFER)); + TextureBuilder::Registrar installSpecularBuffer("spec-emis-buffer", new GBufferBuilder(Effect::SPEC_EMIS_BUFFER)); TextureBuilder::Registrar installLightingBuffer("lighting-buffer", new GBufferBuilder(Effect::LIGHTING_BUFFER)); TextureBuilder::Registrar installMiddleBloomBuffer("middle-bloom-buffer", new GBufferBuilder(Effect::MIDDLE_BLOOM_BUFFER)); TextureBuilder::Registrar installBloomBuffer("bloom-buffer", new GBufferBuilder(Effect::BLOOM_BUFFER)); -- 2.39.5