Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix entity highlighting during edit mode

Browse source
This commit is contained in:
Dante Ruiz 2018-05-04 08:53:49 -07:00
parent a6eab29b14
commit d44882e6dc
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/controllers/controllerModules/mouseHighlightEntities.js
View file

@ -12,10 +12,11 @@
/* jslint bitwise: true */ /* jslint bitwise: true */
/* global Script, print, Entities, Picks, HMD, Controller, MyAvatar*/ /* global Script, print, Entities, Picks, HMD, Controller, MyAvatar, isInEditMode*/
(function() { (function() {
Script.include("/~/system/libraries/utils.js");
var dispatcherUtils = Script.require("/~/system/libraries/controllerDispatcherUtils.js"); var dispatcherUtils = Script.require("/~/system/libraries/controllerDispatcherUtils.js");
function MouseHighlightEntities() { function MouseHighlightEntities() {
@ -39,7 +40,7 @@
dispatcherUtils.unhighlightTargetEntity(this.highlightedEntity); dispatcherUtils.unhighlightTargetEntity(this.highlightedEntity);
this.highlightedEntity = null; this.highlightedEntity = null;
} }
} else if (!this.grabbedEntity) { } else if (!this.grabbedEntity && !isInEditMode()) {
var pickResult = controllerData.mouseRayPick; var pickResult = controllerData.mouseRayPick;
if (pickResult.type === Picks.INTERSECTED_ENTITY) { if (pickResult.type === Picks.INTERSECTED_ENTITY) {
var targetEntityID = pickResult.objectID; var targetEntityID = pickResult.objectID;