mirror of
https://github.com/overte-org/overte.git
synced 2025-04-13 11:22:10 +02:00
Fix "may be used uninitialized" warning for blendtime
This commit is contained in:
parent
7e4d50d732
commit
b5c5c9ad3e
1 changed files with 2 additions and 2 deletions
|
@ -123,7 +123,7 @@ public:
|
||||||
void overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame);
|
void overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame);
|
||||||
bool isPlayingOverrideAnimation() const { return _userAnimState.clipNodeEnum != UserAnimState::None; };
|
bool isPlayingOverrideAnimation() const { return _userAnimState.clipNodeEnum != UserAnimState::None; };
|
||||||
void restoreAnimation();
|
void restoreAnimation();
|
||||||
|
|
||||||
void overrideHandAnimation(bool isLeft, const QString& url, float fps, bool loop, float firstFrame, float lastFrame);
|
void overrideHandAnimation(bool isLeft, const QString& url, float fps, bool loop, float firstFrame, float lastFrame);
|
||||||
void restoreHandAnimation(bool isLeft);
|
void restoreHandAnimation(bool isLeft);
|
||||||
|
|
||||||
|
@ -371,7 +371,7 @@ protected:
|
||||||
};
|
};
|
||||||
NetworkAnimState() : clipNodeEnum(NetworkAnimState::None), fps(30.0f), loop(false), firstFrame(0.0f), lastFrame(0.0f), blendTime(FLT_MAX) {}
|
NetworkAnimState() : clipNodeEnum(NetworkAnimState::None), fps(30.0f), loop(false), firstFrame(0.0f), lastFrame(0.0f), blendTime(FLT_MAX) {}
|
||||||
NetworkAnimState(ClipNodeEnum clipNodeEnumIn, const QString& urlIn, float fpsIn, bool loopIn, float firstFrameIn, float lastFrameIn) :
|
NetworkAnimState(ClipNodeEnum clipNodeEnumIn, const QString& urlIn, float fpsIn, bool loopIn, float firstFrameIn, float lastFrameIn) :
|
||||||
clipNodeEnum(clipNodeEnumIn), url(urlIn), fps(fpsIn), loop(loopIn), firstFrame(firstFrameIn), lastFrame(lastFrameIn) {}
|
clipNodeEnum(clipNodeEnumIn), url(urlIn), fps(fpsIn), loop(loopIn), firstFrame(firstFrameIn), lastFrame(lastFrameIn), blendTime(FLT_MAX) {}
|
||||||
|
|
||||||
ClipNodeEnum clipNodeEnum;
|
ClipNodeEnum clipNodeEnum;
|
||||||
QString url;
|
QString url;
|
||||||
|
|
Loading…
Reference in a new issue