mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 06:57:37 +02:00
Remove smooth teleport and set/get API methods
This commit is contained in:
parent
1e34d3aa35
commit
bbe836ee88
5 changed files with 0 additions and 58 deletions
|
@ -866,32 +866,3 @@ QVariantMap AvatarManager::getPalData(const QList<QString> specificAvatarIdentif
|
||||||
doc.insert("data", palData);
|
doc.insert("data", palData);
|
||||||
return doc.toVariantMap();
|
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -181,9 +181,6 @@ public:
|
||||||
*/
|
*/
|
||||||
Q_INVOKABLE QVariantMap getPalData(const QList<QString> specificAvatarIdentifiers = QList<QString>());
|
Q_INVOKABLE QVariantMap getPalData(const QList<QString> specificAvatarIdentifiers = QList<QString>());
|
||||||
|
|
||||||
Q_INVOKABLE QVariantMap getAvatarTransitData();
|
|
||||||
Q_INVOKABLE void setAvatarTransitData(const QVariantMap& data);
|
|
||||||
|
|
||||||
float getMyAvatarSendRate() const { return _myAvatarSendRate.rate(); }
|
float getMyAvatarSendRate() const { return _myAvatarSendRate.rate(); }
|
||||||
int getIdentityRequestsSent() const { return _identityRequestsSent; }
|
int getIdentityRequestsSent() const { return _identityRequestsSent; }
|
||||||
|
|
||||||
|
@ -211,7 +208,6 @@ private:
|
||||||
void handleRemovedAvatar(const AvatarSharedPointer& removedAvatar, KillAvatarReason removalReason = KillAvatarReason::NoReason) override;
|
void handleRemovedAvatar(const AvatarSharedPointer& removedAvatar, KillAvatarReason removalReason = KillAvatarReason::NoReason) override;
|
||||||
|
|
||||||
QVector<AvatarSharedPointer> _avatarsToFade;
|
QVector<AvatarSharedPointer> _avatarsToFade;
|
||||||
QVector<AvatarSharedPointer> _avatarsToCopy;
|
|
||||||
|
|
||||||
using SetOfOtherAvatars = std::set<OtherAvatarPointer>;
|
using SetOfOtherAvatars = std::set<OtherAvatarPointer>;
|
||||||
SetOfOtherAvatars _avatarsToChangeInPhysics;
|
SetOfOtherAvatars _avatarsToChangeInPhysics;
|
||||||
|
@ -233,7 +229,6 @@ private:
|
||||||
workload::SpacePointer _space;
|
workload::SpacePointer _space;
|
||||||
std::vector<int32_t> _spaceProxiesToDelete;
|
std::vector<int32_t> _spaceProxiesToDelete;
|
||||||
|
|
||||||
// Other avatars smooth transit global configuration
|
|
||||||
AvatarTransit::TransitConfig _transitConfig;
|
AvatarTransit::TransitConfig _transitConfig;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -616,16 +616,6 @@ void MyAvatar::updateChildCauterization(SpatiallyNestablePointer object, bool ca
|
||||||
void MyAvatar::simulate(float deltaTime) {
|
void MyAvatar::simulate(float deltaTime) {
|
||||||
PerformanceTimer perfTimer("simulate");
|
PerformanceTimer perfTimer("simulate");
|
||||||
animateScaleChanges(deltaTime);
|
animateScaleChanges(deltaTime);
|
||||||
if (_transit.isTransiting() && _showTransit) {
|
|
||||||
glm::vec3 nextPosition;
|
|
||||||
if (_transit.getNextPosition(nextPosition)) {
|
|
||||||
_globalPosition = nextPosition;
|
|
||||||
_globalPositionChanged = usecTimestampNow();
|
|
||||||
if (!hasParent()) {
|
|
||||||
setLocalPosition(nextPosition);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
setFlyingEnabled(getFlyingEnabled());
|
setFlyingEnabled(getFlyingEnabled());
|
||||||
|
|
||||||
|
@ -1223,7 +1213,6 @@ void MyAvatar::saveData() {
|
||||||
settings.setValue("displayName", _displayName);
|
settings.setValue("displayName", _displayName);
|
||||||
settings.setValue("collisionSoundURL", _collisionSoundURL);
|
settings.setValue("collisionSoundURL", _collisionSoundURL);
|
||||||
settings.setValue("useSnapTurn", _useSnapTurn);
|
settings.setValue("useSnapTurn", _useSnapTurn);
|
||||||
settings.setValue("showTransit", _showTransit);
|
|
||||||
settings.setValue("userHeight", getUserHeight());
|
settings.setValue("userHeight", getUserHeight());
|
||||||
settings.setValue("flyingHMD", getFlyingHMDPref());
|
settings.setValue("flyingHMD", getFlyingHMDPref());
|
||||||
|
|
||||||
|
@ -1382,7 +1371,6 @@ void MyAvatar::loadData() {
|
||||||
setDisplayName(settings.value("displayName").toString());
|
setDisplayName(settings.value("displayName").toString());
|
||||||
setCollisionSoundURL(settings.value("collisionSoundURL", DEFAULT_AVATAR_COLLISION_SOUND_URL).toString());
|
setCollisionSoundURL(settings.value("collisionSoundURL", DEFAULT_AVATAR_COLLISION_SOUND_URL).toString());
|
||||||
setSnapTurn(settings.value("useSnapTurn", _useSnapTurn).toBool());
|
setSnapTurn(settings.value("useSnapTurn", _useSnapTurn).toBool());
|
||||||
setShowTransit(settings.value("showTransit", _showTransit).toBool());
|
|
||||||
setDominantHand(settings.value("dominantHand", _dominantHand).toString().toLower());
|
setDominantHand(settings.value("dominantHand", _dominantHand).toString().toLower());
|
||||||
setUserHeight(settings.value("userHeight", DEFAULT_AVATAR_HEIGHT).toDouble());
|
setUserHeight(settings.value("userHeight", DEFAULT_AVATAR_HEIGHT).toDouble());
|
||||||
settings.endGroup();
|
settings.endGroup();
|
||||||
|
|
|
@ -1115,8 +1115,6 @@ public:
|
||||||
virtual void setAttachmentsVariant(const QVariantList& variant) override;
|
virtual void setAttachmentsVariant(const QVariantList& variant) override;
|
||||||
|
|
||||||
glm::vec3 getNextPosition() { return _goToPending ? _goToPosition : getWorldPosition(); };
|
glm::vec3 getNextPosition() { return _goToPending ? _goToPosition : getWorldPosition(); };
|
||||||
bool getShowTransit() { return _showTransit; };
|
|
||||||
void setShowTransit(bool value) { _showTransit = value; };
|
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
|
||||||
|
@ -1798,7 +1796,6 @@ private:
|
||||||
|
|
||||||
void updateChildCauterization(SpatiallyNestablePointer object, bool cauterize);
|
void updateChildCauterization(SpatiallyNestablePointer object, bool cauterize);
|
||||||
|
|
||||||
bool _showTransit { false };
|
|
||||||
// max unscaled forward movement speed
|
// max unscaled forward movement speed
|
||||||
ThreadSafeValueCache<float> _walkSpeed { DEFAULT_AVATAR_MAX_WALKING_SPEED };
|
ThreadSafeValueCache<float> _walkSpeed { DEFAULT_AVATAR_MAX_WALKING_SPEED };
|
||||||
ThreadSafeValueCache<float> _walkBackwardSpeed { DEFAULT_AVATAR_MAX_WALKING_BACKWARD_SPEED };
|
ThreadSafeValueCache<float> _walkBackwardSpeed { DEFAULT_AVATAR_MAX_WALKING_BACKWARD_SPEED };
|
||||||
|
|
|
@ -248,15 +248,6 @@ void setupPreferences() {
|
||||||
preference->setItems(items);
|
preference->setItems(items);
|
||||||
preferences->addPreference(preference);
|
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 getter = [=]()->float { return myAvatar->getUserHeight(); };
|
||||||
auto setter = [=](float value) { myAvatar->setUserHeight(value); };
|
auto setter = [=](float value) { myAvatar->setUserHeight(value); };
|
||||||
|
|
Loading…
Reference in a new issue