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

editing seletion style

Browse source
This commit is contained in:
Dante Ruiz 2018-04-04 12:55:28 -07:00
parent c9c3d8f332
commit 42149e295d
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -402,6 +402,8 @@ Script.include("/~/system/libraries/Xform.js");
if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE || if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE ||
this.notPointingAtEntity(controllerData) || this.targetIsNull()) { this.notPointingAtEntity(controllerData) || this.targetIsNull()) {
this.endNearGrabAction(); this.endNearGrabAction();
Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity",
this.highlightedEntity);
return makeRunningValues(false, [], []); return makeRunningValues(false, [], []);
} }
this.intersectionDistance = controllerData.rayPicks[this.hand].distance; this.intersectionDistance = controllerData.rayPicks[this.hand].distance;
@ -571,6 +573,8 @@ Script.include("/~/system/libraries/Xform.js");
if (disableModule) { if (disableModule) {
if (disableModule.disableModules) { if (disableModule.disableModules) {
this.endNearGrabAction(); this.endNearGrabAction();
Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity",
this.highlightedEntity);
return makeRunningValues(false, [], []); return makeRunningValues(false, [], []);
} }
} }

12
scripts/system/libraries/controllerDispatcherUtils.js
View file

@ -93,14 +93,14 @@ TEAR_AWAY_CHECK_TIME = 0.15; // seconds, duration between checks
DISPATCHER_HOVERING_LIST = "dispactherHoveringList"; DISPATCHER_HOVERING_LIST = "dispactherHoveringList";
DISPATCHER_HOVERING_STYLE = { DISPATCHER_HOVERING_STYLE = {
isOutlineSmooth: true, isOutlineSmooth: true,
outlineWidth: 5, outlineWidth: 0,
outlineUnoccludedColor: {red: 255, green: 128, blue: 128}, outlineUnoccludedColor: {red: 255, green: 128, blue: 128},
outlineUnoccludedAlpha: 0.88, outlineUnoccludedAlpha: 0,
outlineOccludedColor: {red: 255, green: 128, blue: 128}, outlineOccludedColor: {red: 255, green: 128, blue: 128},
outlineOccludedAlpha:0.5, outlineOccludedAlpha:0.0,
fillUnoccludedColor: {red: 26, green: 0, blue: 0}, fillUnoccludedColor: {red: 255, green: 255, blue: 255},
fillUnoccludedAlpha: 0.0, fillUnoccludedAlpha: 0.15,
fillOccludedColor: {red: 26, green: 0, blue: 0}, fillOccludedColor: {red: 255, green: 255, blue: 255},
fillOccludedAlpha: 0.0 fillOccludedAlpha: 0.0
}; };