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

Converted the instance of osgNew and osgDelete back to new and delete as part

Browse Source 
of depecating the include/osg/MemoryManager
This commit is contained in:
Robert Osfield
2002-12-16 13:40:58 +00:00
parent de9b0b336a
commit 00cc3a1833
186 changed files with 812 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgSim/LightPointDrawable.cpp
View File

@@ -19,22 +19,22 @@ LightPointDrawable::LightPointDrawable():
{
setSupportsDisplayList(false);
_depthOff = osgNew osg::Depth;
_depthOff = new osg::Depth;
_depthOff->setWriteMask(false);
_depthOn = osgNew osg::Depth;
_depthOn = new osg::Depth;
_depthOn->setWriteMask(true);
_blendOne = osgNew osg::BlendFunc;
_blendOne = new osg::BlendFunc;
_blendOne->setFunction(osg::BlendFunc::SRC_ALPHA,osg::BlendFunc::ONE);
_blendOneMinusSrcAlpha = osgNew osg::BlendFunc;
_blendOneMinusSrcAlpha = new osg::BlendFunc;
_blendOneMinusSrcAlpha->setFunction(osg::BlendFunc::SRC_ALPHA,osg::BlendFunc::ONE_MINUS_SRC_ALPHA);
_colorMaskOff = osgNew osg::ColorMask;
_colorMaskOff = new osg::ColorMask;
_colorMaskOff->setMask(false,false,false,false);
_point = osgNew osg::Point;
_point = new osg::Point;
}
LightPointDrawable::LightPointDrawable(const LightPointDrawable& lpd,const osg::CopyOp& copyop):

4
src/osgSim/LightPointDrawable.h
View File

@@ -33,8 +33,8 @@ class OSGSIM_EXPORT LightPointDrawable : public osg::Drawable
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
LightPointDrawable(const LightPointDrawable&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
virtual osg::Object* cloneType() const { return osgNew LightPointDrawable(); }
virtual osg::Object* clone(const osg::CopyOp&) const { return osgNew LightPointDrawable(); }
virtual osg::Object* cloneType() const { return new LightPointDrawable(); }
virtual osg::Object* clone(const osg::CopyOp&) const { return new LightPointDrawable(); }
virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const LightPointDrawable*>(obj)!=NULL; }
virtual const char* className() const { return "LightPointDrawable"; }

4
src/osgSim/LightPointNode.cpp
View File

@@ -149,7 +149,7 @@ void LightPointNode::traverse(osg::NodeVisitor& nv)
if (!drawable)
{
// set it for the frst time.
drawable = osgNew LightPointDrawable;
drawable = new LightPointDrawable;
rg->setUserData(drawable);
if (cv->getFrameStamp())
@@ -173,7 +173,7 @@ void LightPointNode::traverse(osg::NodeVisitor& nv)
// and update its time signatures.
drawable->reset();
rg->addLeaf(osgNew osgUtil::RenderLeaf(drawable,&projection,NULL,FLT_MAX));
rg->addLeaf(new osgUtil::RenderLeaf(drawable,&projection,NULL,FLT_MAX));
// need to update the drawable's frame count.
if (cv->getFrameStamp())