merging with dante's PR

Wayne Chen committed 8 years ago

Commit c47788e2 parents 9e0fa08 03ede9322 files · +702 −89Browse files

Showing the changes to interface/src/Application.cpp (1 of 22 files). Show all

Unified · Split

         });
         connect(this, &Application::activeDisplayPluginChanged,
             reinterpret_cast<scripting::Audio*>(audioScriptingInterface.data()), &scripting::Audio::onContextChanged);
+        connect(this, &Application::interstitialModeChanged, audioIO, &AudioClient::setInterstitialStatus);
     }
     // Create the rendering engine.  This can be slow on some machines due to lots of
                 audioClient->setMuted(!audioClient->isMuted());
             } else if (action == controller::toInt(controller::Action::CYCLE_CAMERA)) {
                 cycleCamera();
-            } else if (action == controller::toInt(controller::Action::CONTEXT_MENU)) {
+            } else if (action == controller::toInt(controller::Action::CONTEXT_MENU) && !isInterstitialMode()) {
                 toggleTabletUI();
             } else if (action == controller::toInt(controller::Action::RETICLE_X)) {
                 auto oldPos = getApplicationCompositor().getReticlePosition();
     // Preload Tablet sounds
     DependencyManager::get<TabletScriptingInterface>()->preloadSounds();
+    connect(this, &Application::interstitialModeChanged, this, [this] (bool interstitialMode) {
+        if (!interstitialMode) {
+            DependencyManager::get<AudioClient>()->negotiateAudioFormat();
+            _queryExpiry = SteadyClock::now();
+            if (_avatarOverrideUrl.isValid()) {
+                getMyAvatar()->useFullAvatarURL(_avatarOverrideUrl);
+            }
+            if (getMyAvatar()->getFullAvatarURLFromPreferences() != getMyAvatar()->getSkeletonModelURL()) {
+                getMyAvatar()->resetFullAvatarURL();
+            }
+            getMyAvatar()->markIdentityDataChanged();
+            getMyAvatar()->resetLastSent();
+            // transmit a "sendAll" packet to the AvatarMixer we just connected to.
+            getMyAvatar()->sendAvatarDataPacket(true);
+        }
+    });
     _pendingIdleEvent = false;
     _pendingRenderEvent = false;
     if (_window && _window->isFullScreen()) {
         setFullscreen(nullptr, true);
     }
+    setIsInterstitialMode(true);
 }
     return false;
 }
