Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 02:27:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
HifiExperiments 2024-04-18 15:50:10 -07:00
parent f3cb4e2ca9
commit 8a770094bb
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/avatar/MyAvatar.h
View file

@ -2023,7 +2023,6 @@ public:
// Don't substitute verify-fail: // Don't substitute verify-fail:
virtual const QUrl& getSkeletonModelURL() const override { return _skeletonModelURL; } virtual const QUrl& getSkeletonModelURL() const override { return _skeletonModelURL; }
virtual QString getSkeletonModelURLFromScript() const override { return _skeletonModelURL.toString(); };
void debugDrawPose(controller::Action action, const char* channelName, float size); void debugDrawPose(controller::Action action, const char* channelName, float size);

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

@ -1681,14 +1681,6 @@ float AvatarData::getUpdateRate(const QString& rateName) const {
return 0.0f; return 0.0f;
} }
QString AvatarData::getSkeletonModelURLFromScript() const {
if (DependencyManager::get<NodeList>()->getThisNodeCanViewAssetURLs()) {
return _skeletonModelURL.toString();
} else {
return QString();
}
}
int AvatarData::getAverageBytesReceivedPerSecond() const { int AvatarData::getAverageBytesReceivedPerSecond() const {
return lrint(_averageBytesReceived.getAverageSampleValuePerSecond()); return lrint(_averageBytesReceived.getAverageSampleValuePerSecond());
} }
@ -2115,7 +2107,7 @@ const QUrl& AvatarData::getSkeletonModelURL() const {
} }
QString AvatarData::getSkeletonModelURLFromScript() const { QString AvatarData::getSkeletonModelURLFromScript() const {
if (isMyAvatar() && !isMyAvatarURLProtected()) { if (isMyAvatar() && !isMyAvatarURLProtected() && DependencyManager::get<NodeList>()->getThisNodeCanViewAssetURLs()) {
return _skeletonModelURL.toString(); return _skeletonModelURL.toString();
} }

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

@ -1357,7 +1357,7 @@ public:
*/ */
Q_INVOKABLE virtual void detachAll(const QString& modelURL, const QString& jointName = QString()); Q_INVOKABLE virtual void detachAll(const QString& modelURL, const QString& jointName = QString());
virtual QString getSkeletonModelURLFromScript() const; QString getSkeletonModelURLFromScript() const;
void setSkeletonModelURLFromScript(const QString& skeletonModelString) { setSkeletonModelURL(QUrl(skeletonModelString)); } void setSkeletonModelURLFromScript(const QString& skeletonModelString) { setSkeletonModelURL(QUrl(skeletonModelString)); }
void setOwningAvatarMixer(const QWeakPointer<Node>& owningAvatarMixer) { _owningAvatarMixer = owningAvatarMixer; } void setOwningAvatarMixer(const QWeakPointer<Node>& owningAvatarMixer) { _owningAvatarMixer = owningAvatarMixer; }