History

resolve conflicts on merge with upstream master

Stephen Birarda committed 11 years ago

Commit 5c3e90f2 parents 5e3e363 f0b0c5f337 files · +22516 −13528Browse files

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

Unified · Split

interface/src/Application.cpp+192−126
@@ -65,6 +65,7 @@ · 64 unmodified lines
6565 #include <PacketHeaders.h>
6666 #include <PerfStat.h>
6767 #include <ResourceCache.h>
68+#include <SoundCache.h>
6869 #include <UserActivityLogger.h>
6970 #include <UUID.h>
7071
@@ -92,6 +93,7 @@ · 21 unmodified lines
9293 #include "scripting/MenuScriptingInterface.h"
9394 #include "scripting/SettingsScriptingInterface.h"
9495 #include "scripting/WindowScriptingInterface.h"
96+#include "scripting/WebWindowClass.h"
9597
9698 #include "ui/DataWebDialog.h"
9799 #include "ui/InfoView.h"
@@ -108,7 +110,8 @@ static unsigned STARFIELD_SEED = 1; · 10 unmodified lines
108110
109111 static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored
110112
111−const unsigned MAXIMUM_CACHE_SIZE = 10737418240; // 10GB
113+
114+const qint64 MAXIMUM_CACHE_SIZE = 10737418240; // 10GB
112115
113116 static QTimer* idleTimer = NULL;
114117
@@ -121,7 +124,7 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt · 6 unmodified lines
121124 QString logMessage = LogHandler::getInstance().printMessage((LogMsgType) type, context, message);
122125
123126 if (!logMessage.isEmpty()) {
124− Application::getInstance()->getLogger()->addMessage(qPrintable(logMessage));
127+ Application::getInstance()->getLogger()->addMessage(qPrintable(logMessage + "\n"));
125128 }
126129 }
127130
@@ -158,6 +161,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 30 unmodified lines
158161 _lastQueriedViewFrustum(),
159162 _lastQueriedTime(usecTimestampNow()),
160163 _mirrorViewRect(QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT)),
164+ _viewTransform(),
161165 _scaleMirror(1.0f),
162166 _rotateMirror(0.0f),
163167 _raiseMirror(0.0f),
@@ -369,6 +373,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 205 unmodified lines
369373 // enable mouse tracking; otherwise, we only get drag events
370374 _glWidget->setMouseTracking(true);
371375
376+ _toolWindow = new ToolWindow();
377+ _toolWindow->setWindowFlags(_toolWindow->windowFlags() | Qt::WindowStaysOnTopHint);
378+ _toolWindow->setWindowTitle("Tools");
379+
372380 // initialization continues in initializeGL when OpenGL context is ready
373381
374382 // Tell our voxel edit sender about our known jurisdictions
@@ -417,7 +425,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 42 unmodified lines
417425 _trayIcon->show();
418426
419427 // set the local loopback interface for local sounds from audio scripts
420− AudioScriptingInterface::getInstance().setLocalLoopbackInterface(&_audio);
428+ AudioScriptingInterface::getInstance().setLocalAudioInterface(&_audio);
421429
422430 #ifdef HAVE_RTMIDI
423431 // setup the MIDIManager
@@ -430,6 +438,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 6 unmodified lines
430438
431439 void Application::aboutToQuit() {
432440 _aboutToQuit = true;
441+ setFullscreen(false); // if you exit while in full screen, you'll get bad behavior when you restart.
433442 }
434443
435444 Application::~Application() {
@@ -453,23 +462,22 @@ Application::~Application() { · 17 unmodified lines
453462 // ask the datagram processing thread to quit and wait until it is done
454463 _nodeThread->quit();
455464 _nodeThread->wait();
465+
466+ // kill any audio injectors that are still around
467+ AudioScriptingInterface::getInstance().stopAllInjectors();
456468
457469 // stop the audio process
458470 QMetaObject::invokeMethod(&_audio, "stop");
459−
471+
460472 // ask the audio thread to quit and wait until it is done
461473 _audio.thread()->quit();
462474 _audio.thread()->wait();
463−
464− // kill any audio injectors that are still around
465− AudioScriptingInterface::getInstance().stopAllInjectors();
466475
467476 _octreeProcessor.terminate();
468477 _voxelHideShowThread.terminate();
469478 _voxelEditSender.terminate();
470479 _entityEditSender.terminate();
471480
472−
473481 VoxelTreeElement::removeDeleteHook(&_voxels); // we don't need to do this processing on shutdown
474482 Menu::getInstance()->deleteLater();
475483
@@ -597,7 +605,7 @@ void Application::initializeGL() { · 121 unmodified lines
597605 }
598606
599607 // update before the first render
600− update(1.f / _fps);
608+ update(1.0f / _fps);
601609
602610 InfoView::showFirstTime(INFO_HELP_PATH);
603611 }
@@ -643,25 +651,16 @@ void Application::paintGL() { · 39 unmodified lines
643651 }
644652
645653 } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
646− //Only behave like a true mirror when in the OR
647− if (OculusManager::isConnected()) {
648− _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
649− _myCamera.setPosition(_myAvatar->getHead()->getEyePosition() +
650− glm::vec3(0, _raiseMirror * _myAvatar->getScale(), 0) +
651− (_myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
652− glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
653− } else {
654− _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
655− _myCamera.setPosition(_myAvatar->getHead()->getEyePosition() +
656− glm::vec3(0, _raiseMirror * _myAvatar->getScale(), 0) +
657− (_myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
658− glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
659− }
654+ _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
655+ _myCamera.setPosition(_myAvatar->getDefaultEyePosition() +
656+ glm::vec3(0, _raiseMirror * _myAvatar->getScale(), 0) +
657+ (_myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
658+ glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
660659 }
661660
662661 // Update camera position
663662 if (!OculusManager::isConnected()) {
664− _myCamera.update(1.f / _fps);
663+ _myCamera.update(1.0f / _fps);
665664 }
666665
667666 // Note: whichCamera is used to pick between the normal camera myCamera for our
@@ -686,7 +685,7 @@ void Application::paintGL() { · 18 unmodified lines
686685
687686 _viewFrustumOffsetCamera.setRotation(_myCamera.getRotation() * frustumRotation);
688687
689− _viewFrustumOffsetCamera.update(1.f/_fps);
688+ _viewFrustumOffsetCamera.update(1.0f/_fps);
690689 whichCamera = &_viewFrustumOffsetCamera;
691690 }
692691
@@ -705,7 +704,7 @@ void Application::paintGL() { · 12 unmodified lines
705704 } else {
706705 OculusManager::display(_myAvatar->getWorldAlignedOrientation(), _myAvatar->getDefaultEyePosition(), *whichCamera);
707706 }
708− _myCamera.update(1.f / _fps);
707+ _myCamera.update(1.0f / _fps);
709708
710709 } else if (TV3DManager::isConnected()) {
711710
@@ -724,11 +723,11 @@ void Application::paintGL() { · 12 unmodified lines
724723 displaySide(*whichCamera);
725724 glPopMatrix();
726725
727− if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
728− renderRearViewMirror(_mirrorViewRect);
729−
730− } else if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
726+ if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
731727 _rearMirrorTools->render(true);
728+
729+ } else if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
730+ renderRearViewMirror(_mirrorViewRect);
732731 }
733732
734733 _glowEffect.render();
@@ -786,7 +785,7 @@ void Application::updateProjectionMatrix(Camera& camera, bool updateViewFrustum) · 51 unmodified lines
786785 // Tell our viewFrustum about this change, using the application camera
787786 if (updateViewFrustum) {
788787 loadViewFrustum(camera, _viewFrustum);
789− computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);
788+ _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);
790789
791790 // If we're in Display Frustum mode, then we want to use the slightly adjust near/far clip values of the
792791 // _viewFrustumOffsetCamera, so that we can see more of the application content in the application's frustum
@@ -843,7 +842,7 @@ bool Application::event(QEvent* event) { · 50 unmodified lines
843842 QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);
844843
845844 if (!fileEvent->url().isEmpty()) {
846− AddressManager::getInstance().handleLookupString(fileEvent->url().toLocalFile());
845+ AddressManager::getInstance().handleLookupString(fileEvent->url().toString());
847846 }
848847
849848 return false;
@@ -911,7 +910,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 61 unmodified lines
911910 if (!_myAvatar->getDriveKeys(UP)) {
912911 _myAvatar->jump();
913912 }
914− _myAvatar->setDriveKeys(UP, 1.f);
913+ _myAvatar->setDriveKeys(UP, 1.0f);
915914 break;
916915
917916 case Qt::Key_Asterisk:
@@ -920,14 +919,14 @@ void Application::keyPressEvent(QKeyEvent* event) { · 2 unmodified lines
920919
921920 case Qt::Key_C:
922921 case Qt::Key_PageDown:
923− _myAvatar->setDriveKeys(DOWN, 1.f);
922+ _myAvatar->setDriveKeys(DOWN, 1.0f);
924923 break;
925924
926925 case Qt::Key_W:
927926 if (isOption && !isShifted && !isMeta) {
928927 Menu::getInstance()->triggerOption(MenuOption::Wireframe);
929928 } else {
930− _myAvatar->setDriveKeys(FWD, 1.f);
929+ _myAvatar->setDriveKeys(FWD, 1.0f);
931930 }
932931 break;
933932
@@ -939,7 +938,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 5 unmodified lines
939938 } else if (!isOption && !isShifted && isMeta) {
940939 takeSnapshot();
941940 } else {
942− _myAvatar->setDriveKeys(BACK, 1.f);
941+ _myAvatar->setDriveKeys(BACK, 1.0f);
943942 }
944943 break;
945944
@@ -957,13 +956,13 @@ void Application::keyPressEvent(QKeyEvent* event) { · 11 unmodified lines
957956 if (isShifted) {
958957 Menu::getInstance()->triggerOption(MenuOption::Atmosphere);
959958 } else {
960− _myAvatar->setDriveKeys(ROT_LEFT, 1.f);
959+ _myAvatar->setDriveKeys(ROT_LEFT, 1.0f);
961960 }
962961 break;
963962
964963 case Qt::Key_D:
965964 if (!isMeta) {
966− _myAvatar->setDriveKeys(ROT_RIGHT, 1.f);
965+ _myAvatar->setDriveKeys(ROT_RIGHT, 1.0f);
967966 }
968967 break;
969968
@@ -991,7 +990,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 21 unmodified lines
991990 _raiseMirror += 0.05f;
992991 }
993992 } else {
994− _myAvatar->setDriveKeys(isShifted ? UP : FWD, 1.f);
993+ _myAvatar->setDriveKeys(isShifted ? UP : FWD, 1.0f);
995994 }
996995 break;
997996
@@ -1003,23 +1002,23 @@ void Application::keyPressEvent(QKeyEvent* event) { · 5 unmodified lines
10031002 _raiseMirror -= 0.05f;
10041003 }
10051004 } else {
1006− _myAvatar->setDriveKeys(isShifted ? DOWN : BACK, 1.f);
1005+ _myAvatar->setDriveKeys(isShifted ? DOWN : BACK, 1.0f);
10071006 }
10081007 break;
10091008
10101009 case Qt::Key_Left:
10111010 if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
1012− _rotateMirror += PI / 20.f;
1011+ _rotateMirror += PI / 20.0f;
10131012 } else {
1014− _myAvatar->setDriveKeys(isShifted ? LEFT : ROT_LEFT, 1.f);
1013+ _myAvatar->setDriveKeys(isShifted ? LEFT : ROT_LEFT, 1.0f);
10151014 }
10161015 break;
10171016
10181017 case Qt::Key_Right:
10191018 if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
1020− _rotateMirror -= PI / 20.f;
1019+ _rotateMirror -= PI / 20.0f;
10211020 } else {
1022− _myAvatar->setDriveKeys(isShifted ? RIGHT : ROT_RIGHT, 1.f);
1021+ _myAvatar->setDriveKeys(isShifted ? RIGHT : ROT_RIGHT, 1.0f);
10231022 }
10241023 break;
10251024
@@ -1170,48 +1169,48 @@ void Application::keyReleaseEvent(QKeyEvent* event) { · 144 unmodified lines
11701169 switch (event->key()) {
11711170 case Qt::Key_E:
11721171 case Qt::Key_PageUp:
1173− _myAvatar->setDriveKeys(UP, 0.f);
1172+ _myAvatar->setDriveKeys(UP, 0.0f);
11741173 break;
11751174
11761175 case Qt::Key_C:
11771176 case Qt::Key_PageDown:
1178− _myAvatar->setDriveKeys(DOWN, 0.f);
1177+ _myAvatar->setDriveKeys(DOWN, 0.0f);
11791178 break;
11801179
11811180 case Qt::Key_W:
1182− _myAvatar->setDriveKeys(FWD, 0.f);
1181+ _myAvatar->setDriveKeys(FWD, 0.0f);
11831182 break;
11841183
11851184 case Qt::Key_S:
1186− _myAvatar->setDriveKeys(BACK, 0.f);
1185+ _myAvatar->setDriveKeys(BACK, 0.0f);
11871186 break;
11881187
11891188 case Qt::Key_A:
1190− _myAvatar->setDriveKeys(ROT_LEFT, 0.f);
1189+ _myAvatar->setDriveKeys(ROT_LEFT, 0.0f);
11911190 break;
11921191
11931192 case Qt::Key_D:
1194− _myAvatar->setDriveKeys(ROT_RIGHT, 0.f);
1193+ _myAvatar->setDriveKeys(ROT_RIGHT, 0.0f);
11951194 break;
11961195
11971196 case Qt::Key_Up:
1198− _myAvatar->setDriveKeys(FWD, 0.f);
1199− _myAvatar->setDriveKeys(UP, 0.f);
1197+ _myAvatar->setDriveKeys(FWD, 0.0f);
1198+ _myAvatar->setDriveKeys(UP, 0.0f);
12001199 break;
12011200
12021201 case Qt::Key_Down:
1203− _myAvatar->setDriveKeys(BACK, 0.f);
1204− _myAvatar->setDriveKeys(DOWN, 0.f);
1202+ _myAvatar->setDriveKeys(BACK, 0.0f);
1203+ _myAvatar->setDriveKeys(DOWN, 0.0f);
12051204 break;
12061205
12071206 case Qt::Key_Left:
1208− _myAvatar->setDriveKeys(LEFT, 0.f);
1209− _myAvatar->setDriveKeys(ROT_LEFT, 0.f);
1207+ _myAvatar->setDriveKeys(LEFT, 0.0f);
1208+ _myAvatar->setDriveKeys(ROT_LEFT, 0.0f);
12101209 break;
12111210
12121211 case Qt::Key_Right:
1213− _myAvatar->setDriveKeys(RIGHT, 0.f);
1214− _myAvatar->setDriveKeys(ROT_RIGHT, 0.f);
1212+ _myAvatar->setDriveKeys(RIGHT, 0.0f);
1213+ _myAvatar->setDriveKeys(ROT_RIGHT, 0.0f);
12151214 break;
12161215 case Qt::Key_Control:
12171216 case Qt::Key_Shift:
@@ -1515,7 +1514,7 @@ void Application::idle() { · 297 unmodified lines
15151514 PerformanceTimer perfTimer("update");
15161515 PerformanceWarning warn(showWarnings, "Application::idle()... update()");
15171516 const float BIGGEST_DELTA_TIME_SECS = 0.25f;
1518− update(glm::clamp((float)timeSinceLastUpdate / 1000.f, 0.f, BIGGEST_DELTA_TIME_SECS));
1517+ update(glm::clamp((float)timeSinceLastUpdate / 1000.0f, 0.0f, BIGGEST_DELTA_TIME_SECS));
15191518 }
15201519 {
15211520 PerformanceTimer perfTimer("updateGL");
@@ -1534,11 +1533,6 @@ void Application::idle() { · 12 unmodified lines
15341533 _idleLoopStdev.reset();
15351534 }
15361535
1537− if (Menu::getInstance()->isOptionChecked(MenuOption::BuckyBalls)) {
1538− PerformanceTimer perfTimer("buckyBalls");
1539− _buckyBalls.simulate(timeSinceLastUpdate / 1000.f, Application::getInstance()->getAvatar()->getHandData());
1540− }
1541−
15421536 // After finishing all of the above work, restart the idle timer, allowing 2ms to process events.
15431537 idleTimer->start(2);
15441538
@@ -1553,6 +1547,8 @@ void Application::checkBandwidthMeterClick() { · 8 unmodified lines
15531547 // ... to be called upon button release
15541548
15551549 if (Menu::getInstance()->isOptionChecked(MenuOption::Bandwidth) &&
1550+ Menu::getInstance()->isOptionChecked(MenuOption::Stats) &&
1551+ Menu::getInstance()->isOptionChecked(MenuOption::UserInterface) &&
15561552 glm::compMax(glm::abs(glm::ivec2(_mouseX - _mouseDragStartedX, _mouseY - _mouseDragStartedY)))
15571553 <= BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH
15581554 && _bandwidthMeter.isWithinArea(_mouseX, _mouseY, _glWidget->width(), _glWidget->height())) {
@@ -1564,6 +1560,10 @@ void Application::checkBandwidthMeterClick() { · 5 unmodified lines
15641560 }
15651561
15661562 void Application::setFullscreen(bool fullscreen) {
1563+ if (Menu::getInstance()->isOptionChecked(MenuOption::Fullscreen) != fullscreen) {
1564+ Menu::getInstance()->getActionForOption(MenuOption::Fullscreen)->setChecked(fullscreen);
1565+ }
1566+
15671567 if (Menu::getInstance()->isOptionChecked(MenuOption::EnableVRMode)) {
15681568 if (fullscreen) {
15691569 // Menu show() after hide() doesn't work with Rift VR display so set height instead.
@@ -1574,6 +1574,9 @@ void Application::setFullscreen(bool fullscreen) { · 4 unmodified lines
15741574 }
15751575 _window->setWindowState(fullscreen ? (_window->windowState() | Qt::WindowFullScreen) :
15761576 (_window->windowState() & ~Qt::WindowFullScreen));
1577+ if (!_aboutToQuit) {
1578+ _window->show();
1579+ }
15771580 }
15781581
15791582 void Application::setEnable3DTVMode(bool enable3DTVMode) {
@@ -1581,6 +1584,10 @@ void Application::setEnable3DTVMode(bool enable3DTVMode) { · 1 unmodified line
15811584 }
15821585
15831586 void Application::setEnableVRMode(bool enableVRMode) {
1587+ if (Menu::getInstance()->isOptionChecked(MenuOption::EnableVRMode) != enableVRMode) {
1588+ Menu::getInstance()->getActionForOption(MenuOption::EnableVRMode)->setChecked(enableVRMode);
1589+ }
1590+
15841591 if (enableVRMode) {
15851592 if (!OculusManager::isConnected()) {
15861593 // attempt to reconnect the Oculus manager - it's possible this was a workaround
@@ -1591,6 +1598,11 @@ void Application::setEnableVRMode(bool enableVRMode) { · 4 unmodified lines
15911598 OculusManager::recalibrate();
15921599 } else {
15931600 OculusManager::abandonCalibration();
1601+
1602+ _mirrorCamera.setHmdPosition(glm::vec3());
1603+ _mirrorCamera.setHmdRotation(glm::quat());
1604+ _myCamera.setHmdPosition(glm::vec3());
1605+ _myCamera.setHmdRotation(glm::quat());
15941606 }
15951607
15961608 resizeGL(_glWidget->getDeviceWidth(), _glWidget->getDeviceHeight());
@@ -1649,8 +1661,8 @@ void Application::makeVoxel(glm::vec3 position, · 52 unmodified lines
16491661 }
16501662
16511663 glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail& mouseVoxel) {
1652− return glm::vec3((mouseVoxel.x + mouseVoxel.s / 2.f) * TREE_SCALE, (mouseVoxel.y + mouseVoxel.s / 2.f) * TREE_SCALE,
1653− (mouseVoxel.z + mouseVoxel.s / 2.f) * TREE_SCALE);
1664+ return glm::vec3((mouseVoxel.x + mouseVoxel.s / 2.0f) * TREE_SCALE, (mouseVoxel.y + mouseVoxel.s / 2.0f) * TREE_SCALE,
1665+ (mouseVoxel.z + mouseVoxel.s / 2.0f) * TREE_SCALE);
16541666 }
16551667
16561668 FaceTracker* Application::getActiveFaceTracker() {
@@ -1863,7 +1875,7 @@ void Application::init() { · 206 unmodified lines
18631875 3.0f * TREE_SCALE / 2.0f));
18641876 _sharedVoxelSystemViewFrustum.setNearClip(TREE_SCALE / 2.0f);
18651877 _sharedVoxelSystemViewFrustum.setFarClip(3.0f * TREE_SCALE / 2.0f);
1866− _sharedVoxelSystemViewFrustum.setFieldOfView(90.f);
1878+ _sharedVoxelSystemViewFrustum.setFieldOfView(90.0f);
18671879 _sharedVoxelSystemViewFrustum.setOrientation(glm::quat());
18681880 _sharedVoxelSystemViewFrustum.calculate();
18691881 _sharedVoxelSystem.setViewFrustum(&_sharedVoxelSystemViewFrustum);
@@ -1922,11 +1934,14 @@ void Application::init() { · 52 unmodified lines
19221934 // check if we have a URL in settings to load to jump back to
19231935 // we load this separate from the other settings so we don't double lookup a URL
19241936 QSettings* interfaceSettings = lockSettings();
1925− QUrl addressURL = interfaceSettings->value(SETTINGS_ADDRESS_KEY).toUrl();
1937+ QVariant addressVariant = interfaceSettings->value(SETTINGS_ADDRESS_KEY);
19261938
1927− AddressManager::getInstance().handleLookupString(addressURL.toString());
1939+ QString addressString = addressVariant.isNull()
1940+ ? DEFAULT_HIFI_ADDRESS : addressVariant.toUrl().toString();
19281941
19291942 unlockSettings();
1943+
1944+ AddressManager::getInstance().handleLookupString(addressString);
19301945 }
19311946
19321947 qDebug() << "Loaded settings";
@@ -2009,25 +2024,17 @@ void Application::init() { · 76 unmodified lines
20092024
20102025 void Application::closeMirrorView() {
20112026 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
2012− Menu::getInstance()->triggerOption(MenuOption::Mirror);;
2027+ Menu::getInstance()->triggerOption(MenuOption::Mirror);
20132028 }
20142029 }
20152030
20162031 void Application::restoreMirrorView() {
2017− if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
2018− Menu::getInstance()->triggerOption(MenuOption::Mirror);;
2019− }
2020−
20212032 if (!Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
20222033 Menu::getInstance()->triggerOption(MenuOption::FullscreenMirror);
20232034 }
20242035 }
20252036
20262037 void Application::shrinkMirrorView() {
2027− if (!Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
2028− Menu::getInstance()->triggerOption(MenuOption::Mirror);;
2029− }
2030−
20312038 if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
20322039 Menu::getInstance()->triggerOption(MenuOption::FullscreenMirror);
20332040 }
@@ -2164,7 +2171,7 @@ void Application::updateMyAvatarLookAtPosition() { · 130 unmodified lines
21642171 } else {
21652172 // I am not looking at anyone else, so just look forward
21662173 lookAtSpot = _myAvatar->getHead()->getEyePosition() +
2167− (_myAvatar->getHead()->getFinalOrientationInWorldFrame() * glm::vec3(0.f, 0.f, -TREE_SCALE));
2174+ (_myAvatar->getHead()->getFinalOrientationInWorldFrame() * glm::vec3(0.0f, 0.0f, -TREE_SCALE));
21682175 }
21692176 }
21702177 //
@@ -2318,7 +2325,7 @@ void Application::update(float deltaTime) { · 147 unmodified lines
23182325 updateDialogs(deltaTime); // update various stats dialogs if present
23192326 updateCursor(deltaTime); // Handle cursor updates
23202327
2321− {
2328+ if (!_aboutToQuit) {
23222329 PerformanceTimer perfTimer("entities");
23232330 _entities.update(); // update the models...
23242331 {
@@ -2675,6 +2682,14 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 350 unmodified lines
26752682 });
26762683 }
26772684
2685+bool Application::isHMDMode() const {
2686+ if (OculusManager::isConnected()) {
2687+ return true;
2688+ } else {
2689+ return false;
2690+ }
2691+}
2692+
26782693 /////////////////////////////////////////////////////////////////////////////////////
26792694 // loadViewFrustum()
26802695 //
@@ -2811,6 +2826,8 @@ void Application::updateShadowMap() { · 130 unmodified lines
28112826
28122827 // store view matrix without translation, which we'll use for precision-sensitive objects
28132828 updateUntranslatedViewMatrix();
2829+ // TODO: assign an equivalent viewTransform object to the application to match the current path which uses glMatrixStack
2830+ // setViewTransform(viewTransform);
28142831
28152832 glEnable(GL_POLYGON_OFFSET_FILL);
28162833 glPolygonOffset(1.1f, 4.0f); // magic numbers courtesy http://www.eecs.berkeley.edu/~ravir/6160/papers/shadowmaps.ppt
@@ -2828,7 +2845,12 @@ void Application::updateShadowMap() { · 11 unmodified lines
28282845 // render JS/scriptable overlays
28292846 {
28302847 PerformanceTimer perfTimer("3dOverlays");
2831− _overlays.render3D(RenderArgs::SHADOW_RENDER_MODE);
2848+ _overlays.render3D(false, RenderArgs::SHADOW_RENDER_MODE);
2849+ }
2850+
2851+ {
2852+ PerformanceTimer perfTimer("3dOverlaysFront");
2853+ _overlays.render3D(true, RenderArgs::SHADOW_RENDER_MODE);
28322854 }
28332855
28342856 glDisable(GL_POLYGON_OFFSET_FILL);
@@ -2883,7 +2905,7 @@ QImage Application::renderAvatarBillboard() { · 48 unmodified lines
28832905 return image;
28842906 }
28852907
2886−void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
2908+void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly, RenderArgs::RenderSide renderSide) {
28872909 PROFILE_RANGE(__FUNCTION__);
28882910 PerformanceTimer perfTimer("display");
28892911 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displaySide()");
@@ -2918,6 +2940,26 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 28 unmodified lines
29182940 // store view matrix without translation, which we'll use for precision-sensitive objects
29192941 updateUntranslatedViewMatrix(-whichCamera.getPosition());
29202942
2943+ // Equivalent to what is happening with _untranslatedViewMatrix and the _viewMatrixTranslation
2944+ // the viewTransofmr object is updatded with the correct values and saved,
2945+ // this is what is used for rendering the Entities and avatars
2946+ Transform viewTransform;
2947+ viewTransform.setTranslation(whichCamera.getPosition());
2948+ viewTransform.setRotation(rotation);
2949+ viewTransform.postTranslate(eyeOffsetPos);
2950+ viewTransform.postRotate(eyeOffsetOrient);
2951+ if (whichCamera.getMode() == CAMERA_MODE_MIRROR) {
2952+ viewTransform.setScale(Transform::Vec3(-1.0f, 1.0f, 1.0f));
2953+ }
2954+ if (renderSide != RenderArgs::MONO) {
2955+ glm::mat4 invView = glm::inverse(_untranslatedViewMatrix);
2956+
2957+ viewTransform.evalFromRawMatrix(invView);
2958+ viewTransform.preTranslate(_viewMatrixTranslation);
2959+ }
2960+
2961+ setViewTransform(viewTransform);
2962+
29212963 glTranslatef(_viewMatrixTranslation.x, _viewMatrixTranslation.y, _viewMatrixTranslation.z);
29222964
29232965 // Setup 3D lights (after the camera transform, so that they are positioned in world space)
@@ -2996,13 +3038,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 72 unmodified lines
29963038 _audioReflector.render();
29973039 }
29983040
2999− if (Menu::getInstance()->isOptionChecked(MenuOption::BuckyBalls)) {
3000− PerformanceTimer perfTimer("buckyBalls");
3001− PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
3002− "Application::displaySide() ... bucky balls...");
3003− _buckyBalls.render();
3004− }
3005−
30063041 // Draw voxels
30073042 if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) {
30083043 PerformanceTimer perfTimer("voxels");
@@ -3024,13 +3059,13 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 15 unmodified lines
30243059 PerformanceTimer perfTimer("entities");
30253060 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
30263061 "Application::displaySide() ... entities...");
3027− _entities.render();
3062+ _entities.render(RenderArgs::DEFAULT_RENDER_MODE, renderSide);
30283063 }
30293064
30303065 // render JS/scriptable overlays
30313066 {
30323067 PerformanceTimer perfTimer("3dOverlays");
3033− _overlays.render3D();
3068+ _overlays.render3D(false);
30343069 }
30353070
30363071 // render the ambient occlusion effect if enabled
@@ -3042,13 +3077,16 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 5 unmodified lines
30423077 }
30433078 }
30443079
3080+
3081+
30453082 bool mirrorMode = (whichCamera.getMode() == CAMERA_MODE_MIRROR);
30463083 {
30473084 PerformanceTimer perfTimer("avatars");
30483085 _avatarManager.renderAvatars(mirrorMode ? Avatar::MIRROR_RENDER_MODE : Avatar::NORMAL_RENDER_MODE,
30493086 false, selfAvatarOnly);
30503087 }
3051−
3088+
3089+
30523090 {
30533091 PROFILE_RANGE("DeferredLighting");
30543092 PerformanceTimer perfTimer("lighting");
@@ -3107,10 +3145,17 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 52 unmodified lines
31073145 emit renderingInWorldInterface();
31083146 }
31093147 }
3110−
3148+
31113149 if (Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) {
31123150 glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
31133151 }
3152+
3153+ // Render 3D overlays that should be drawn in front
3154+ {
3155+ PerformanceTimer perfTimer("3dOverlaysFront");
3156+ glClear(GL_DEPTH_BUFFER_BIT);
3157+ _overlays.render3D(true);
3158+ }
31143159 }
31153160
31163161 void Application::updateUntranslatedViewMatrix(const glm::vec3& viewMatrixTranslation) {
@@ -3118,6 +3163,10 @@ void Application::updateUntranslatedViewMatrix(const glm::vec3& viewMatrixTransl · 1 unmodified line
31183163 _viewMatrixTranslation = viewMatrixTranslation;
31193164 }
31203165
3166+void Application::setViewTransform(const Transform& view) {
3167+ _viewTransform = view;
3168+}
3169+
31213170 void Application::loadTranslatedViewMatrix(const glm::vec3& translation) {
31223171 glLoadMatrixf((const GLfloat*)&_untranslatedViewMatrix);
31233172 glTranslatef(translation.x + _viewMatrixTranslation.x, translation.y + _viewMatrixTranslation.y,
@@ -3181,12 +3230,12 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { · 57 unmodified lines
31813230 if (billboard) {
31823231 _mirrorCamera.setFieldOfView(BILLBOARD_FIELD_OF_VIEW); // degees
31833232 _mirrorCamera.setPosition(_myAvatar->getPosition() +
3184− _myAvatar->getOrientation() * glm::vec3(0.f, 0.f, -1.0f) * BILLBOARD_DISTANCE * _myAvatar->getScale());
3233+ _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, -1.0f) * BILLBOARD_DISTANCE * _myAvatar->getScale());
31853234
31863235 } else if (_rearMirrorTools->getZoomLevel() == BODY) {
31873236 _mirrorCamera.setFieldOfView(MIRROR_FIELD_OF_VIEW); // degrees
31883237 _mirrorCamera.setPosition(_myAvatar->getChestPosition() +
3189− _myAvatar->getOrientation() * glm::vec3(0.f, 0.f, -1.0f) * MIRROR_REARVIEW_BODY_DISTANCE * _myAvatar->getScale());
3238+ _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_REARVIEW_BODY_DISTANCE * _myAvatar->getScale());
31903239
31913240 } else { // HEAD zoom level
31923241 _mirrorCamera.setFieldOfView(MIRROR_FIELD_OF_VIEW); // degrees
@@ -3194,11 +3243,11 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { · 1 unmodified line
31943243 // as a hack until we have a better way of dealing with coordinate precision issues, reposition the
31953244 // face/body so that the average eye position lies at the origin
31963245 eyeRelativeCamera = true;
3197− _mirrorCamera.setPosition(_myAvatar->getOrientation() * glm::vec3(0.f, 0.f, -1.0f) * MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale());
3246+ _mirrorCamera.setPosition(_myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale());
31983247
31993248 } else {
32003249 _mirrorCamera.setPosition(_myAvatar->getHead()->getEyePosition() +
3201− _myAvatar->getOrientation() * glm::vec3(0.f, 0.f, -1.0f) * MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale());
3250+ _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale());
32023251 }
32033252 }
32043253 _mirrorCamera.setAspectRatio((float)region.width() / region.height());
@@ -3465,7 +3514,6 @@ void Application::deleteVoxelAt(const VoxelDetail& voxel) { · 260 unmodified lines
34653514 }
34663515 }
34673516
3468−
34693517 void Application::resetSensors() {
34703518 _mouseX = _glWidget->width() / 2;
34713519 _mouseY = _glWidget->height() / 2;
@@ -3479,7 +3527,11 @@ void Application::resetSensors() { · 7 unmodified lines
34793527 _prioVR.reset();
34803528 //_leapmotion.reset();
34813529
3482− QCursor::setPos(_mouseX, _mouseY);
3530+ QScreen* currentScreen = _window->windowHandle()->screen();
3531+ QWindow* mainWindow = _window->windowHandle();
3532+ QPoint windowCenter = mainWindow->geometry().center();
3533+ QCursor::setPos(currentScreen, windowCenter);
3534+
34833535 _myAvatar->reset();
34843536
34853537 QMetaObject::invokeMethod(&_audio, "reset", Qt::QueuedConnection);
@@ -3898,7 +3950,9 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 412 unmodified lines
38983950 connect(scriptEngine, SIGNAL(loadScript(const QString&, bool)), this, SLOT(loadScript(const QString&, bool)));
38993951
39003952 scriptEngine->registerGlobalObject("Overlays", &_overlays);
3901− qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue, RayToOverlayIntersectionResultFromScriptValue);
3953+ qScriptRegisterMetaType(scriptEngine, OverlayPropertyResultToScriptValue, OverlayPropertyResultFromScriptValue);
3954+ qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue,
3955+ RayToOverlayIntersectionResultFromScriptValue);
39023956
39033957 QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", WindowScriptingInterface::getInstance());
39043958 scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
@@ -3906,11 +3960,14 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 1 unmodified line
39063960 // register `location` on the global object.
39073961 scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
39083962 LocationScriptingInterface::locationSetter);
3963+
3964+ scriptEngine->registerFunction("WebWindow", WebWindowClass::constructor, 1);
39093965
39103966 scriptEngine->registerGlobalObject("Menu", MenuScriptingInterface::getInstance());
39113967 scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance());
39123968 scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance());
39133969 scriptEngine->registerGlobalObject("AnimationCache", &_animationCache);
3970+ scriptEngine->registerGlobalObject("SoundCache", &SoundCache::getInstance());
39143971 scriptEngine->registerGlobalObject("AudioReflector", &_audioReflector);
39153972 scriptEngine->registerGlobalObject("Account", AccountScriptingInterface::getInstance());
39163973 scriptEngine->registerGlobalObject("Metavoxels", &_metavoxels);
@@ -3959,26 +4016,23 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser · 42 unmodified lines
39594016 return _scriptEnginesHash[scriptURLString];
39604017 }
39614018
3962− ScriptEngine* scriptEngine;
4019+ ScriptEngine* scriptEngine = new ScriptEngine(NO_SCRIPT, "", &_controllerScriptingInterface);
4020+ scriptEngine->setUserLoaded(isUserLoaded);
4021+
39634022 if (scriptFilename.isNull()) {
3964− scriptEngine = new ScriptEngine(NO_SCRIPT, "", &_controllerScriptingInterface);
4023+ // this had better be the script editor (we should de-couple so somebody who thinks they are loading a script
4024+ // doesn't just get an empty script engine)
4025+
4026+ // we can complete setup now since there isn't a script we have to load
4027+ registerScriptEngineWithApplicationServices(scriptEngine);
39654028 } else {
3966− // start the script on a new thread...
3967− scriptEngine = new ScriptEngine(scriptUrl, &_controllerScriptingInterface);
3968−
3969− if (!scriptEngine->hasScript()) {
3970− qDebug() << "Application::loadScript(), script failed to load...";
3971− QMessageBox::warning(getWindow(), "Error Loading Script", scriptURLString + " failed to load.");
3972− return NULL;
3973− }
3974−
3975− _scriptEnginesHash.insertMulti(scriptURLString, scriptEngine);
3976− _runningScriptsWidget->setRunningScripts(getRunningScripts());
3977− UserActivityLogger::getInstance().loadedScript(scriptURLString);
4029+ // connect to the appropriate signals of this script engine
4030+ connect(scriptEngine, &ScriptEngine::scriptLoaded, this, &Application::handleScriptEngineLoaded);
4031+ connect(scriptEngine, &ScriptEngine::errorLoadingScript, this, &Application::handleScriptLoadError);
4032+
4033+ // get the script engine object to load the script at the designated script URL
4034+ scriptEngine->loadURL(scriptUrl);
39784035 }
3979− scriptEngine->setUserLoaded(isUserLoaded);
3980−
3981− registerScriptEngineWithApplicationServices(scriptEngine);
39824036
39834037 // restore the main window's active state
39844038 if (activateMainWindow && !loadScriptFromEditor) {
@@ -3989,6 +4043,22 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser · 4 unmodified lines
39894043 return scriptEngine;
39904044 }
39914045
4046+void Application::handleScriptEngineLoaded(const QString& scriptFilename) {
4047+ ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(sender());
4048+
4049+ _scriptEnginesHash.insertMulti(scriptFilename, scriptEngine);
4050+ _runningScriptsWidget->setRunningScripts(getRunningScripts());
4051+ UserActivityLogger::getInstance().loadedScript(scriptFilename);
4052+
4053+ // register our application services and set it off on its own thread
4054+ registerScriptEngineWithApplicationServices(scriptEngine);
4055+}
4056+
4057+void Application::handleScriptLoadError(const QString& scriptFilename) {
4058+ qDebug() << "Application::loadScript(), script failed to load...";
4059+ QMessageBox::warning(getWindow(), "Error Loading Script", scriptFilename + " failed to load.");
4060+}
4061+
39924062 void Application::scriptFinished(const QString& scriptName) {
39934063 const QString& scriptURLString = QUrl(scriptName).toString();
39944064 QHash<QString, ScriptEngine*>::iterator it = _scriptEnginesHash.find(scriptURLString);
@@ -4189,7 +4259,7 @@ void Application::toggleLogDialog() { · 194 unmodified lines
41894259 }
41904260
41914261 void Application::initAvatarAndViewFrustum() {
4192− updateMyAvatar(0.f);
4262+ updateMyAvatar(0.0f);
41934263 }
41944264
41954265 void Application::checkVersion() {
@@ -4315,8 +4385,6 @@ bool Application::isVSyncOn() const { · 119 unmodified lines
43154385 if (wglewGetExtension("WGL_EXT_swap_control")) {
43164386 int swapInterval = wglGetSwapIntervalEXT();
43174387 return (swapInterval > 0);
4318− } else {
4319− return true;
43204388 }
43214389 #elif defined(Q_OS_LINUX)
43224390 // TODO: write the poper code for linux
@@ -4327,10 +4395,9 @@ bool Application::isVSyncOn() const { · 4 unmodified lines
43274395 } else {
43284396 return true;
43294397 }
4330− */
4331−#else
4332− return true;
4398+ */
43334399 #endif
4400+ return true;
43344401 }
43354402
43364403 bool Application::isVSyncEditable() const {
@@ -4345,7 +4412,6 @@ bool Application::isVSyncEditable() const { · 8 unmodified lines
43454412 return true;
43464413 }
43474414 */
4348−#else
43494415 #endif
43504416 return false;
43514417 }
@@ -4367,7 +4433,7 @@ unsigned int Application::getRenderTargetFramerate() const { · 15 unmodified lines
43674433
43684434 float Application::getRenderResolutionScale() const {
43694435 if (Menu::getInstance()->isOptionChecked(MenuOption::RenderResolutionOne)) {
4370− return 1.f;
4436+ return 1.0f;
43714437 } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderResolutionTwoThird)) {
43724438 return 0.666f;
43734439 } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderResolutionHalf)) {
@@ -4377,6 +4443,6 @@ float Application::getRenderResolutionScale() const { · 3 unmodified lines
43774443 } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderResolutionQuarter)) {
43784444 return 0.25f;
43794445 } else {
4380− return 1.f;
4446+ return 1.0f;
43814447 }
43824448 }

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