mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 17:15:39 +00:00
Code Issues Releases Wiki Activity

replace boost::shared_ptr in extern and components

Browse source
This commit is contained in:
Bret Curtis 2017-05-05 19:26:09 +02:00
parent dd882b69c6
commit 07f75e1104
26 changed files with 69 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwbase/soundmanager.hpp
View file

@ -17,13 +17,13 @@ namespace MWSound
class Sound; class Sound;
class Stream; class Stream;
struct Sound_Decoder; struct Sound_Decoder;
typedef boost::shared_ptr<Sound_Decoder> DecoderPtr; typedef std::shared_ptr<Sound_Decoder> DecoderPtr;
} }
namespace MWBase namespace MWBase
{ {
typedef boost::shared_ptr<MWSound::Sound> SoundPtr; typedef std::shared_ptr<MWSound::Sound> SoundPtr;
typedef boost::shared_ptr<MWSound::Stream> SoundStreamPtr; typedef std::shared_ptr<MWSound::Stream> SoundStreamPtr;
/// \brief Interface for sound manager (implemented in MWSound) /// \brief Interface for sound manager (implemented in MWSound)
class SoundManager class SoundManager

12
apps/openmw/mwrender/animation.cpp
View file

@ -546,7 +546,7 @@ namespace MWRender
if(!mResourceSystem->getVFS()->exists(kfname)) if(!mResourceSystem->getVFS()->exists(kfname))
return; return;
boost::shared_ptr<AnimSource> animsrc; std::shared_ptr<AnimSource> animsrc;
animsrc.reset(new AnimSource); animsrc.reset(new AnimSource);
animsrc->mKeyframes = mResourceSystem->getKeyframeManager()->get(kfname); animsrc->mKeyframes = mResourceSystem->getKeyframeManager()->get(kfname);
@ -598,7 +598,7 @@ namespace MWRender
mStates.clear(); mStates.clear();
for(size_t i = 0;i < sNumBlendMasks;i++) for(size_t i = 0;i < sNumBlendMasks;i++)
mAnimationTimePtr[i]->setTimePtr(boost::shared_ptr<float>()); mAnimationTimePtr[i]->setTimePtr(std::shared_ptr<float>());
mAccumCtrl = NULL; mAccumCtrl = NULL;
@ -881,12 +881,12 @@ namespace MWRender
active = state; active = state;
} }
mAnimationTimePtr[blendMask]->setTimePtr(active == mStates.end() ? boost::shared_ptr<float>() : active->second.mTime); mAnimationTimePtr[blendMask]->setTimePtr(active == mStates.end() ? std::shared_ptr<float>() : active->second.mTime);
// add external controllers for the AnimSource active in this blend mask // add external controllers for the AnimSource active in this blend mask
if (active != mStates.end()) if (active != mStates.end())
{ {
boost::shared_ptr<AnimSource> animsrc = active->second.mSource; std::shared_ptr<AnimSource> animsrc = active->second.mSource;
for (AnimSource::ControllerMap::iterator it = animsrc->mControllerMap[blendMask].begin(); it != animsrc->mControllerMap[blendMask].end(); ++it) for (AnimSource::ControllerMap::iterator it = animsrc->mControllerMap[blendMask].begin(); it != animsrc->mControllerMap[blendMask].end(); ++it)
{ {
@ -1406,9 +1406,9 @@ namespace MWRender
params.mEffectId = effectId; params.mEffectId = effectId;
params.mBoneName = bonename; params.mBoneName = bonename;
params.mAnimTime = boost::shared_ptr<EffectAnimationTime>(new EffectAnimationTime); params.mAnimTime = std::shared_ptr<EffectAnimationTime>(new EffectAnimationTime);
SceneUtil::AssignControllerSourcesVisitor assignVisitor(boost::shared_ptr<SceneUtil::ControllerSource>(params.mAnimTime)); SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::shared_ptr<SceneUtil::ControllerSource>(params.mAnimTime));
node->accept(assignVisitor); node->accept(assignVisitor);
overrideFirstRootTexture(texture, mResourceSystem, node); overrideFirstRootTexture(texture, mResourceSystem, node);

18
apps/openmw/mwrender/animation.hpp
View file

@ -69,7 +69,7 @@ private:
void operator= (const PartHolder&); void operator= (const PartHolder&);
PartHolder(const PartHolder&); PartHolder(const PartHolder&);
}; };
typedef boost::shared_ptr<PartHolder> PartHolderPtr; typedef std::shared_ptr<PartHolder> PartHolderPtr;
class Animation : public osg::Referenced class Animation : public osg::Referenced
{ {
@ -146,13 +146,13 @@ protected:
class AnimationTime : public SceneUtil::ControllerSource class AnimationTime : public SceneUtil::ControllerSource
{ {
private: private:
boost::shared_ptr<float> mTimePtr; std::shared_ptr<float> mTimePtr;
public: public:
void setTimePtr(boost::shared_ptr<float> time) void setTimePtr(std::shared_ptr<float> time)
{ mTimePtr = time; } { mTimePtr = time; }
boost::shared_ptr<float> getTimePtr() const std::shared_ptr<float> getTimePtr() const
{ return mTimePtr; } { return mTimePtr; }
virtual float getValue(osg::NodeVisitor* nv); virtual float getValue(osg::NodeVisitor* nv);
@ -170,13 +170,13 @@ protected:
struct AnimSource; struct AnimSource;
struct AnimState { struct AnimState {
boost::shared_ptr<AnimSource> mSource; std::shared_ptr<AnimSource> mSource;
float mStartTime; float mStartTime;
float mLoopStartTime; float mLoopStartTime;
float mLoopStopTime; float mLoopStopTime;
float mStopTime; float mStopTime;
typedef boost::shared_ptr<float> TimePtr; typedef std::shared_ptr<float> TimePtr;
TimePtr mTime; TimePtr mTime;
float mSpeedMult; float mSpeedMult;
@ -212,7 +212,7 @@ protected:
typedef std::map<std::string,AnimState> AnimStateMap; typedef std::map<std::string,AnimState> AnimStateMap;
AnimStateMap mStates; AnimStateMap mStates;
typedef std::vector<boost::shared_ptr<AnimSource> > AnimSourceList; typedef std::vector<std::shared_ptr<AnimSource> > AnimSourceList;
AnimSourceList mAnimSources; AnimSourceList mAnimSources;
osg::ref_ptr<osg::Group> mInsert; osg::ref_ptr<osg::Group> mInsert;
@ -234,7 +234,7 @@ protected:
typedef std::multimap<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::NodeCallback> > ControllerMap; typedef std::multimap<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::NodeCallback> > ControllerMap;
ControllerMap mActiveControllers; ControllerMap mActiveControllers;
boost::shared_ptr<AnimationTime> mAnimationTimePtr[sNumBlendMasks]; std::shared_ptr<AnimationTime> mAnimationTimePtr[sNumBlendMasks];
// Stored in all lowercase for a case-insensitive lookup // Stored in all lowercase for a case-insensitive lookup
typedef std::map<std::string, osg::ref_ptr<osg::MatrixTransform> > NodeMap; typedef std::map<std::string, osg::ref_ptr<osg::MatrixTransform> > NodeMap;
@ -251,7 +251,7 @@ protected:
{ {
std::string mModelName; // Just here so we don't add the same effect twice std::string mModelName; // Just here so we don't add the same effect twice
PartHolderPtr mObjects; PartHolderPtr mObjects;
boost::shared_ptr<EffectAnimationTime> mAnimTime; std::shared_ptr<EffectAnimationTime> mAnimTime;
float mMaxControllerLength; float mMaxControllerLength;
int mEffectId; int mEffectId;
bool mLoop; bool mLoop;

4
apps/openmw/mwrender/creatureanimation.cpp
View file

@ -59,7 +59,7 @@ CreatureWeaponAnimation::CreatureWeaponAnimation(const MWWorld::Ptr &ptr, const
updateParts(); updateParts();
} }
mWeaponAnimationTime = boost::shared_ptr<WeaponAnimationTime>(new WeaponAnimationTime(this)); mWeaponAnimationTime = std::shared_ptr<WeaponAnimationTime>(new WeaponAnimationTime(this));
} }
void CreatureWeaponAnimation::showWeapons(bool showWeapon) void CreatureWeaponAnimation::showWeapons(bool showWeapon)
@ -143,7 +143,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
else else
mAmmunition.reset(); mAmmunition.reset();
boost::shared_ptr<SceneUtil::ControllerSource> source; std::shared_ptr<SceneUtil::ControllerSource> source;
if (slot == MWWorld::InventoryStore::Slot_CarriedRight) if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
source = mWeaponAnimationTime; source = mWeaponAnimationTime;

2
apps/openmw/mwrender/creatureanimation.hpp
View file

@ -61,7 +61,7 @@ namespace MWRender
bool mShowWeapons; bool mShowWeapons;
bool mShowCarriedLeft; bool mShowCarriedLeft;
boost::shared_ptr<WeaponAnimationTime> mWeaponAnimationTime; std::shared_ptr<WeaponAnimationTime> mWeaponAnimationTime;
}; };
} }

7
apps/openmw/mwrender/effectmanager.hpp
View file

@ -1,13 +1,12 @@
#ifndef OPENMW_MWRENDER_EFFECTMANAGER_H #ifndef OPENMW_MWRENDER_EFFECTMANAGER_H
#define OPENMW_MWRENDER_EFFECTMANAGER_H #define OPENMW_MWRENDER_EFFECTMANAGER_H
#include <string>
#include <map> #include <map>
#include <memory>
#include <string>
#include <osg/ref_ptr> #include <osg/ref_ptr>
#include <boost/shared_ptr.hpp>
namespace osg namespace osg
{ {
class Group; class Group;
@ -44,7 +43,7 @@ namespace MWRender
struct Effect struct Effect
{ {
float mMaxControllerLength; float mMaxControllerLength;
boost::shared_ptr<EffectAnimationTime> mAnimTime; std::shared_ptr<EffectAnimationTime> mAnimTime;
}; };
typedef std::map<osg::ref_ptr<osg::PositionAttitudeTransform>, Effect> EffectMap; typedef std::map<osg::ref_ptr<osg::PositionAttitudeTransform>, Effect> EffectMap;

6
apps/openmw/mwrender/npcanimation.cpp
View file

@ -286,8 +286,8 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> par
{ {
mNpc = mPtr.get<ESM::NPC>()->mBase; mNpc = mPtr.get<ESM::NPC>()->mBase;
mHeadAnimationTime = boost::shared_ptr<HeadAnimationTime>(new HeadAnimationTime(mPtr)); mHeadAnimationTime = std::shared_ptr<HeadAnimationTime>(new HeadAnimationTime(mPtr));
mWeaponAnimationTime = boost::shared_ptr<WeaponAnimationTime>(new WeaponAnimationTime(this)); mWeaponAnimationTime = std::shared_ptr<WeaponAnimationTime>(new WeaponAnimationTime(this));
for(size_t i = 0;i < ESM::PRT_Count;i++) for(size_t i = 0;i < ESM::PRT_Count;i++)
{ {
@ -778,7 +778,7 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
osg::Node* node = mObjectParts[type]->getNode(); osg::Node* node = mObjectParts[type]->getNode();
if (node->getNumChildrenRequiringUpdateTraversal() > 0) if (node->getNumChildrenRequiringUpdateTraversal() > 0)
{ {
boost::shared_ptr<SceneUtil::ControllerSource> src; std::shared_ptr<SceneUtil::ControllerSource> src;
if (type == ESM::PRT_Head) if (type == ESM::PRT_Head)
{ {
src = mHeadAnimationTime; src = mHeadAnimationTime;

4
apps/openmw/mwrender/npcanimation.hpp
View file

@ -64,8 +64,8 @@ private:
// Field of view to use when rendering first person meshes // Field of view to use when rendering first person meshes
float mFirstPersonFieldOfView; float mFirstPersonFieldOfView;
boost::shared_ptr<HeadAnimationTime> mHeadAnimationTime; std::shared_ptr<HeadAnimationTime> mHeadAnimationTime;
boost::shared_ptr<WeaponAnimationTime> mWeaponAnimationTime; std::shared_ptr<WeaponAnimationTime> mWeaponAnimationTime;
bool mSoundsDisabled; bool mSoundsDisabled;

2
apps/openmw/mwrender/ripplesimulation.cpp
View file

@ -47,7 +47,7 @@ namespace
} }
osg::ref_ptr<NifOsg::FlipController> controller (new NifOsg::FlipController(0, 0.3f/rippleFrameCount, textures)); osg::ref_ptr<NifOsg::FlipController> controller (new NifOsg::FlipController(0, 0.3f/rippleFrameCount, textures));
controller->setSource(boost::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource)); controller->setSource(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
node->addUpdateCallback(controller); node->addUpdateCallback(controller);
osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet); osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);

2
apps/openmw/mwrender/sky.cpp
View file

@ -1525,7 +1525,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
} }
mParticleEffect = mSceneManager->getInstance(mCurrentParticleEffect, mParticleNode); mParticleEffect = mSceneManager->getInstance(mCurrentParticleEffect, mParticleNode);
SceneUtil::AssignControllerSourcesVisitor assignVisitor(boost::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource)); SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
mParticleEffect->accept(assignVisitor); mParticleEffect->accept(assignVisitor);
AlphaFader::SetupVisitor alphaFaderSetupVisitor; AlphaFader::SetupVisitor alphaFaderSetupVisitor;

2
apps/openmw/mwrender/water.cpp
View file

@ -488,7 +488,7 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
float fps = mFallback->getFallbackFloat("Water_SurfaceFPS"); float fps = mFallback->getFallbackFloat("Water_SurfaceFPS");
osg::ref_ptr<NifOsg::FlipController> controller (new NifOsg::FlipController(0, 1.f/fps, textures)); osg::ref_ptr<NifOsg::FlipController> controller (new NifOsg::FlipController(0, 1.f/fps, textures));
controller->setSource(boost::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource)); controller->setSource(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
node->setUpdateCallback(controller); node->setUpdateCallback(controller);
stateset->setTextureAttributeAndModes(0, textures[0], osg::StateAttribute::ON); stateset->setTextureAttributeAndModes(0, textures[0], osg::StateAttribute::ON);

6
apps/openmw/mwsound/movieaudiofactory.cpp
View file

@ -92,7 +92,7 @@ namespace MWSound
} }
MWBase::SoundStreamPtr mAudioTrack; MWBase::SoundStreamPtr mAudioTrack;
boost::shared_ptr<MWSoundDecoderBridge> mDecoderBridge; std::shared_ptr<MWSoundDecoderBridge> mDecoderBridge;
}; };
@ -156,9 +156,9 @@ namespace MWSound
boost::shared_ptr<Video::MovieAudioDecoder> MovieAudioFactory::createDecoder(Video::VideoState* videoState) std::shared_ptr<Video::MovieAudioDecoder> MovieAudioFactory::createDecoder(Video::VideoState* videoState)
{ {
boost::shared_ptr<MWSound::MovieAudioDecoder> decoder(new MWSound::MovieAudioDecoder(videoState)); std::shared_ptr<MWSound::MovieAudioDecoder> decoder(new MWSound::MovieAudioDecoder(videoState));
decoder->setupFormat(); decoder->setupFormat();
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager(); MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();

2
apps/openmw/mwsound/movieaudiofactory.hpp
View file

@ -8,7 +8,7 @@ namespace MWSound
class MovieAudioFactory : public Video::MovieAudioFactory class MovieAudioFactory : public Video::MovieAudioFactory
{ {
virtual boost::shared_ptr<Video::MovieAudioDecoder> createDecoder(Video::VideoState* videoState); virtual std::shared_ptr<Video::MovieAudioDecoder> createDecoder(Video::VideoState* videoState);
}; };
} }

2
apps/openmw/mwworld/projectilemanager.hpp
View file

@ -73,7 +73,7 @@ namespace MWWorld
struct State struct State
{ {
osg::ref_ptr<osg::PositionAttitudeTransform> mNode; osg::ref_ptr<osg::PositionAttitudeTransform> mNode;
boost::shared_ptr<MWRender::EffectAnimationTime> mEffectAnimationTime; std::shared_ptr<MWRender::EffectAnimationTime> mEffectAnimationTime;
int mActorId; int mActorId;

2
components/files/constrainedfilestream.hpp
View file

@ -17,7 +17,7 @@ public:
virtual ~ConstrainedFileStream(); virtual ~ConstrainedFileStream();
}; };
typedef boost::shared_ptr<std::istream> IStreamPtr; typedef std::shared_ptr<std::istream> IStreamPtr;
IStreamPtr openConstrainedFileStream(const char *filename, size_t start=0, size_t length=0xFFFFFFFF); IStreamPtr openConstrainedFileStream(const char *filename, size_t start=0, size_t length=0xFFFFFFFF);

2
components/nif/niffile.hpp
View file

@ -92,7 +92,7 @@ public:
/// Get the name of the file /// Get the name of the file
std::string getFilename() const { return filename; } std::string getFilename() const { return filename; }
}; };
typedef boost::shared_ptr<const Nif::NIFFile> NIFFilePtr; typedef std::shared_ptr<const Nif::NIFFile> NIFFilePtr;

