Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 04:57:25 +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:33:56 +00:00
parent 8879727d88
commit 57a9d34cda
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

1
scripts/system/edit.js
View file

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