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

Add Avatar resize compatible teleport.js pad scale

Browse source
This commit is contained in:
Daniela 2017-09-06 19:45:03 +01:00
parent 2f850826f2
commit 0ac7e00612
1 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -245,13 +245,49 @@ function Teleporter() {
Script.clearTimeout(coolInTimeout); Script.clearTimeout(coolInTimeout);
} }
// DAANTJE
// pad scale with avatar size
var AVATAR_PROPORTIONAL_TARGET_MODEL_DIMENTIONS = Vec3.multiply(MyAvatar.sensorToWorldScale, TARGET_MODEL_DIMENSIONS);
if (!Vec3.equal(AVATAR_PROPORTIONAL_TARGET_MODEL_DIMENTIONS, cancelEnd.dimensions)) {
cancelEnd.dimensions = AVATAR_PROPORTIONAL_TARGET_MODEL_DIMENTIONS;
teleportEnd.dimensions = AVATAR_PROPORTIONAL_TARGET_MODEL_DIMENTIONS;
seatEnd.dimensions = AVATAR_PROPORTIONAL_TARGET_MODEL_DIMENTIONS;
teleportRenderStates = [{name: "cancel", path: cancelPath, end: cancelEnd},
{name: "teleport", path: teleportPath, end: teleportEnd},
{name: "seat", path: seatPath, end: seatEnd}];
LaserPointers.editRenderState(this.teleportRayLeftVisible, "cancel", teleportRenderStates[0]);
LaserPointers.editRenderState(this.teleportRayLeftInvisible, "cancel", teleportRenderStates[0]);
LaserPointers.editRenderState(this.teleportRayRightVisible, "cancel", teleportRenderStates[0]);
LaserPointers.editRenderState(this.teleportRayRightInvisible, "cancel", teleportRenderStates[0]);
LaserPointers.editRenderState(this.teleportRayHeadVisible, "cancel", teleportRenderStates[0]);
LaserPointers.editRenderState(this.teleportRayHeadInvisible, "cancel", teleportRenderStates[0]);
LaserPointers.editRenderState(this.teleportRayLeftVisible, "teleport", teleportRenderStates[1]);
LaserPointers.editRenderState(this.teleportRayLeftInvisible, "teleport", teleportRenderStates[1]);
LaserPointers.editRenderState(this.teleportRayRightVisible, "teleport", teleportRenderStates[1]);
LaserPointers.editRenderState(this.teleportRayRightInvisible, "teleport", teleportRenderStates[1]);
LaserPointers.editRenderState(this.teleportRayHeadVisible, "teleport", teleportRenderStates[1]);
LaserPointers.editRenderState(this.teleportRayHeadInvisible, "teleport", teleportRenderStates[1]);
LaserPointers.editRenderState(this.teleportRayLeftVisible, "seat", teleportRenderStates[2]);
LaserPointers.editRenderState(this.teleportRayLeftInvisible, "seat", teleportRenderStates[2]);
LaserPointers.editRenderState(this.teleportRayRightVisible, "seat", teleportRenderStates[2]);
LaserPointers.editRenderState(this.teleportRayRightInvisible, "seat", teleportRenderStates[2]);
LaserPointers.editRenderState(this.teleportRayHeadVisible, "seat", teleportRenderStates[2]);
LaserPointers.editRenderState(this.teleportRayHeadInvisible, "seat", teleportRenderStates[2]);
}
this.state = TELEPORTER_STATES.COOL_IN; this.state = TELEPORTER_STATES.COOL_IN;
coolInTimeout = Script.setTimeout(function() { coolInTimeout = Script.setTimeout(function() {
if (_this.state === TELEPORTER_STATES.COOL_IN) { if (_this.state === TELEPORTER_STATES.COOL_IN) {
_this.state = TELEPORTER_STATES.TARGETTING; _this.state = TELEPORTER_STATES.TARGETTING;
} }
}, COOL_IN_DURATION); }, COOL_IN_DURATION);
this.activeHand = hand; this.activeHand = hand;
this.enableMappings(); this.enableMappings();
Script.update.connect(this, this.update); Script.update.connect(this, this.update);