Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 06:20:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15105 from danteruiz/disable-entity-scaling

Browse source 
Case 20830: Disable entity scaling while grabbing
This commit is contained in:
Shannon Romano 2019-03-07 16:01:34 -08:00 committed by GitHub
commit b567fd6cac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ Script.include("/~/system/libraries/controllers.js");
var scaleModuleName = this.hand === RIGHT_HAND ? "RightScaleEntity" : "LeftScaleEntity"; var scaleModuleName = this.hand === RIGHT_HAND ? "RightScaleEntity" : "LeftScaleEntity";
var scaleModule = getEnabledModuleByName(scaleModuleName); var scaleModule = getEnabledModuleByName(scaleModuleName);
if (scaleModule.grabbedThingID || scaleModule.isReady(controllerData).active) { if (scaleModule && (scaleModule.grabbedThingID || scaleModule.isReady(controllerData).active)) {
// we're rescaling -- don't start a grab. // we're rescaling -- don't start a grab.
return makeRunningValues(false, [], []); return makeRunningValues(false, [], []);
} }

1
scripts/system/controllers/controllerScripts.js
View file

@ -30,7 +30,6 @@ var CONTOLLER_SCRIPTS = [
"controllerModules/teleport.js", "controllerModules/teleport.js",
"controllerModules/hudOverlayPointer.js", "controllerModules/hudOverlayPointer.js",
"controllerModules/mouseHMD.js", "controllerModules/mouseHMD.js",
"controllerModules/scaleEntity.js",
"controllerModules/nearGrabHyperLinkEntity.js", "controllerModules/nearGrabHyperLinkEntity.js",
"controllerModules/nearTabletHighlight.js", "controllerModules/nearTabletHighlight.js",
"controllerModules/nearGrabEntity.js", "controllerModules/nearGrabEntity.js",