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

use correct capsule dimensions in teleport.js

Browse source
This commit is contained in:
Andrew Meadows 2018-11-06 12:44:14 -08:00
parent 6ecf850159
commit b38c263e60
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/system/controllers/controllerModules/teleport.js
View file

@ -358,9 +358,9 @@ Script.include("/~/system/libraries/controllers.js");
var sensorToWorldScale = MyAvatar.getSensorToWorldScale(); var sensorToWorldScale = MyAvatar.getSensorToWorldScale();
var radius = capsuleData.radius / sensorToWorldScale; var diameter = 2.0 * capsuleData.radius / sensorToWorldScale;
var height = (Vec3.distance(capsuleData.start, capsuleData.end) + (capsuleData.radius * 2.0)) / sensorToWorldScale; var height = (Vec3.distance(capsuleData.start, capsuleData.end) + diameter) / sensorToWorldScale;
var capsuleRatio = 10.0 * radius / height; var capsuleRatio = 5.0 * diameter / height;
var offset = _this.pickHeightOffset * capsuleRatio; var offset = _this.pickHeightOffset * capsuleRatio;
_this.teleportHandCollisionPick = Picks.createPick(PickType.Collision, { _this.teleportHandCollisionPick = Picks.createPick(PickType.Collision, {
@ -370,9 +370,9 @@ Script.include("/~/system/libraries/controllers.js");
shape: { shape: {
shapeType: "capsule-y", shapeType: "capsule-y",
dimensions: { dimensions: {
x: radius * 2.0, x: diameter,
y: height - (radius * 2.0), y: height,
z: radius * 2.0 z: diameter
} }
}, },
position: { x: 0, y: offset + height * 0.5, z: 0 }, position: { x: 0, y: offset + height * 0.5, z: 0 },
@ -386,9 +386,9 @@ Script.include("/~/system/libraries/controllers.js");
shape: { shape: {
shapeType: "capsule-y", shapeType: "capsule-y",
dimensions: { dimensions: {
x: radius * 2.0, x: diameter,
y: height - (radius * 2.0), y: height,
z: radius * 2.0 z: diameter
} }
}, },
position: { x: 0, y: offset + height * 0.5, z: 0 }, position: { x: 0, y: offset + height * 0.5, z: 0 },