History

Merge branch 'master' of https://github.com/highfidelity/hifi into authentication

Stephen Birarda committed 12 years ago

Commit 66817542 parents ea61ccf 8e097be38 files · +1152 −268Browse files

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

Unified · Split

interface/src/Application.cpp+14−7
@@ -2234,8 +2234,7 @@ void Application::updateShadowMap() { · 2233 unmodified lines
22342234 glRotatef(glm::degrees(glm::angle(inverseRotation)), axis.x, axis.y, axis.z);
22352235
22362236 // store view matrix without translation, which we'll use for precision-sensitive objects
2237− glGetFloatv(GL_MODELVIEW_MATRIX, (GLfloat*)&_untranslatedViewMatrix);
2238− _viewMatrixTranslation = glm::vec3();
2237+ updateUntranslatedViewMatrix();
22392238
22402239 _avatarManager.renderAvatars(Avatar::SHADOW_RENDER_MODE);
22412240 _particles.render();
@@ -2320,8 +2319,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 78 unmodified lines
23202319 glRotatef(-glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z);
23212320
23222321 // store view matrix without translation, which we'll use for precision-sensitive objects
2323− glGetFloatv(GL_MODELVIEW_MATRIX, (GLfloat*)&_untranslatedViewMatrix);
2324− _viewMatrixTranslation = -whichCamera.getPosition();
2322+ updateUntranslatedViewMatrix(-whichCamera.getPosition());
23252323
23262324 glTranslatef(_viewMatrixTranslation.x, _viewMatrixTranslation.y, _viewMatrixTranslation.z);
23272325
@@ -2452,6 +2450,11 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 124 unmodified lines
24522450 }
24532451 }
24542452
2453+void Application::updateUntranslatedViewMatrix(const glm::vec3& viewMatrixTranslation) {
2454+ glGetFloatv(GL_MODELVIEW_MATRIX, (GLfloat*)&_untranslatedViewMatrix);
2455+ _viewMatrixTranslation = viewMatrixTranslation;
2456+}
2457+
24552458 void Application::loadTranslatedViewMatrix(const glm::vec3& translation) {
24562459 glLoadMatrixf((const GLfloat*)&_untranslatedViewMatrix);
24572460 glTranslatef(translation.x + _viewMatrixTranslation.x, translation.y + _viewMatrixTranslation.y,
@@ -3249,9 +3252,12 @@ void Application::toggleRunningScriptsWidget() · 791 unmodified lines
32493252
32503253 void Application::uploadFST(bool isHead) {
32513254 ModelUploader* uploader = new ModelUploader(isHead);
3252− if (uploader->zip()) {
3253− uploader->send();
3254− }
3255+ QThread* thread = new QThread();
3256+ thread->connect(uploader, SIGNAL(destroyed()), SLOT(quit()));
3257+ thread->connect(thread, SIGNAL(finished()), SLOT(deleteLater()));
3258+ uploader->connect(thread, SIGNAL(started()), SLOT(send()));
3259+
3260+ thread->start();
32553261 }
32563262
32573263 void Application::uploadHead() {
@@ -3278,6 +3284,7 @@ void Application::loadScript(const QString& scriptName) { · 20 unmodified lines
32783284 // we can use the same ones from the application.
32793285 scriptEngine->getVoxelsScriptingInterface()->setPacketSender(&_voxelEditSender);
32803286 scriptEngine->getVoxelsScriptingInterface()->setVoxelTree(_voxels.getTree());
3287+ scriptEngine->getVoxelsScriptingInterface()->setUndoStack(&_undoStack);
32813288 scriptEngine->getParticlesScriptingInterface()->setPacketSender(&_particleEditSender);
32823289 scriptEngine->getParticlesScriptingInterface()->setParticleTree(_particles.getTree());
32833290

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