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

From Roger James, "I have been going through my modified osg files and came across this fix to the Tesselator. From memory it handles a problem with per primitive normal binding. I must have forgotten to submit it."

Browse Source
This commit is contained in:
Robert Osfield
2006-08-28 19:01:03 +00:00
parent 19f3d975dd
commit 70470bc84a
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/osgUtil/Tesselator
View File

@@ -120,7 +120,7 @@ class OSGUTIL_EXPORT Tesselator : public osg::Referenced
* these will leak memory if not removed when retesselating. */
void reduceArray(osg::Array * cold, const unsigned int nnu);
void collectTesselation(osg::Geometry &cxgeom);
void collectTesselation(osg::Geometry &cxgeom, unsigned int originalIndex);
typedef std::map<osg::Vec3*,unsigned int> VertexPtrToIndexMap;
void addContour(GLenum mode, unsigned int first, unsigned int last, osg::Vec3Array* vertices);
@@ -236,6 +236,9 @@ class OSGUTIL_EXPORT Tesselator : public osg::Referenced
/** the gluTessNormal for tesselation hint */
osg::Vec3 tessNormal;
/** count of number of extra primitives added */
unsigned int _extraPrimitives;
};
}

28
src/osgUtil/Tesselator.cpp
View File

@@ -177,6 +177,7 @@ void Tesselator::retesselatePolygons(osg::Geometry &geom)
// the reset is needed by the flt loader which reuses a tesselator for triangulating polygons.
// as such it might be reset by other loaders/developers in future.
_index=0; // reset the counter for indexed vertices
_extraPrimitives = 0;
if (!_numberVerts) {
_numberVerts=geom.getVertexArray()->getNumElements();
// save the contours for complex (winding rule) tesselations
@@ -206,6 +207,7 @@ void Tesselator::retesselatePolygons(osg::Geometry &geom)
}
// process all the contours into the tesselator
int noContours = _Contours.size();
int currentPrimitive = 0;
for(int primNo=0;primNo<noContours;++primNo)
{
osg::ref_ptr<osg::PrimitiveSet> primitive = _Contours[primNo].get();
@@ -227,7 +229,8 @@ void Tesselator::retesselatePolygons(osg::Geometry &geom)
addContour(primitive->getMode(),first,last,vertices);
first = last;
endTesselation();
collectTesselation(geom);
collectTesselation(geom, currentPrimitive);
currentPrimitive++;
}
}
else
@@ -236,7 +239,8 @@ void Tesselator::retesselatePolygons(osg::Geometry &geom)
beginTesselation();
addContour(primitive.get(), vertices);
endTesselation();
collectTesselation(geom);
collectTesselation(geom, currentPrimitive);
currentPrimitive++;
} else { // April 2005 gwm triangles don't need to be retesselated
geom.addPrimitiveSet(primitive.get());
}
@@ -266,7 +270,7 @@ void Tesselator::retesselatePolygons(osg::Geometry &geom)
if (_ttype==TESS_TYPE_GEOMETRY) {
endTesselation();
collectTesselation(geom);
collectTesselation(geom, 0);
}
}
@@ -646,7 +650,7 @@ unsigned int _computeNumberOfPrimitives(const osg::Geometry& geom)
return totalNumberOfPrimitives;
}
//
void Tesselator::collectTesselation(osg::Geometry &geom)
void Tesselator::collectTesselation(osg::Geometry &geom, unsigned int originalIndex)
{
osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(geom.getVertexArray());
VertexPtrToIndexMap vertexPtrToIndexMap;
@@ -713,7 +717,10 @@ void Tesselator::collectTesselation(osg::Geometry &geom)
if (primItr==_primList.begin())
{ // first primitive so collect primitive normal & colour.
if (normals) {
norm=(*normals)[iprim]; // GWM Sep 2002 the flat shaded normal
if (geom.getNormalBinding()==osg::Geometry::BIND_PER_PRIMITIVE)
norm=(*normals)[originalIndex + _extraPrimitives];
else
norm=(*normals)[iprim]; // GWM Sep 2002 the flat shaded normal
}
if (cols4) {
primCol4=(*cols4)[iprim]; // GWM Dec 2003 the flat shaded rgba colour
@@ -730,7 +737,16 @@ void Tesselator::collectTesselation(osg::Geometry &geom)
}
else
{ // later primitives use same colour
if (normals) normals->push_back(norm); // GWM Sep 2002 add flat shaded normal for new facet
if (normals)
{
if (geom.getNormalBinding()==osg::Geometry::BIND_PER_PRIMITIVE)
{
_extraPrimitives++;
normals->insert(normals->begin() + originalIndex + _extraPrimitives, norm);
}
else
normals->push_back(norm); // GWM Sep 2002 add flat shaded normal for new facet
}
if (cols4 && _index>=cols4->size()) {
cols4->push_back(primCol4); // GWM Dec 2003 add flat shaded colour for new facet
}