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

making requested changes

Browse source
This commit is contained in:
Dante Ruiz 2018-04-11 14:42:26 -07:00
parent ba9d5d18bc
commit 7243160dac
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/system/controllers/controllerModules/highlightNearbyEntities.js
View file

@ -44,16 +44,16 @@
this.isGrabable = function(controllerData, props) { this.isGrabable = function(controllerData, props) {
var entityIsGrabable = false; var canGrabEntity = false;
if (dispatcherUtils.entityIsGrabbable(props) || entityIsCloneable(props)) { if (dispatcherUtils.entityIsGrabbable(props) || entityIsCloneable(props)) {
// if we've attempted to grab a child, roll up to the root of the tree // if we've attempted to grab a child, roll up to the root of the tree
var groupRootProps = dispatcherUtils.findGroupParent(controllerData, props); var groupRootProps = dispatcherUtils.findGroupParent(controllerData, props);
entityIsGrabable = true; canGrabEntity = true;
if (!dispatcherUtils.entityIsGrabbable(groupRootProps)) { if (!dispatcherUtils.entityIsGrabbable(groupRootProps)) {
entityIsGrabable = false; canGrabEntity = false;
} }
} }
return entityIsGrabable; return canGrabEntity;
}; };
this.hasHyperLink = function(props) { this.hasHyperLink = function(props) {

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

@ -29,9 +29,9 @@
this.isReady = function(controllerData) { this.isReady = function(controllerData) {
if (HMD.active) { if (HMD.active) {
print("????");
if (this.highlightedEntity) { if (this.highlightedEntity) {
// unhighlight entity dispatcherUtils.unhighlightTargetEntity(this.highlightedEntity);
this.highlightedEntity = null;
} }
} else { } else {
var pickResult = controllerData.mouseRayPick; var pickResult = controllerData.mouseRayPick;