Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-28 07:19:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remerge master / remove debug block

Browse source
This commit is contained in:
humbletim 2017-06-20 01:51:33 -04:00
parent d3127ba975
commit fbeaa01f7d
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/avatars/src/AvatarData.cpp
View file

@ -1552,9 +1552,6 @@ void AvatarData::processAvatarIdentity(const Identity& identity, bool& identityC
} }
if (_lookAtSnappingEnabled != identity.lookAtSnappingEnabled) { if (_lookAtSnappingEnabled != identity.lookAtSnappingEnabled) {
#ifdef DEBUG_LOOKAT_SNAPPING
qCDebug(avatars) << __FUNCTION__ << identity.sessionDisplayName << "_lookAtSnappingEnabled" << _lookAtSnappingEnabled << "->" << identity.lookAtSnappingEnabled;
#endif
setProperty("lookAtSnappingEnabled", identity.lookAtSnappingEnabled); setProperty("lookAtSnappingEnabled", identity.lookAtSnappingEnabled);
identityChanged = true; identityChanged = true;
} }

3
libraries/avatars/src/AvatarData.h
View file

@ -370,6 +370,7 @@ public:
virtual ~AvatarData(); virtual ~AvatarData();
static const QUrl& defaultFullAvatarModelUrl(); static const QUrl& defaultFullAvatarModelUrl();
QUrl cannonicalSkeletonModelURL(const QUrl& empty) const;
virtual bool isMyAvatar() const { return false; } virtual bool isMyAvatar() const { return false; }
@ -548,7 +549,6 @@ public:
const QString& getDisplayName() const { return _displayName; } const QString& getDisplayName() const { return _displayName; }
const QString& getSessionDisplayName() const { return _sessionDisplayName; } const QString& getSessionDisplayName() const { return _sessionDisplayName; }
bool getLookAtSnappingEnabled() const { return _lookAtSnappingEnabled; } bool getLookAtSnappingEnabled() const { return _lookAtSnappingEnabled; }
virtual void setSkeletonModelURL(const QUrl& skeletonModelURL); virtual void setSkeletonModelURL(const QUrl& skeletonModelURL);
virtual void setDisplayName(const QString& displayName); virtual void setDisplayName(const QString& displayName);
@ -703,7 +703,6 @@ protected:
QString _displayName; QString _displayName;
QString _sessionDisplayName { }; QString _sessionDisplayName { };
bool _lookAtSnappingEnabled { true }; bool _lookAtSnappingEnabled { true };
QUrl cannonicalSkeletonModelURL(const QUrl& empty) const;
QHash<QString, int> _jointIndices; ///< 1-based, since zero is returned for missing keys QHash<QString, int> _jointIndices; ///< 1-based, since zero is returned for missing keys
QStringList _jointNames; ///< in order of depth-first traversal QStringList _jointNames; ///< in order of depth-first traversal