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

Reinstate nearParentGrabOverlay controller module

Browse source 
Fixes regression where tablet becomes large when grabbed if avatar is
small.
This commit is contained in:
David Rowe 2020-05-26 14:58:13 +12:00
parent 7634478aba
commit c05225ca2f
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -323,7 +323,6 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
} }
var nearbyEntityIDs = Entities.findEntities(controllerPosition, findRadius); var nearbyEntityIDs = Entities.findEntities(controllerPosition, findRadius);
nearbyEntityIDs = nearbyEntityIDs.concat(nearbyOverlayIDs[h]); // overlays are now entities
for (var j = 0; j < nearbyEntityIDs.length; j++) { for (var j = 0; j < nearbyEntityIDs.length; j++) {
var entityID = nearbyEntityIDs[j]; var entityID = nearbyEntityIDs[j];

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

@ -18,6 +18,7 @@ var CONTOLLER_SCRIPTS = [
//"toggleAdvancedMovementForHandControllers.js", //"toggleAdvancedMovementForHandControllers.js",
"handTouch.js", "handTouch.js",
"controllerDispatcher.js", "controllerDispatcher.js",
"controllerModules/nearParentGrabOverlay.js",
"controllerModules/stylusInput.js", "controllerModules/stylusInput.js",
"controllerModules/equipEntity.js", "controllerModules/equipEntity.js",
"controllerModules/nearTrigger.js", "controllerModules/nearTrigger.js",