Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-28 19:58:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

working second model adjustment with hack but wtf

Browse source
This commit is contained in:
James B. Pollack 2016-07-05 17:30:17 -07:00
parent c78dbe26b6
commit 26950eaaa6
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/system/controllers/teleport.js
View file

@ -44,7 +44,7 @@ var BEAM_MODEL_URL_NO_INTERSECTION = "http://hifi-content.s3.amazonaws.com/james
var STRETCHY_BEAM_DIMENSIONS_X = 0.04; var STRETCHY_BEAM_DIMENSIONS_X = 0.04;
var STRETCHY_BEAM_DIMENSIONS_Y = 0.04; var STRETCHY_BEAM_DIMENSIONS_Y = 0.04;
var STRETCHY_BEAM_DIMENSIONS_Z_NO_INTESECTION = 10; var STRETCHY_BEAM_DIMENSIONS_Z_NO_INTESECTION = 20;
var TARGET_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/james/teleporter/Tele-destiny.fbx'; var TARGET_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/james/teleporter/Tele-destiny.fbx';
var TARGET_MODEL_DIMENSIONS = { var TARGET_MODEL_DIMENSIONS = {
@ -185,7 +185,7 @@ function Teleporter() {
y: STRETCHY_BEAM_DIMENSIONS_Y, y: STRETCHY_BEAM_DIMENSIONS_Y,
z: Vec3.distance(handPosition, intersection.intersection) z: Vec3.distance(handPosition, intersection.intersection)
}; };
print('dimensions in update:: ' + JSON.stringify(dimensions));
var position = _this.findMidpoint(handPosition, intersection); var position = _this.findMidpoint(handPosition, intersection);
Overlays.editOverlay(_this.stretchyBeam, { Overlays.editOverlay(_this.stretchyBeam, {
@ -220,7 +220,7 @@ function Teleporter() {
var dimensions = { var dimensions = {
x: 0.04, x: 0.04,
y: 0.04, y: 0.04,
z: Vec3.distance(handPosition, ahead) z:0.1
}; };
@ -258,9 +258,10 @@ function Teleporter() {
y: STRETCHY_BEAM_DIMENSIONS_Y, y: STRETCHY_BEAM_DIMENSIONS_Y,
z: Vec3.distance(handPosition, ahead) z: Vec3.distance(handPosition, ahead)
}; };
dimensions=Vec3.multiply(10,dimensions)
print('dimensions in update:: ' + JSON.stringify(dimensions)); print('dimensions in update:: ' + JSON.stringify(dimensions));
var finalRotation = Quat.multiply(rotation, Quat.angleAxis(180, { var finalRotation = Quat.multiply(rotation, Quat.angleAxis(180, {
x: 0, x: 0,
y: 1, y: 1,