FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Todd Furlong, "I made a couple of changes to the osgFX::Outline class (SVN patch attached). I had a couple of issues with it that I was trying to resolve:

Browse Source 
1. When an outline object was occluded by another object, the backfacing wireframe was exposed.  To fix that, I removed the disabling of GL_DEPTH_TEST.

2. In some cases, the outline color was the same color as the geometry being drawn instead of the specified color.  I'm not sure I have completely fixed this issue, but I did make some changes to match up to how we do a scribe effect."
This commit is contained in:
Robert Osfield
2010-09-15 10:50:24 +00:00
parent d96e57c0c3
commit 7a6a226ddd
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/osgFX/Outline.cpp
View File

@@ -30,7 +30,8 @@
#include <osg/Texture1D>
namespace {
namespace
{
const unsigned int Override_On = osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE;
const unsigned int Override_Off = osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE;
}
@@ -71,8 +72,9 @@ namespace osgFX
_color = color;
if (_material.valid()) {
const osg::Material::Face face = osg::Material::FRONT_AND_BACK;
_material->setAmbient(face, color);
_material->setDiffuse(face, color);
_material->setAmbient(face, osg::Vec4(0.0f, 0.0f, 0.0f, 1.0f));
_material->setDiffuse(face, osg::Vec4(0.0f, 0.0f, 0.0f, 1.0f));
_material->setSpecular(face, osg::Vec4(0.0f, 0.0f, 0.0f, 1.0f));
_material->setEmission(face, color);
}
}
@@ -119,14 +121,14 @@ namespace osgFX
state->setAttributeAndModes(stencil, Override_On);
// cull front-facing polys
osg::CullFace* cf = new osg::CullFace;
cf->setMode(osg::CullFace::FRONT);
state->setAttributeAndModes(cf, Override_On);
osg::CullFace* cullFace = new osg::CullFace;
cullFace->setMode(osg::CullFace::FRONT);
state->setAttributeAndModes(cullFace, Override_On);
// draw back-facing polygon lines
osg::PolygonMode* pm = new osg::PolygonMode;
pm->setMode(osg::PolygonMode::BACK, osg::PolygonMode::LINE);
state->setAttributeAndModes(pm, Override_On);
osg::PolygonMode* polyMode = new osg::PolygonMode;
polyMode->setMode(osg::PolygonMode::BACK, osg::PolygonMode::LINE);
state->setAttributeAndModes(polyMode, Override_On);
// outline width
_lineWidth = new osg::LineWidth;
@@ -135,13 +137,13 @@ namespace osgFX
// outline color/material
_material = new osg::Material;
_material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
_material->setColorMode(osg::Material::OFF);
setColor(_color);
state->setAttributeAndModes(_material.get(), Override_On);
// disable modes
state->setMode(GL_BLEND, Override_Off);
state->setMode(GL_DEPTH_TEST, Override_Off);
//state->setMode(GL_DEPTH_TEST, Override_Off);
state->setTextureMode(0, GL_TEXTURE_1D, Override_Off);
state->setTextureMode(0, GL_TEXTURE_2D, Override_Off);
state->setTextureMode(0, GL_TEXTURE_3D, Override_Off);