FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Specular and Emission buffers

Browse Source
This commit is contained in:
Frederic Bouvier
2012-03-25 14:14:14 +02:00
parent 40bc0cbd48
commit 94eabf6220
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/Effect.hxx
+1 -2
View File
@@ -86,8 +86,7 @@ public:
DEPTH_BUFFER, DEPTH_BUFFER,
NORMAL_BUFFER, NORMAL_BUFFER,
DIFFUSE_BUFFER, DIFFUSE_BUFFER,
SPECULAR_BUFFER, SPEC_EMIS_BUFFER,
EMISSION_BUFFER,
LIGHTING_BUFFER, LIGHTING_BUFFER,
MIDDLE_BLOOM_BUFFER, MIDDLE_BLOOM_BUFFER,
BLOOM_BUFFER, BLOOM_BUFFER,
simgear/scene/material/TextureBuilder.cxx
+2 -3
View File
@@ -132,7 +132,7 @@ void TextureUnitBuilder::buildAttribute(Effect* effect, Pass* pass,
options); options);
} }
catch (BuilderException& e) { 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, " << "maybe the reader did not set the filename attribute, "
<< "using white for type '" << type << "' on '" << pass->getName() << "', in " << prop->getPath() ); << "using white for type '" << type << "' on '" << pass->getName() << "', in " << prop->getPath() );
texture = StateAttributeFactory::instance()->getWhiteTexture(); texture = StateAttributeFactory::instance()->getWhiteTexture();
@@ -857,8 +857,7 @@ namespace
TextureBuilder::Registrar installDepthBuffer("depth-buffer", new GBufferBuilder(Effect::DEPTH_BUFFER)); TextureBuilder::Registrar installDepthBuffer("depth-buffer", new GBufferBuilder(Effect::DEPTH_BUFFER));
TextureBuilder::Registrar installNormalBuffer("normal-buffer", new GBufferBuilder(Effect::NORMAL_BUFFER)); TextureBuilder::Registrar installNormalBuffer("normal-buffer", new GBufferBuilder(Effect::NORMAL_BUFFER));
TextureBuilder::Registrar installDiffuseBuffer("diffuse-buffer", new GBufferBuilder(Effect::DIFFUSE_BUFFER)); TextureBuilder::Registrar installDiffuseBuffer("diffuse-buffer", new GBufferBuilder(Effect::DIFFUSE_BUFFER));
TextureBuilder::Registrar installSpecularBuffer("specular-buffer", new GBufferBuilder(Effect::SPECULAR_BUFFER)); TextureBuilder::Registrar installSpecularBuffer("spec-emis-buffer", new GBufferBuilder(Effect::SPEC_EMIS_BUFFER));
TextureBuilder::Registrar installEmissionBuffer("emission-buffer", new GBufferBuilder(Effect::EMISSION_BUFFER));
TextureBuilder::Registrar installLightingBuffer("lighting-buffer", new GBufferBuilder(Effect::LIGHTING_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 installMiddleBloomBuffer("middle-bloom-buffer", new GBufferBuilder(Effect::MIDDLE_BLOOM_BUFFER));
TextureBuilder::Registrar installBloomBuffer("bloom-buffer", new GBufferBuilder(Effect::BLOOM_BUFFER)); TextureBuilder::Registrar installBloomBuffer("bloom-buffer", new GBufferBuilder(Effect::BLOOM_BUFFER));