teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove unneeded casts

Browse source
This commit is contained in:
scrawl 2016-08-14 16:44:11 +02:00
parent 30b549124e
commit 513e1da8a3
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/nifosg/nifloader.cpp
View file

@ -1110,7 +1110,7 @@ namespace NifOsg
geometry->setDataVariance(osg::Object::STATIC); geometry->setDataVariance(osg::Object::STATIC);
osg::ref_ptr<FrameSwitch> frameswitch = new FrameSwitch; osg::ref_ptr<FrameSwitch> frameswitch = new FrameSwitch;
osg::ref_ptr<osg::Geometry> geom2 = static_cast<osg::Geometry*>(osg::clone(geometry.get(), osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES)); osg::ref_ptr<osg::Geometry> geom2 = osg::clone(geometry.get(), osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES);
frameswitch->addChild(geometry); frameswitch->addChild(geometry);
frameswitch->addChild(geom2); frameswitch->addChild(geom2);
@ -1224,8 +1224,7 @@ namespace NifOsg
osg::ref_ptr<FrameSwitch> frameswitch = new FrameSwitch; osg::ref_ptr<FrameSwitch> frameswitch = new FrameSwitch;
SceneUtil::RigGeometry* rig2 = static_cast<SceneUtil::RigGeometry*>(osg::clone(rig.get(), osg::CopyOp::DEEP_COPY_NODES| SceneUtil::RigGeometry* rig2 = osg::clone(rig.get(), osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES);
osg::CopyOp::DEEP_COPY_DRAWABLES));
frameswitch->addChild(rig); frameswitch->addChild(rig);
frameswitch->addChild(rig2); frameswitch->addChild(rig2);

4
components/sceneutil/statesetupdater.cpp
View file

@ -15,7 +15,7 @@ namespace SceneUtil
for (int i=0; i<2; ++i) // Using SHALLOW_COPY for StateAttributes, if users want to modify it is their responsibility to set a non-shared one first for (int i=0; i<2; ++i) // Using SHALLOW_COPY for StateAttributes, if users want to modify it is their responsibility to set a non-shared one first
// This can be done conveniently in user implementations of the setDefaults() method // This can be done conveniently in user implementations of the setDefaults() method
{ {
mStateSets[i] = static_cast<osg::StateSet*>(osg::clone(src, osg::CopyOp::SHALLOW_COPY)); mStateSets[i] = osg::clone(src, osg::CopyOp::SHALLOW_COPY);
setDefaults(mStateSets[i]); setDefaults(mStateSets[i]);
} }
} }
@ -65,7 +65,7 @@ namespace SceneUtil
: StateSetUpdater(copy, copyop) : StateSetUpdater(copy, copyop)
{ {
for (unsigned int i=0; i<copy.mCtrls.size(); ++i) for (unsigned int i=0; i<copy.mCtrls.size(); ++i)
mCtrls.push_back(static_cast<StateSetUpdater*>(osg::clone(copy.mCtrls[i].get(), copyop))); mCtrls.push_back(osg::clone(copy.mCtrls[i].get(), copyop));
} }
unsigned int CompositeStateSetUpdater::getNumControllers() unsigned int CompositeStateSetUpdater::getNumControllers()