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

saving changes

Browse source
This commit is contained in:
Dante Ruiz 2018-04-06 11:47:09 -07:00
parent 07b1a6be01
commit fd47832857
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,6 +125,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
};
Selection.enableListHighlight(DISPATCHER_HOVERING_LIST, DISPATCHER_HOVERING_STYLE);
Selection.enableListToScene(DISPATCHER_HOVERING_LIST);
this.updateTimings = function () {
_this.intervalCount++;

14
scripts/system/controllers/controllerModules/equipEntity.js
View file

@ -30,6 +30,7 @@ var UNEQUIPPING_INNER_COLOR = { red: 150, green: 0, blue: 0 };
var CIRCLE_3D_PROPERTIES = {
solid: true,
visible: false,
innerRadius: 0.0,
outerRadius: 1.0,
startAt: 0,
@ -182,7 +183,8 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
function EquipTimer(hand) {
this.hand = hand;
this.controllerTriggerPressed = false;
this.primaryTriggerPressed = false;
this.secondaryTriggerPressed = false;
this.equipTime = EQUIP_TIME;
this.currentTimeLapse = 0;
this.equip = true;
@ -192,6 +194,14 @@ function EquipTimer(hand) {
}
EquipTimer.prototype.update = function(deltaTime, timestamp, controllerData) {
/*var TRIGGER_ON_VALUE = 0.105;
var BUMPER_ON_VALUE = 0.5;
var primaryTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_ON_VALUE;
var secondaryTriggerPressed = controllerData.secondaryValues[this.hand] > BUMPER_ON_VALUE;
if (primaryTriggerPressed || secondaryTriggerPressed) {
if (primaryTriggerPressed === this.primaryTriggerPressed &&
*/
};
EquipTimer.prototype.finished = function() {
@ -662,7 +672,7 @@ EquipTimer.prototype.cleanup = function() {
}
equipHotspotBuddy.update(deltaTime, timestamp, controllerData);
this.equiptTimer.update(deltaTime, timestamp, controllerData);
// if the potentialHotspot is cloneable, clone it and return it
// if the potentialHotspot os not cloneable and locked return null

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

@ -45,8 +45,7 @@
this.highlightEntities = function(controllerData) {
if (this.highlightedEntities.length > 0) {
//print("-----> clearing
//dispatcherUtils.clearHighlightedEntities();
dispatcherUtils.clearHighlightedEntities();
this.highlightedEntities = [];
}