8
components/nif/nifkey.hpp
View file

@ -156,10 +156,10 @@ typedef KeyMapT<osg::Vec3f,&NIFStream::getVector3> Vector3KeyMap;
typedef KeyMapT<osg::Vec4f,&NIFStream::getVector4> Vector4KeyMap; typedef KeyMapT<osg::Vec4f,&NIFStream::getVector4> Vector4KeyMap;
typedef KeyMapT<osg::Quat,&NIFStream::getQuaternion> QuaternionKeyMap; typedef KeyMapT<osg::Quat,&NIFStream::getQuaternion> QuaternionKeyMap;
typedef boost::shared_ptr<FloatKeyMap> FloatKeyMapPtr; typedef std::shared_ptr<FloatKeyMap> FloatKeyMapPtr;
typedef boost::shared_ptr<Vector3KeyMap> Vector3KeyMapPtr; typedef std::shared_ptr<Vector3KeyMap> Vector3KeyMapPtr;
typedef boost::shared_ptr<Vector4KeyMap> Vector4KeyMapPtr; typedef std::shared_ptr<Vector4KeyMap> Vector4KeyMapPtr;
typedef boost::shared_ptr<QuaternionKeyMap> QuaternionKeyMapPtr; typedef std::shared_ptr<QuaternionKeyMap> QuaternionKeyMapPtr;
} // Namespace } // Namespace
#endif //#ifndef OPENMW_COMPONENTS_NIF_NIFKEY_HPP #endif //#ifndef OPENMW_COMPONENTS_NIF_NIFKEY_HPP

