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

fix merge problems

Browse source
This commit is contained in:
James B. Pollack 2015-12-22 17:22:55 -08:00
parent 46233b24c0
commit 4115138b5b
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/controllers/handControllerGrab.js
View file

@ -274,8 +274,6 @@ function MyController(hand) {
this.triggerValue = 0; // rolling average of trigger value
this.rawTriggerValue = 0;
this.rawBumperValue = 0;
<<<<<<< HEAD
//for visualizations
this.overlayLine = null;
this.particleBeam = null;
@ -283,9 +281,7 @@ function MyController(hand) {
//for lights
this.spotlight = null;
this.pointlight = null;
=======
this.overlayLine = null;
>>>>>>> master
this.ignoreIK = false;
this.offsetPosition = Vec3.ZERO;
@ -1085,7 +1081,6 @@ function MyController(hand) {
this.currentObjectRotation = Quat.multiply(handChange, this.currentObjectRotation);
Entities.callEntityMethod(this.grabbedEntity, "continueDistantGrab");
// mix in head motion
if (MOVE_WITH_HEAD) {
var objDistance = Vec3.length(objectToAvatar);