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

Fix to handling of subsurface layers so that more appropriate PolygonOffset values are chosen. Merged from svn/trunk using:

Browse Source 
svn merge -r 10083:10084 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/
This commit is contained in:
Robert Osfield
2009-04-23 11:08:36 +00:00
parent 4f3e2c2e82
commit aa7b0becf7
3 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/osgPlugins/OpenFlight/Document.cpp
View File

@@ -45,6 +45,7 @@ Document::Document() :
_lightPointAnimationPoolParent(false),
_shaderPoolParent(false)
{
_subsurfaceDepth = new osg::Depth(osg::Depth::LESS, 0.0, 1.0,false);
}
Document::~Document()
@@ -110,6 +111,22 @@ osg::Node* Document::getInstanceDefinition(int no)
return NULL;
}
void Document::setSubSurfacePolygonOffset(int level, osg::PolygonOffset* po)
{
_subsurfacePolygonOffsets[level] = po;
}
osg::PolygonOffset* Document::getSubSurfacePolygonOffset(int level)
{
osg::notify(osg::DEBUG_INFO)<<"Document::getSubSurfacePolygonOffset("<<level<<")"<<std::endl;
osg::ref_ptr<osg::PolygonOffset>& po = _subsurfacePolygonOffsets[level];
if (!po)
{
po = new osg::PolygonOffset(-1.0f*float(level), -1.0f);
}
return po.get();
}
double flt::unitsToMeters(CoordUnits unit)
{
switch (unit)

15
src/osgPlugins/OpenFlight/Document.h
View File

@@ -24,6 +24,8 @@
#include <osg/Notify>
#include <osg/Transform>
#include <osg/Geometry>
#include <osg/PolygonOffset>
#include <osg/Depth>
#include <osgDB/ReaderWriter>
#include "Types.h"
@@ -166,6 +168,12 @@ class Document
ShaderPool* getOrCreateShaderPool();
bool getShaderPoolParent() const { return _shaderPoolParent; }
void setSubSurfacePolygonOffset(int level, osg::PolygonOffset* po);
osg::PolygonOffset* getSubSurfacePolygonOffset(int level);
void setSubSurfaceDepth(osg::Depth* depth) { _subsurfaceDepth = depth; }
osg::Depth* getSubSurfaceDepth() { return _subsurfaceDepth.get(); }
// Options
void setReplaceClampWithClampToEdge(bool flag) { _replaceClampWithClampToEdge = flag; }
@@ -184,7 +192,7 @@ class Document
bool getDoUnitsConversion() const { return _doUnitsConversion; }
void setDesiredUnits(CoordUnits units ) { _desiredUnits=units; }
CoordUnits getDesiredUnits() const { return _desiredUnits; }
void setKeepExternalReferences( bool flag) { _keepExternalReferences=flag; }
bool getKeepExternalReferences() const { return _keepExternalReferences; }
@@ -225,6 +233,11 @@ class Document
osg::ref_ptr<LightPointAppearancePool> _lightPointAppearancePool;
osg::ref_ptr<LightPointAnimationPool> _lightPointAnimationPool;
osg::ref_ptr<ShaderPool> _shaderPool;
typedef std::map<int, osg::ref_ptr<osg::PolygonOffset> > SubSurfacePolygonOffsets;
SubSurfacePolygonOffsets _subsurfacePolygonOffsets;
osg::ref_ptr<osg::Depth> _subsurfaceDepth;
bool _colorPoolParent;
bool _texturePoolParent;
bool _materialPoolParent;

42
src/osgPlugins/OpenFlight/GeometryRecords.cpp
View File

@@ -23,8 +23,6 @@
#include <osg/Geometry>
#include <osg/Texture2D>
#include <osg/CullFace>
#include <osg/PolygonOffset>
#include <osg/Depth>
#include <osg/BlendFunc>
#include <osgUtil/TransformAttributeFunctor>
#include "Registry.h"
@@ -383,28 +381,12 @@ protected:
// Subface
if (document.subfaceLevel() > 0)
{
static osg::ref_ptr<osg::PolygonOffset> polygonOffset = new osg::PolygonOffset(-10.0f, -40.0f);
stateset->setAttributeAndModes(polygonOffset.get(), osg::StateAttribute::ON);
static osg::ref_ptr<osg::Depth> depth = new osg::Depth(osg::Depth::LESS, 0.0, 1.0,false);
stateset->setAttribute(depth.get());
stateset->setAttributeAndModes(document.getSubSurfacePolygonOffset(document.subfaceLevel()), osg::StateAttribute::ON);
stateset->setAttribute(document.getSubSurfaceDepth());
stateset->setRenderBinDetails(document.subfaceLevel(),"RenderBin");
}
#if 0
// note from Robert Osfield, this "optimization" breaks multi-textured datasets that mix single texture
// and mulit-texture geometries as the Multitexture parsing can come after the below code, and accidentally
// polute the non multi-texture geometries StateSet.
// A simple share stateset optimization.
static osg::ref_ptr<osg::StateSet> lastStateset;
if (lastStateset.valid() && (stateset->compare(*lastStateset,false)==0))
stateset = lastStateset;
else
lastStateset = stateset;
#endif
_geode->setStateSet(stateset.get());
// Add to parent.
@@ -952,28 +934,12 @@ protected:
// Subface
if (document.subfaceLevel() > 0)
{
static osg::ref_ptr<osg::PolygonOffset> polygonOffset = new osg::PolygonOffset(-10.0f, -40.0f);
stateset->setAttributeAndModes(polygonOffset.get(), osg::StateAttribute::ON);
static osg::ref_ptr<osg::Depth> depth = new osg::Depth(osg::Depth::LESS, 0.0, 1.0,false);
stateset->setAttribute(depth.get());
stateset->setAttributeAndModes(document.getSubSurfacePolygonOffset(document.subfaceLevel()), osg::StateAttribute::ON);
stateset->setAttribute(document.getSubSurfaceDepth());
stateset->setRenderBinDetails(document.subfaceLevel(),"RenderBin");
}
#if 0
// note from Robert Osfield, this "optimization" breaks multi-textured datasets that mix single texture
// and mulit-texture geometries as the Multitexture parsing can come after the below code, and accidentally
// polute the non multi-texture geometries StateSet.
// A simple share stateset optimization.
static osg::ref_ptr<osg::StateSet> lastStateset;
if (lastStateset.valid() && (stateset->compare(*lastStateset,false)==0))
stateset = lastStateset;
else
lastStateset = stateset;
#endif
_geode->setStateSet(stateset.get());
// Add to parent.