Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 07:17:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

formatting

Browse source
This commit is contained in:
luiscuenca 2017-11-01 19:45:56 -07:00
parent 6a2dc38fdd
commit e201e82ec2
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/animation/src/AnimClip.h
View file

@ -54,7 +54,6 @@ public:
void setMirrorFlag(bool mirrorFlag) { _mirrorFlag = mirrorFlag; } void setMirrorFlag(bool mirrorFlag) { _mirrorFlag = mirrorFlag; }
void loadURL(const QString& url); void loadURL(const QString& url);
const QString& getURL() { return _url; }
protected: protected:
virtual void setCurrentFrameInternal(float frame) override; virtual void setCurrentFrameInternal(float frame) override;

2
libraries/animation/src/Rig.cpp
View file

@ -1646,7 +1646,7 @@ void Rig::initAnimGraph(const QUrl& url) {
overrideRoleAnimation(roleState.role, roleState.url, roleState.fps, roleState.loop, roleState.firstFrame, roleState.lastFrame); overrideRoleAnimation(roleState.role, roleState.url, roleState.fps, roleState.loop, roleState.firstFrame, roleState.lastFrame);
} }
_animLoading = false; _animLoading = false;
emit onLoadComplete(); emit onLoadComplete();
}); });
connect(_animLoader.get(), &AnimNodeLoader::error, [url](int error, QString str) { connect(_animLoader.get(), &AnimNodeLoader::error, [url](int error, QString str) {

1
libraries/avatars-renderer/src/avatars-renderer/Avatar.h
View file

@ -274,7 +274,6 @@ public slots:
glm::vec3 getRightPalmPosition() const; glm::vec3 getRightPalmPosition() const;
glm::quat getRightPalmRotation() const; glm::quat getRightPalmRotation() const;
//void restoreAnimations();
void setModelURLFinished(bool success); void setModelURLFinished(bool success);
protected: protected: