History

use correct capsule dimensions in teleport.js

Andrew Meadows committed 8 years ago

Commit b38c2631 parent 6ecf8501 file · +9 −9Browse files

Showing the changes to scripts/system/controllers/controllerModules (1 of 1 file). Show all

Unified · Split

scripts/system/controllers/controllerModules/teleport.js+9−9
@@ -358,9 +358,9 @@ Script.include("/~/system/libraries/controllers.js"); · 357 unmodified lines
358358
359359 var sensorToWorldScale = MyAvatar.getSensorToWorldScale();
360360
361− var radius = capsuleData.radius / sensorToWorldScale;
362− var height = (Vec3.distance(capsuleData.start, capsuleData.end) + (capsuleData.radius * 2.0)) / sensorToWorldScale;
363− var capsuleRatio = 10.0 * radius / height;
361+ var diameter = 2.0 * capsuleData.radius / sensorToWorldScale;
362+ var height = (Vec3.distance(capsuleData.start, capsuleData.end) + diameter) / sensorToWorldScale;
363+ var capsuleRatio = 5.0 * diameter / height;
364364 var offset = _this.pickHeightOffset * capsuleRatio;
365365
366366 _this.teleportHandCollisionPick = Picks.createPick(PickType.Collision, {
@@ -370,9 +370,9 @@ Script.include("/~/system/libraries/controllers.js"); · 3 unmodified lines
370370 shape: {
371371 shapeType: "capsule-y",
372372 dimensions: {
373− x: radius * 2.0,
374− y: height - (radius * 2.0),
375− z: radius * 2.0
373+ x: diameter,
374+ y: height,
375+ z: diameter
376376 }
377377 },
378378 position: { x: 0, y: offset + height * 0.5, z: 0 },
@@ -386,9 +386,9 @@ Script.include("/~/system/libraries/controllers.js"); · 7 unmodified lines
386386 shape: {
387387 shapeType: "capsule-y",
388388 dimensions: {
389− x: radius * 2.0,
390− y: height - (radius * 2.0),
391− z: radius * 2.0
389+ x: diameter,
390+ y: height,
391+ z: diameter
392392 }
393393 },
394394 position: { x: 0, y: offset + height * 0.5, z: 0 },