Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-30 18:50:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12206 from druiz17/fix-reduce-calls-isPointOnDesktopWindow

Browse source 
reduce calls to isPointOnDesktopWindow in controllerModules
This commit is contained in:
Ryan Downe Karpf 2018-01-19 10:44:57 -08:00 committed by GitHub
commit 08b4c6eb40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/system/controllers/controllerModules/farActionGrabEntity.js
View file

@ -370,6 +370,7 @@ Script.include("/~/system/libraries/Xform.js");
};
this.isReady = function (controllerData) {
if (HMD.active) {
if (this.notPointingAtEntity(controllerData)) {
return makeRunningValues(false, [], []);
}
@ -384,6 +385,8 @@ Script.include("/~/system/libraries/Xform.js");
this.destroyContextOverlay();
return makeRunningValues(false, [], []);
}
}
return makeRunningValues(false, [], []);
};
this.run = function (controllerData) {

2
scripts/system/controllers/controllerModules/hudOverlayPointer.js
View file

@ -89,7 +89,7 @@
this.isReady = function (controllerData) {
var otherModuleRunning = this.getOtherModule().running;
if (!otherModuleRunning) {
if (!otherModuleRunning && HMD.active) {
if (this.processLaser(controllerData)) {
this.running = true;
return ControllerDispatcherUtils.makeRunningValues(true, [], []);