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

fix safe landing to load proper set of objects

Browse source
This commit is contained in:
Andrew Meadows 2019-07-01 14:18:19 -07:00
parent b8485361ce
commit 0d8fdf51c5
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

@ -1376,6 +1376,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(myAvatar.get(), &MyAvatar::positionGoneTo, connect(myAvatar.get(), &MyAvatar::positionGoneTo,
DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress); DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress);
connect(myAvatar.get(), &MyAvatar::positionGoneTo, this, [this] {
if (!_physicsEnabled) {
// when we arrive somewhere without physics enabled --> startSafeLanding
_octreeProcessor.startSafeLanding();
}
}, Qt::QueuedConnection);
connect(myAvatar.get(), &MyAvatar::skeletonModelURLChanged, [](){ connect(myAvatar.get(), &MyAvatar::skeletonModelURLChanged, [](){
QUrl avatarURL = qApp->getMyAvatar()->getSkeletonModelURL(); QUrl avatarURL = qApp->getMyAvatar()->getSkeletonModelURL();
setCrashAnnotation("avatar", avatarURL.toString().toStdString()); setCrashAnnotation("avatar", avatarURL.toString().toStdString());
@ -5931,10 +5938,8 @@ void Application::resetPhysicsReadyInformation() {
_gpuTextureMemSizeStabilityCount = 0; _gpuTextureMemSizeStabilityCount = 0;
_gpuTextureMemSizeAtLastCheck = 0; _gpuTextureMemSizeAtLastCheck = 0;
_physicsEnabled = false; _physicsEnabled = false;
_octreeProcessor.startSafeLanding();
} }
void Application::reloadResourceCaches() { void Application::reloadResourceCaches() {
resetPhysicsReadyInformation(); resetPhysicsReadyInformation();
@ -6932,6 +6937,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType) {
bool interstitialModeEnabled = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled(); bool interstitialModeEnabled = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
ConicalViewFrustum sphericalView; ConicalViewFrustum sphericalView;
sphericalView.set(_viewFrustum);
sphericalView.setSimpleRadius(INITIAL_QUERY_RADIUS); sphericalView.setSimpleRadius(INITIAL_QUERY_RADIUS);
if (interstitialModeEnabled) { if (interstitialModeEnabled) {

4
interface/src/octree/SafeLanding.cpp
View file

@ -91,9 +91,7 @@ void SafeLanding::finishSequence(int first, int last) {
void SafeLanding::addToSequence(int sequenceNumber) { void SafeLanding::addToSequence(int sequenceNumber) {
Locker lock(_lock); Locker lock(_lock);
if (_trackingEntities) { _sequenceNumbers.insert(sequenceNumber);
_sequenceNumbers.insert(sequenceNumber);
}
} }
void SafeLanding::updateTracking() { void SafeLanding::updateTracking() {