84d2d01163
memory manager published at flipcode.com. This can be turned on with the OSG_USE_MEMORY_MANGER option which then uses custom global new and delete operators as well as provide osgNew and osgDelete macro's which add ability to log line and file from which calls are made. Updated osg,osgUtil,osgDB,osgText and osgPlugins/osg to use osgNew/osgDelete, and fixed memory leaks highlighted by the new memory manager.
95 lines
2.3 KiB
C++
95 lines
2.3 KiB
C++
#include "osg/Drawable"
|
|
|
|
#include "osgDB/Registry"
|
|
#include "osgDB/Input"
|
|
#include "osgDB/Output"
|
|
|
|
using namespace osg;
|
|
using namespace osgDB;
|
|
|
|
// forward declare functions to use later.
|
|
bool Drawable_readLocalData(Object& obj, Input& fr);
|
|
bool Drawable_writeLocalData(const Object& obj, Output& fw);
|
|
|
|
// register the read and write functions with the osgDB::Registry.
|
|
RegisterDotOsgWrapperProxy g_DrawableFuncProxy
|
|
(
|
|
/*new osg::Drawable*/NULL,
|
|
"Drawable",
|
|
"Object Drawable",
|
|
&Drawable_readLocalData,
|
|
&Drawable_writeLocalData
|
|
);
|
|
|
|
bool Drawable_readLocalData(Object& obj, Input& fr)
|
|
{
|
|
bool iteratorAdvanced = false;
|
|
|
|
Drawable& drawable = static_cast<Drawable&>(obj);
|
|
|
|
static ref_ptr<StateSet> s_drawstate = osgNew osg::StateSet;
|
|
if (StateSet* readState = static_cast<StateSet*>(fr.readObjectOfType(*s_drawstate)))
|
|
{
|
|
drawable.setStateSet(readState);
|
|
iteratorAdvanced = true;
|
|
}
|
|
|
|
if (fr[0].matchWord("supportsDisplayList"))
|
|
{
|
|
if (fr[1].matchWord("TRUE"))
|
|
{
|
|
drawable.setSupportsDisplayList(true);
|
|
fr+=2;
|
|
iteratorAdvanced = true;
|
|
}
|
|
else if (fr[1].matchWord("FALSE"))
|
|
{
|
|
drawable.setSupportsDisplayList(false);
|
|
fr+=2;
|
|
iteratorAdvanced = true;
|
|
}
|
|
}
|
|
|
|
if (fr[0].matchWord("useDisplayList"))
|
|
{
|
|
if (fr[1].matchWord("TRUE"))
|
|
{
|
|
drawable.setUseDisplayList(true);
|
|
fr+=2;
|
|
iteratorAdvanced = true;
|
|
}
|
|
else if (fr[1].matchWord("FALSE"))
|
|
{
|
|
drawable.setUseDisplayList(false);
|
|
fr+=2;
|
|
iteratorAdvanced = true;
|
|
}
|
|
}
|
|
|
|
return iteratorAdvanced;
|
|
}
|
|
|
|
|
|
bool Drawable_writeLocalData(const Object& obj, Output& fw)
|
|
{
|
|
const Drawable& drawable = static_cast<const Drawable&>(obj);
|
|
|
|
if (drawable.getStateSet())
|
|
{
|
|
fw.writeObject(*drawable.getStateSet());
|
|
}
|
|
|
|
if (!drawable.getSupportsDisplayList())
|
|
{
|
|
fw.indent()<<"supportsDisplayList ";
|
|
if (drawable.getSupportsDisplayList()) fw << "TRUE" << std::endl;
|
|
else fw << "FALSE" << std::endl;
|
|
}
|
|
|
|
fw.indent()<<"useDisplayList ";
|
|
if (drawable.getUseDisplayList()) fw << "TRUE" << std::endl;
|
|
else fw << "FALSE" << std::endl;
|
|
|
|
return true;
|
|
}
|