mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Clean up Roll- and FlipController implementation

Browse Source
This commit is contained in:
Alexei Dobrohotov 2020-10-06 20:47:06 +03:00
parent 0d02a3392a
commit 302d8eed27
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/nifosg/controller.cpp
View File

@ -310,11 +310,6 @@ void VisController::operator() (osg::Node* node, osg::NodeVisitor* nv)
RollController::RollController(const Nif::NiFloatData *data) RollController::RollController(const Nif::NiFloatData *data)
: mData(data->mKeyList, 1.f) : mData(data->mKeyList, 1.f)
, mStartingTime(0)
{
}
RollController::RollController() : mStartingTime(0)
{ {
} }
@ -322,7 +317,7 @@ RollController::RollController(const RollController &copy, const osg::CopyOp &co
: osg::NodeCallback(copy, copyop) : osg::NodeCallback(copy, copyop)
, Controller(copy) , Controller(copy)
, mData(copy.mData) , mData(copy.mData)
, mStartingTime(0) , mStartingTime(copy.mStartingTime)
{ {
} }
@ -462,12 +457,6 @@ FlipController::FlipController(int texSlot, float delta, const std::vector<osg::
{ {
} }
FlipController::FlipController()
: mTexSlot(0)
, mDelta(0.f)
{
}
FlipController::FlipController(const FlipController &copy, const osg::CopyOp &copyop) FlipController::FlipController(const FlipController &copy, const osg::CopyOp &copyop)
: StateSetUpdater(copy, copyop) : StateSetUpdater(copy, copyop)
, Controller(copy) , Controller(copy)

10
components/nifosg/controller.hpp
View File

@ -268,11 +268,11 @@ namespace NifOsg
{ {
private: private:
FloatInterpolator mData; FloatInterpolator mData;
double mStartingTime; double mStartingTime{0};
public: public:
RollController(const Nif::NiFloatData *data); RollController(const Nif::NiFloatData *data);
RollController(); RollController() = default;
RollController(const RollController& copy, const osg::CopyOp& copyop); RollController(const RollController& copy, const osg::CopyOp& copyop);
virtual void operator() (osg::Node* node, osg::NodeVisitor* nv); virtual void operator() (osg::Node* node, osg::NodeVisitor* nv);
@ -326,14 +326,14 @@ namespace NifOsg
class FlipController : public SceneUtil::StateSetUpdater, public SceneUtil::Controller class FlipController : public SceneUtil::StateSetUpdater, public SceneUtil::Controller
{ {
private: private:
int mTexSlot; int mTexSlot{0};
float mDelta; float mDelta{0.f};
std::vector<osg::ref_ptr<osg::Texture2D> > mTextures; std::vector<osg::ref_ptr<osg::Texture2D> > mTextures;
public: public:
FlipController(const Nif::NiFlipController* ctrl, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures); FlipController(const Nif::NiFlipController* ctrl, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures);
FlipController(int texSlot, float delta, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures); FlipController(int texSlot, float delta, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures);
FlipController(); FlipController() = default;
FlipController(const FlipController& copy, const osg::CopyOp& copyop); FlipController(const FlipController& copy, const osg::CopyOp& copyop);
META_Object(NifOsg, FlipController) META_Object(NifOsg, FlipController)