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

minimize git diff

Browse source
This commit is contained in:
Dante Ruiz 2017-01-30 18:38:02 +00:00
parent 57a9d34cda
commit b264d84385
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/controllers/handControllerGrab.js
View file

@ -1510,7 +1510,7 @@ function MyController(hand) {
}; };
this.entityIsNearGrabbable = function(entityID, handPosition, maxDistance) { this.entityIsNearGrabbable = function(entityID, handPosition, maxDistance) {
if (!this.entityIsGrabbable(entityID)) { if (!this.entityIsGrabbable(entityID)) {
return false; return false;
} }
@ -2264,7 +2264,7 @@ function MyController(hand) {
this.clearEquipHaptics(); this.clearEquipHaptics();
this.shouldScale = false; this.shouldScale = false;
Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand); Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
if (this.entityActivated) { if (this.entityActivated) {
@ -2394,7 +2394,7 @@ function MyController(hand) {
this.nearGrabbing = function(deltaTime, timestamp) { this.nearGrabbing = function(deltaTime, timestamp) {
this.grabPointSphereOff(); this.grabPointSphereOff();
if (this.state == STATE_NEAR_GRABBING && (!this.triggerClicked && this.secondaryReleased())) { if (this.state == STATE_NEAR_GRABBING && (!this.triggerClicked && this.secondaryReleased())) {
this.callEntityMethodOnGrabbed("releaseGrab"); this.callEntityMethodOnGrabbed("releaseGrab");
this.setState(STATE_OFF, "trigger released"); this.setState(STATE_OFF, "trigger released");

2
scripts/system/edit.js
View file

@ -191,7 +191,7 @@ var toolBar = (function () {
selectionManager.clearSelections(); selectionManager.clearSelections();
entityListTool.sendUpdate(); entityListTool.sendUpdate();
selectionManager.setSelections([entityID]); selectionManager.setSelections([entityID]);
return entityID; return entityID;
} }