diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index 143c99b4c3..4b3df8936f 100644 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -866,32 +866,3 @@ QVariantMap AvatarManager::getPalData(const QList specificAvatarIdentif doc.insert("data", palData); return doc.toVariantMap(); } - -QVariantMap AvatarManager::getAvatarTransitData() { - QVariantMap result; - result["frameCount"] = _transitConfig._totalFrames; - result["framesPerMeter"] = _transitConfig._framesPerMeter; - result["isDistanceBased"] = _transitConfig._isDistanceBased; - result["triggerDistance"] = _transitConfig._triggerDistance; - result["easeType"] = (int)_transitConfig._easeType; - - return result; -} - -void AvatarManager::setAvatarTransitData(const QVariantMap& data) { - if (data.contains("frameCount")) { - _transitConfig._totalFrames = data["frameCount"].toInt(); - } - if (data.contains("framesPerMeter")) { - _transitConfig._framesPerMeter = data["framesPerMeter"].toInt(); - } - if (data.contains("isDistanceBased")) { - _transitConfig._isDistanceBased = data["isDistanceBased"].toBool(); - } - if (data.contains("triggerDistance")) { - _transitConfig._triggerDistance = data["triggerDistance"].toDouble(); - } - if (data.contains("easeType")) { - _transitConfig._easeType = (AvatarTransit::EaseType)data["easeType"].toInt(); - } -} diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h index 0cc26bb8ae..d3dc20e9a4 100644 --- a/interface/src/avatar/AvatarManager.h +++ b/interface/src/avatar/AvatarManager.h @@ -181,9 +181,6 @@ public: */ Q_INVOKABLE QVariantMap getPalData(const QList specificAvatarIdentifiers = QList()); - Q_INVOKABLE QVariantMap getAvatarTransitData(); - Q_INVOKABLE void setAvatarTransitData(const QVariantMap& data); - float getMyAvatarSendRate() const { return _myAvatarSendRate.rate(); } int getIdentityRequestsSent() const { return _identityRequestsSent; } @@ -211,7 +208,6 @@ private: void handleRemovedAvatar(const AvatarSharedPointer& removedAvatar, KillAvatarReason removalReason = KillAvatarReason::NoReason) override; QVector _avatarsToFade; - QVector _avatarsToCopy; using SetOfOtherAvatars = std::set; SetOfOtherAvatars _avatarsToChangeInPhysics; @@ -233,7 +229,6 @@ private: workload::SpacePointer _space; std::vector _spaceProxiesToDelete; - // Other avatars smooth transit global configuration AvatarTransit::TransitConfig _transitConfig; }; diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 93bed8c8c1..58dd595c16 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -616,16 +616,6 @@ void MyAvatar::updateChildCauterization(SpatiallyNestablePointer object, bool ca void MyAvatar::simulate(float deltaTime) { PerformanceTimer perfTimer("simulate"); animateScaleChanges(deltaTime); - if (_transit.isTransiting() && _showTransit) { - glm::vec3 nextPosition; - if (_transit.getNextPosition(nextPosition)) { - _globalPosition = nextPosition; - _globalPositionChanged = usecTimestampNow(); - if (!hasParent()) { - setLocalPosition(nextPosition); - } - } - } setFlyingEnabled(getFlyingEnabled()); @@ -1223,7 +1213,6 @@ void MyAvatar::saveData() { settings.setValue("displayName", _displayName); settings.setValue("collisionSoundURL", _collisionSoundURL); settings.setValue("useSnapTurn", _useSnapTurn); - settings.setValue("showTransit", _showTransit); settings.setValue("userHeight", getUserHeight()); settings.setValue("flyingHMD", getFlyingHMDPref()); @@ -1382,7 +1371,6 @@ void MyAvatar::loadData() { setDisplayName(settings.value("displayName").toString()); setCollisionSoundURL(settings.value("collisionSoundURL", DEFAULT_AVATAR_COLLISION_SOUND_URL).toString()); setSnapTurn(settings.value("useSnapTurn", _useSnapTurn).toBool()); - setShowTransit(settings.value("showTransit", _showTransit).toBool()); setDominantHand(settings.value("dominantHand", _dominantHand).toString().toLower()); setUserHeight(settings.value("userHeight", DEFAULT_AVATAR_HEIGHT).toDouble()); settings.endGroup(); diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index c77f1e781d..5de79034d2 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -1115,8 +1115,6 @@ public: virtual void setAttachmentsVariant(const QVariantList& variant) override; glm::vec3 getNextPosition() { return _goToPending ? _goToPosition : getWorldPosition(); }; - bool getShowTransit() { return _showTransit; }; - void setShowTransit(bool value) { _showTransit = value; }; public slots: @@ -1798,7 +1796,6 @@ private: void updateChildCauterization(SpatiallyNestablePointer object, bool cauterize); - bool _showTransit { false }; // max unscaled forward movement speed ThreadSafeValueCache _walkSpeed { DEFAULT_AVATAR_MAX_WALKING_SPEED }; ThreadSafeValueCache _walkBackwardSpeed { DEFAULT_AVATAR_MAX_WALKING_BACKWARD_SPEED }; diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index d3e28f0041..951925214c 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -248,15 +248,6 @@ void setupPreferences() { preference->setItems(items); preferences->addPreference(preference); } - { - auto getter = [myAvatar]()->int { return myAvatar->getShowTransit() ? 1 : 0; }; - auto setter = [myAvatar](int value) { myAvatar->setShowTransit(value == 1); }; - auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Snap teleport / Smooth teleport", getter, setter); - QStringList items; - items << "Snap teleport" << "Smooth teleport"; - preference->setItems(items); - preferences->addPreference(preference); - } { auto getter = [=]()->float { return myAvatar->getUserHeight(); }; auto setter = [=](float value) { myAvatar->setUserHeight(value); };