Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 02:16:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

diff minimization

Browse source
This commit is contained in:
Seth Alves 2016-12-20 09:23:21 -08:00
parent 36e843178a
commit ab3c833dd5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -1498,6 +1498,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
} }
_connectionMonitor.init(); _connectionMonitor.init();
// After all of the constructor is completed, then set firstRun to false. // After all of the constructor is completed, then set firstRun to false.
firstRun.set(false); firstRun.set(false);
} }
@ -1591,7 +1592,6 @@ void Application::toggleMenuUnderReticle() const {
offscreenUi->toggleMenu(QPoint(reticlePosition.x - X_LEFT_SHIFT, reticlePosition.y)); offscreenUi->toggleMenu(QPoint(reticlePosition.x - X_LEFT_SHIFT, reticlePosition.y));
} }
uint64_t lastTabletUIToggle { 0 }; uint64_t lastTabletUIToggle { 0 };
const uint64_t toggleTabletUILockout { 500000 }; const uint64_t toggleTabletUILockout { 500000 };
void Application::toggleTabletUI() const { void Application::toggleTabletUI() const {

4
scripts/system/libraries/WebTablet.js
View file

@ -65,7 +65,7 @@ WebTablet = function (url, width, dpi, location, clientOnly) {
dimensions: {x: WIDTH, y: HEIGHT, z: DEPTH}, dimensions: {x: WIDTH, y: HEIGHT, z: DEPTH},
parentID: MyAvatar.sessionUUID, parentID: MyAvatar.sessionUUID,
parentJointIndex: SENSOR_TO_ROOM_MATRIX parentJointIndex: SENSOR_TO_ROOM_MATRIX
}; }
if (location) { if (location) {
tabletProperties.localPosition = location.localPosition; tabletProperties.localPosition = location.localPosition;
@ -104,7 +104,7 @@ WebTablet = function (url, width, dpi, location, clientOnly) {
dimensions: {x: 0.05, y: 0.05, z: 0.05}, dimensions: {x: 0.05, y: 0.05, z: 0.05},
parentID: this.tabletEntityID, parentID: this.tabletEntityID,
script: Script.resolvePath("../tablet-ui/HomeButton.js") script: Script.resolvePath("../tablet-ui/HomeButton.js")
}, clientOnly); }, clientOnly);
setEntityCustomData('grabbableKey', this.homeButtonEntity, {wantsTrigger: true}); setEntityCustomData('grabbableKey', this.homeButtonEntity, {wantsTrigger: true});