mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-20 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_anim_state' into 'master'

Browse Source 
Fix AnimState initialization

See merge request OpenMW/openmw!4061
This commit is contained in:
psi29a 2024-04-28 13:14:44 +00:00
commit 1e1fd28136
1 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
apps/openmw/mwrender/animation.hpp
View File

@ -142,45 +142,28 @@ namespace MWRender
struct AnimState
{
std::shared_ptr<AnimSource> mSource;
float mStartTime;
float mLoopStartTime;
float mLoopStopTime;
float mStopTime;
float mStartTime = 0;
float mLoopStartTime = 0;
float mLoopStopTime = 0;
float mStopTime = 0;
typedef std::shared_ptr<float> TimePtr;
TimePtr mTime;
float mSpeedMult;
std::shared_ptr<float> mTime = std::make_shared<float>(0);
float mSpeedMult = 1;
bool mPlaying;
bool mLoopingEnabled;
uint32_t mLoopCount;
bool mPlaying = false;
bool mLoopingEnabled = true;
uint32_t mLoopCount = 0;
AnimPriority mPriority;
int mBlendMask;
bool mAutoDisable;
AnimState()
: mStartTime(0.0f)
, mLoopStartTime(0.0f)
, mLoopStopTime(0.0f)
, mStopTime(0.0f)
, mTime(new float)
, mSpeedMult(1.0f)
, mPlaying(false)
, mLoopingEnabled(true)
, mLoopCount(0)
, mPriority(0)
, mBlendMask(0)
, mAutoDisable(true)
{
}
~AnimState() = default;
AnimPriority mPriority{ 0 };
int mBlendMask = 0;
bool mAutoDisable = true;
float getTime() const { return *mTime; }
void setTime(float time) { *mTime = time; }
bool shouldLoop() const { return getTime() >= mLoopStopTime && mLoopingEnabled && mLoopCount > 0; }
};
typedef std::map<std::string, AnimState, std::less<>> AnimStateMap;
AnimStateMap mStates;