History

Merge pull request #8429 from SamGondelman/loadingFade2

Don't do fade effect once physics kick in

Brad Hefta-Gaub committed 10 years ago

Commit 1cec7b22 parents 37192e8 ccca6d95 files · +26 −10Browse files

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

Unified · Split

interface/src/Application.cpp+5−0
@@ -1237,6 +1237,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 1236 unmodified lines
12371237 _defaultSkybox->setCubemap(_defaultSkyboxTexture);
12381238 _defaultSkybox->setColor({ 1.0, 1.0, 1.0 });
12391239
1240+ EntityItem::setEntitiesShouldFadeFunction([this]() {
1241+ SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer);
1242+ return entityServerNode && !isPhysicsEnabled();
1243+ });
1244+
12401245 // After all of the constructor is completed, then set firstRun to false.
12411246 Setting::Handle<bool> firstRun{ Settings::firstRun, true };
12421247 firstRun.set(false);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t