+bool Application::isInterstitialMode() const {
+    bool interstitialModeEnabled = Menu::getInstance()->isOptionChecked("Enable Interstitial");
+    return interstitialModeEnabled ? _interstitialMode : false;
+}
+void Application::setIsInterstitialMode(bool interstitialMode) {
+    auto menu = Menu::getInstance();
+    bool interstitialModeEnabled = menu->isOptionChecked("Enable Interstitial");
+    if (_interstitialMode != interstitialMode && interstitialModeEnabled) {
+        _interstitialMode = interstitialMode;
+        DependencyManager::get<OffscreenUi>()->setPinned(_interstitialMode);
+        emit interstitialModeChanged(_interstitialMode);
+    }
+}
 void Application::setIsServerlessMode(bool serverlessDomain) {
     auto tree = getEntities()->getTree();
     if (tree) {
     _controllerScriptingInterface->emitKeyPressEvent(event); // send events to any registered scripts
     // if one of our scripts have asked to capture this event, then stop processing it
-    if (_controllerScriptingInterface->isKeyCaptured(event)) {
+    if (_controllerScriptingInterface->isKeyCaptured(event) || isInterstitialMode()) {
         return;
     }
     _fullSceneCounterAtLastPhysicsCheck = 0;
     _nearbyEntitiesCountAtLastPhysicsCheck = 0;
     _nearbyEntitiesStabilityCount = 0;
+    _nearbyEntitiesReadyCount = 0;
     _physicsEnabled = false;
     _octreeProcessor.startEntitySequence();
 }
         return;
     }
     if (!_physicsEnabled) {
         if (!domainLoadingInProgress) {
             PROFILE_ASYNC_BEGIN(app, "Scene Loading", "");
         // we haven't yet enabled physics.  we wait until we think we have all the collision information
         // for nearby entities before starting bullet up.
         quint64 now = usecTimestampNow();
-        if (isServerlessMode() || _octreeProcessor.isLoadSequenceComplete()) {
+        bool renderReady = _octreeProcessor.isEntitiesRenderReady();
+        if (isServerlessMode() || (_octreeProcessor.isLoadSequenceComplete() && renderReady)) {
             // we've received a new full-scene octree stats packet, or it's been long enough to try again anyway
             _lastPhysicsCheckTime = now;
             _fullSceneCounterAtLastPhysicsCheck = _fullSceneReceivedCounter;
             // scene is ready to compute its collision shape.
             if (getMyAvatar()->isReadyForPhysics()) {
                 _physicsEnabled = true;
+                setIsInterstitialMode(false);
                 getMyAvatar()->updateMotionBehaviorFromMenu();
             }
         }
         // Transfer the user inputs to the driveKeys
         // FIXME can we drop drive keys and just have the avatar read the action states directly?
         myAvatar->clearDriveKeys();
-        if (_myCamera.getMode() != CAMERA_MODE_INDEPENDENT) {
+        if (_myCamera.getMode() != CAMERA_MODE_INDEPENDENT && !isInterstitialMode()) {
             if (!_controllerScriptingInterface->areActionsCaptured() && _myCamera.getMode() != CAMERA_MODE_MIRROR) {
                 myAvatar->setDriveKey(MyAvatar::TRANSLATE_Z, -1.0f * userInputMapper->getActionState(controller::Action::TRANSLATE_Z));
                 myAvatar->setDriveKey(MyAvatar::TRANSLATE_Y, userInputMapper->getActionState(controller::Action::TRANSLATE_Y));
     // send packet containing downstream audio stats to the AudioMixer
     {
         quint64 sinceLastNack = now - _lastSendDownstreamAudioStats;
-        if (sinceLastNack > TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS) {
+        if (sinceLastNack > TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS && !isInterstitialMode()) {
             _lastSendDownstreamAudioStats = now;
             QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "sendDownstreamAudioStatsPacket", Qt::QueuedConnection);
 }
 void Application::queryAvatars() {
-    auto avatarPacket = NLPacket::create(PacketType::AvatarQuery);
+    if (!isInterstitialMode()) {
-    auto destinationBuffer = reinterpret_cast<unsigned char*>(avatarPacket->getPayload());
+        auto avatarPacket = NLPacket::create(PacketType::AvatarQuery);
-    unsigned char* bufferStart = destinationBuffer;
+        auto destinationBuffer = reinterpret_cast<unsigned char*>(avatarPacket->getPayload());
+        unsigned char* bufferStart = destinationBuffer;
-    uint8_t numFrustums = (uint8_t)_conicalViews.size();
+        uint8_t numFrustums = (uint8_t)_conicalViews.size();
-    memcpy(destinationBuffer, &numFrustums, sizeof(numFrustums));
+        memcpy(destinationBuffer, &numFrustums, sizeof(numFrustums));
-    destinationBuffer += sizeof(numFrustums);
+        destinationBuffer += sizeof(numFrustums);
-    for (const auto& view : _conicalViews) {
+        for (const auto& view : _conicalViews) {
-        destinationBuffer += view.serialize(destinationBuffer);
+            destinationBuffer += view.serialize(destinationBuffer);
-    }
+        }
-    avatarPacket->setPayloadSize(destinationBuffer - bufferStart);
+        avatarPacket->setPayloadSize(destinationBuffer - bufferStart);
-    DependencyManager::get<NodeList>()->broadcastToNodes(std::move(avatarPacket), NodeSet() << NodeType::AvatarMixer);
+        DependencyManager::get<NodeList>()->broadcastToNodes(std::move(avatarPacket), NodeSet() << NodeType::AvatarMixer);
+    }
 }
     qCDebug(interfaceapp) << "Clearing domain octree details...";
     resetPhysicsReadyInformation();
+    setIsInterstitialMode(true);
     _octreeServerSceneStats.withWriteLock([&] {
         _octreeServerSceneStats.clear();
         _octreeQuery.incrementConnectionID();
     }
-    if (node->getType() == NodeType::AudioMixer) {
+    if (node->getType() == NodeType::AudioMixer && !isInterstitialMode()) {
         DependencyManager::get<AudioClient>()->negotiateAudioFormat();
     }
-    if (node->getType() == NodeType::AvatarMixer) {
+    if (node->getType() == NodeType::AvatarMixer && !isInterstitialMode()) {
         _queryExpiry = SteadyClock::now();
         // new avatar mixer, send off our identity packet on next update loop
     _nearbyEntitiesCountAtLastPhysicsCheck = nearbyCount;
     const uint32_t MINIMUM_NEARBY_ENTITIES_STABILITY_COUNT = 3;
+    uint32_t readyNearbyEntities = 0;
     if (_nearbyEntitiesStabilityCount >= MINIMUM_NEARBY_ENTITIES_STABILITY_COUNT) {
         // We've seen the same number of nearby entities for several stats packets in a row.  assume we've got all
         // the local entities.
                 HIFI_FCDEBUG(interfaceapp(), "Physics disabled until entity loads: " << entity->getID() << entity->getName());
                 // don't break here because we want all the relevant entities to start their downloads
                 result = false;
+            } else {
+                readyNearbyEntities++;
             }
         }
+        _nearbyEntitiesReadyCount = readyNearbyEntities;
         return result;
     }
     return false;
 }
 void Application::notifyPacketVersionMismatch() {
-    if (!_notifiedPacketVersionMismatchThisDomain) {
+    if (!_notifiedPacketVersionMismatchThisDomain && !isInterstitialMode()) {
         _notifiedPacketVersionMismatchThisDomain = true;
         QString message = "The location you are visiting is running an incompatible server version.\n";