4
components/nifosg/controller.hpp
View file

@ -53,7 +53,7 @@ namespace NifOsg
{ {
} }
ValueInterpolator(boost::shared_ptr<const MapT> keys, ValueT defaultVal = ValueT()) ValueInterpolator(std::shared_ptr<const MapT> keys, ValueT defaultVal = ValueT())
: mKeys(keys) : mKeys(keys)
, mDefaultVal(defaultVal) , mDefaultVal(defaultVal)
{ {
@ -125,7 +125,7 @@ namespace NifOsg
mutable typename MapT::MapType::const_iterator mLastLowKey; mutable typename MapT::MapType::const_iterator mLastLowKey;
mutable typename MapT::MapType::const_iterator mLastHighKey; mutable typename MapT::MapType::const_iterator mLastHighKey;
boost::shared_ptr<const MapT> mKeys; std::shared_ptr<const MapT> mKeys;
ValueT mDefaultVal; ValueT mDefaultVal;
}; };

6
components/nifosg/nifloader.cpp
View file

@ -334,7 +334,7 @@ namespace NifOsg
continue; continue;
osg::ref_ptr<NifOsg::KeyframeController> callback(new NifOsg::KeyframeController(key->data.getPtr())); osg::ref_ptr<NifOsg::KeyframeController> callback(new NifOsg::KeyframeController(key->data.getPtr()));
callback->setFunction(boost::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key))); callback->setFunction(std::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
if (target.mKeyframeControllers.find(strdata->string) != target.mKeyframeControllers.end()) if (target.mKeyframeControllers.find(strdata->string) != target.mKeyframeControllers.end())
std::cerr << "Warning: controller " << strdata->string << " present more than once in " << nif->getFilename() << ", ignoring later version" << std::endl; std::cerr << "Warning: controller " << strdata->string << " present more than once in " << nif->getFilename() << ", ignoring later version" << std::endl;
@ -411,9 +411,9 @@ namespace NifOsg
{ {
bool autoPlay = animflags & Nif::NiNode::AnimFlag_AutoPlay; bool autoPlay = animflags & Nif::NiNode::AnimFlag_AutoPlay;
if (autoPlay) if (autoPlay)
toSetup->setSource(boost::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource)); toSetup->setSource(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
toSetup->setFunction(boost::shared_ptr<ControllerFunction>(new ControllerFunction(ctrl))); toSetup->setFunction(std::shared_ptr<ControllerFunction>(new ControllerFunction(ctrl)));
} }
osg::ref_ptr<osg::LOD> handleLodNode(const Nif::NiLODNode* niLodNode) osg::ref_ptr<osg::LOD> handleLodNode(const Nif::NiLODNode* niLodNode)

10
components/sceneutil/controller.cpp
View file

@ -28,22 +28,22 @@ namespace SceneUtil
return mSource->getValue(nv); return mSource->getValue(nv);
} }
void Controller::setSource(boost::shared_ptr<ControllerSource> source) void Controller::setSource(std::shared_ptr<ControllerSource> source)
{ {
mSource = source; mSource = source;
} }
void Controller::setFunction(boost::shared_ptr<ControllerFunction> function) void Controller::setFunction(std::shared_ptr<ControllerFunction> function)
{ {
mFunction = function; mFunction = function;
} }
boost::shared_ptr<ControllerSource> Controller::getSource() const std::shared_ptr<ControllerSource> Controller::getSource() const
{ {
return mSource; return mSource;
} }
boost::shared_ptr<ControllerFunction> Controller::getFunction() const std::shared_ptr<ControllerFunction> Controller::getFunction() const
{ {
return mFunction; return mFunction;
} }
@ -107,7 +107,7 @@ namespace SceneUtil
{ {
} }
AssignControllerSourcesVisitor::AssignControllerSourcesVisitor(boost::shared_ptr<ControllerSource> toAssign) AssignControllerSourcesVisitor::AssignControllerSourcesVisitor(std::shared_ptr<ControllerSource> toAssign)
: ControllerVisitor() : ControllerVisitor()
, mToAssign(toAssign) , mToAssign(toAssign)
{ {

19
components/sceneutil/controller.hpp
View file

@ -1,8 +1,7 @@
#ifndef OPENMW_COMPONENTS_SCENEUTIL_CONTROLLER_H #ifndef OPENMW_COMPONENTS_SCENEUTIL_CONTROLLER_H
#define OPENMW_COMPONENTS_SCENEUTIL_CONTROLLER_H #define OPENMW_COMPONENTS_SCENEUTIL_CONTROLLER_H
#include <boost/shared_ptr.hpp> #include <memory>
#include <osg/NodeVisitor> #include <osg/NodeVisitor>
namespace SceneUtil namespace SceneUtil
@ -43,17 +42,17 @@ namespace SceneUtil
float getInputValue(osg::NodeVisitor* nv); float getInputValue(osg::NodeVisitor* nv);
void setSource(boost::shared_ptr<ControllerSource> source); void setSource(std::shared_ptr<ControllerSource> source);
void setFunction(boost::shared_ptr<ControllerFunction> function); void setFunction(std::shared_ptr<ControllerFunction> function);
boost::shared_ptr<ControllerSource> getSource() const; std::shared_ptr<ControllerSource> getSource() const;
boost::shared_ptr<ControllerFunction> getFunction() const; std::shared_ptr<ControllerFunction> getFunction() const;
private: private:
boost::shared_ptr<ControllerSource> mSource; std::shared_ptr<ControllerSource> mSource;
// The source value gets passed through this function before it's passed on to the DestValue. // The source value gets passed through this function before it's passed on to the DestValue.
boost::shared_ptr<ControllerFunction> mFunction; std::shared_ptr<ControllerFunction> mFunction;
}; };
/// Pure virtual base class - visit() all controllers that are attached as UpdateCallbacks in a scene graph. /// Pure virtual base class - visit() all controllers that are attached as UpdateCallbacks in a scene graph.
@ -78,14 +77,14 @@ namespace SceneUtil
{ {
public: public:
AssignControllerSourcesVisitor(); AssignControllerSourcesVisitor();
AssignControllerSourcesVisitor(boost::shared_ptr<ControllerSource> toAssign); AssignControllerSourcesVisitor(std::shared_ptr<ControllerSource> toAssign);
/// Assign the wanted ControllerSource. May be overridden in derived classes. /// Assign the wanted ControllerSource. May be overridden in derived classes.
/// By default assigns the ControllerSource passed to the constructor of this class if no ControllerSource is assigned to that controller yet. /// By default assigns the ControllerSource passed to the constructor of this class if no ControllerSource is assigned to that controller yet.
virtual void visit(osg::Node& node, Controller& ctrl); virtual void visit(osg::Node& node, Controller& ctrl);
private: private:
boost::shared_ptr<ControllerSource> mToAssign; std::shared_ptr<ControllerSource> mToAssign;
}; };
/// Finds the maximum of all controller functions in the given scene graph /// Finds the maximum of all controller functions in the given scene graph

