History

Merge branch 'master' of https://github.com/worklist/hifi into 19494

stojce committed 12 years ago

Commit d5b87fb2 parents ab4164a 04cda4c22 files · +231 −292Browse files

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

Unified · Split

interface/src/Application.cpp+26−14
@@ -2180,15 +2180,6 @@ void Application::updateThreads(float deltaTime) { · 2179 unmodified lines
21802180 }
21812181 }
21822182
2183−void Application::updateParticles(float deltaTime) {
2184− bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
2185− PerformanceWarning warn(showWarnings, "Application::updateParticles()");
2186−
2187− if (Menu::getInstance()->isOptionChecked(MenuOption::ParticleCloud)) {
2188− _cloud.simulate(deltaTime);
2189− }
2190−}
2191−
21922183 void Application::updateMetavoxels(float deltaTime) {
21932184 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
21942185 PerformanceWarning warn(showWarnings, "Application::updateMetavoxels()");
@@ -2310,7 +2301,6 @@ void Application::update(float deltaTime) { · 115 unmodified lines
23102301 updateMyAvatar(deltaTime); // Sample hardware, update view frustum if needed, and send avatar data to mixer/nodes
23112302 updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process...
23122303 _avatarManager.updateOtherAvatars(deltaTime); //loop through all the other avatars and simulate them...
2313− updateParticles(deltaTime); // Simulate particle cloud movements
23142304 updateMetavoxels(deltaTime); // update metavoxels
23152305 updateCamera(deltaTime); // handle various camera tweaks like off axis projection
23162306 updateDialogs(deltaTime); // update various stats dialogs if present
@@ -2745,10 +2735,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 428 unmodified lines
27452735 // disable specular lighting for ground and voxels
27462736 glMaterialfv(GL_FRONT, GL_SPECULAR, NO_SPECULAR_COLOR);
27472737
2748− // Draw Cloud Particles
2749− if (Menu::getInstance()->isOptionChecked(MenuOption::ParticleCloud)) {
2750− _cloud.render();
2751− }
27522738 // Draw voxels
27532739 if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) {
27542740 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
@@ -4032,6 +4018,32 @@ void Application::saveScripts() { · 1277 unmodified lines
40324018 settings->endArray();
40334019 }
40344020
4021+void Application::stopAllScripts() {
4022+ // stops all current running scripts
4023+ QList<QAction*> scriptActions = Menu::getInstance()->getActiveScriptsMenu()->actions();
4024+ foreach (QAction* scriptAction, scriptActions) {
4025+ scriptAction->activate(QAction::Trigger);
4026+ qDebug() << "stopping script..." << scriptAction->text();
4027+ }
4028+ _activeScripts.clear();
4029+}
4030+
4031+void Application::reloadAllScripts() {
4032+ // remember all the current scripts so we can reload them
4033+ QStringList reloadList = _activeScripts;
4034+ // reloads all current running scripts
4035+ QList<QAction*> scriptActions = Menu::getInstance()->getActiveScriptsMenu()->actions();
4036+ foreach (QAction* scriptAction, scriptActions) {
4037+ scriptAction->activate(QAction::Trigger);
4038+ qDebug() << "stopping script..." << scriptAction->text();
4039+ }
4040+ _activeScripts.clear();
4041+ foreach (QString scriptName, reloadList){
4042+ qDebug() << "reloading script..." << scriptName;
4043+ loadScript(scriptName);
4044+ }
4045+}
4046+
40354047 void Application::removeScriptName(const QString& fileNameString) {
40364048 _activeScripts.removeOne(fileNameString);
40374049 }

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