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

Added support for billboard in OpenFlight loader. Submission from Nikolaus Hanekamp.

Browse Source
This commit is contained in:
Robert Osfield
2002-01-16 21:12:02 +00:00
parent 231b2de41e
commit 13ed25221a
4 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/osgPlugins/flt/GeoSetBuilder.cpp
View File

@@ -75,9 +75,9 @@ void DynGeoSet::append(DynGeoSet* source)
DynGeoSet::DynGeoSet():osg::GeoSet()
{
// disable the attribute delete functor since the vectors contained in DynGeoSet
// will delete the memory for us.
_adf = NULL;
// disable the attribute delete functor since the vectors contained in DynGeoSet
// will delete the memory for us.
_adf = NULL;
}
void DynGeoSet::setBinding()
@@ -100,6 +100,7 @@ void DynGeoSet::setBinding()
}
bool DynGeoSet::setLists()
{
if ((_primLenList.size() > 0) && (_coordList.size() > 0))
@@ -125,7 +126,6 @@ bool DynGeoSet::setLists()
return false;
}
////////////////////////////////////////////////////////////////////
//
// GeoSetBuilder
@@ -135,6 +135,7 @@ bool DynGeoSet::setLists()
// OpenFlight don't save data in GeoSets. This class tries to find
// existing GeoSets with matching state before creating a new GeoSet.
GeoSetBuilder::GeoSetBuilder(osg::Geode* geode)
{
_geode = geode;
@@ -149,8 +150,12 @@ void GeoSetBuilder::initPrimData()
}
osg::Geode* GeoSetBuilder::createOsgGeoSets()
osg::Geode* GeoSetBuilder::createOsgGeoSets(osg::Geode* geode)
{
if( geode == NULL) geode = _geode.get();
if( geode == NULL) return geode;
for(DynGeoSetList::iterator itr=_dynGeoSetList.begin();
itr!=_dynGeoSetList.end();
++itr)
@@ -163,16 +168,16 @@ osg::Geode* GeoSetBuilder::createOsgGeoSets()
{
dgset->setLists();
dgset->setNumPrims(prims);
_geode.get()->addDrawable(dgset);
geode->addDrawable(dgset);
}
}
}
return _geode.get();
return geode;
}
bool GeoSetBuilder::addPrimitive()
bool GeoSetBuilder::addPrimitive(bool dontMerge)
{
DynGeoSet* dgset = getDynGeoSet(); // This is the new geoset we want to add
@@ -185,12 +190,19 @@ bool GeoSetBuilder::addPrimitive()
dgset->setBinding();
DynGeoSet* match = findMatchingGeoSet();
if (match)
match->append(dgset);
else
if( dontMerge == true)
{
_dynGeoSetList.push_back(dgset);
}
else
{
DynGeoSet* match = findMatchingGeoSet();
if (match)
match->append(dgset);
else
_dynGeoSetList.push_back(dgset);
}
initPrimData(); // initialize _dynGeoSet
return true;
}