3
extern/osg-ffmpeg-videoplayer/audiofactory.hpp vendored
View file

@ -3,7 +3,6 @@
#include "audiodecoder.hpp" #include "audiodecoder.hpp"
#include <boost/shared_ptr.hpp>
namespace Video namespace Video
{ {
@ -11,7 +10,7 @@ namespace Video
class MovieAudioFactory class MovieAudioFactory
{ {
public: public:
virtual boost::shared_ptr<MovieAudioDecoder> createDecoder(VideoState* videoState) = 0; virtual std::shared_ptr<MovieAudioDecoder> createDecoder(VideoState* videoState) = 0;
virtual ~MovieAudioFactory() {} virtual ~MovieAudioFactory() {}
}; };

2
extern/osg-ffmpeg-videoplayer/videoplayer.cpp vendored
View file

@ -27,7 +27,7 @@ void VideoPlayer::setAudioFactory(MovieAudioFactory *factory)
mAudioFactory.reset(factory); mAudioFactory.reset(factory);
} }
void VideoPlayer::playVideo(boost::shared_ptr<std::istream> inputstream, const std::string& name) void VideoPlayer::playVideo(std::shared_ptr<std::istream> inputstream, const std::string& name)
{ {
if(mState) if(mState)
close(); close();

2
extern/osg-ffmpeg-videoplayer/videoplayer.hpp vendored
View file

@ -44,7 +44,7 @@ namespace Video
/// Play the given video. If a video is already playing, the old video is closed first. /// Play the given video. If a video is already playing, the old video is closed first.
/// @note The video will be unpaused by default. Use the pause() and play() methods to control pausing. /// @note The video will be unpaused by default. Use the pause() and play() methods to control pausing.
/// @param name A name for the video stream - only used for logging purposes. /// @param name A name for the video stream - only used for logging purposes.
void playVideo (boost::shared_ptr<std::istream> inputstream, const std::string& name); void playVideo (std::shared_ptr<std::istream> inputstream, const std::string& name);
/// Get the current playback time position in the video, in seconds /// Get the current playback time position in the video, in seconds
double getCurrentTime(); double getCurrentTime();

2
extern/osg-ffmpeg-videoplayer/videostate.cpp vendored
View file

@ -626,7 +626,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
return 0; return 0;
} }
void VideoState::init(boost::shared_ptr<std::istream> inputstream, const std::string &name) void VideoState::init(std::shared_ptr<std::istream> inputstream, const std::string &name)
{ {
int video_index = -1; int video_index = -1;
int audio_index = -1; int audio_index = -1;

6
extern/osg-ffmpeg-videoplayer/videostate.hpp vendored
View file

@ -94,7 +94,7 @@ struct VideoState {
void setAudioFactory(MovieAudioFactory* factory); void setAudioFactory(MovieAudioFactory* factory);
void init(boost::shared_ptr<std::istream> inputstream, const std::string& name); void init(std::shared_ptr<std::istream> inputstream, const std::string& name);
void deinit(); void deinit();
void setPaused(bool isPaused); void setPaused(bool isPaused);
@ -127,11 +127,11 @@ struct VideoState {
osg::ref_ptr<osg::Texture2D> mTexture; osg::ref_ptr<osg::Texture2D> mTexture;
MovieAudioFactory* mAudioFactory; MovieAudioFactory* mAudioFactory;
boost::shared_ptr<MovieAudioDecoder> mAudioDecoder; std::shared_ptr<MovieAudioDecoder> mAudioDecoder;
ExternalClock mExternalClock; ExternalClock mExternalClock;
boost::shared_ptr<std::istream> stream; std::shared_ptr<std::istream> stream;
AVFormatContext* format_ctx; AVFormatContext* format_ctx;
int av_sync_type; int av_sync_type;