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

Fixed compilation problems in flt plugin under Windows, and removed usage of

Browse Source 
the default GeoSet::AtttributeDeleteFunctor from the DynGeoSet since it handled
the memory deletion iteself via STL containers.
This commit is contained in:
Robert Osfield 2001-12-18 10:46:15 +00:00
parent a2cf39fd74
commit 13641f1d6c
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,6 +73,13 @@ void DynGeoSet::append(DynGeoSet* source)
break; \
}
DynGeoSet::DynGeoSet():osg::GeoSet()
{
// disable the attribute delete functor since the vectors contained in DynGeoSet
// will delete the memory for us.
_adf = NULL;
}
void DynGeoSet::setBinding()
{
VERIFY_DynGeoSet_Binding(_normal_binding, _normalList)
@ -97,20 +104,20 @@ bool DynGeoSet::setLists()
{
if ((_primLenList.size() > 0) && (_coordList.size() > 0))
{
osg::GeoSet::setPrimLengths(_primLenList.begin());
osg::GeoSet::setCoords(_coordList.begin());
setPrimLengths(_primLenList.begin());
setCoords(_coordList.begin());
if ((_normalList.size() > 0)
&& (getNormalBinding() != osg::GeoSet::BIND_OFF))
osg::GeoSet::setNormals(_normalList.begin());
setNormals(_normalList.begin());
if ((_colorList.size() > 0)
&& (getColorBinding() != osg::GeoSet::BIND_OFF))
osg::GeoSet::setColors(_colorList.begin());
setColors(_colorList.begin());
if ((_tcoordList.size() > 0)
&& (getTextureBinding() != osg::GeoSet::BIND_OFF))
osg::GeoSet::setTextureCoords(_tcoordList.begin());
setTextureCoords(_tcoordList.begin());
return true;
}

4
src/osgPlugins/flt/GeoSetBuilder.h
View File

@ -43,7 +43,9 @@ class DynGeoSet : public osg::GeoSet
{
public:
virtual osg::Object* clone() const { return new DynGeoSet(); }
DynGeoSet();
virtual osg::Object* clone() const { return new DynGeoSet(); }
virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const DynGeoSet*>(obj)!=NULL; }
virtual const char* className() const { return "GeoSet"; }