Showing the changes to scripts/system/controllers/controllerModules (1 of 2 files). Show all
Unified · Split
| @@ -224,12 +224,12 @@ Script.include("/~/system/libraries/controllers.js"); · 223 unmodified lines | |||
| 224 | var capsuleData = MyAvatar.getCollisionCapsule(); | 224 | var capsuleData = MyAvatar.getCollisionCapsule(); |
| 225 | 225 | ||
| 226 | var radius = capsuleData.radius / MyAvatar.scale; | 226 | var radius = capsuleData.radius / MyAvatar.scale; |
| 227 | var height = (capsuleData.height + (capsuleData.radius * 2.0)) / MyAvatar.scale; | 227 | var height = (Vec3.distance(capsuleData.start, capsuleData.end) + (capsuleData.radius * 2.0)) / MyAvatar.scale; |
| 228 | 228 | ||
| 229 | _this.teleportHandCollisionPick = Picks.createPick(PickType.Collision, { | 229 | _this.teleportHandCollisionPick = Picks.createPick(PickType.Collision, { |
| 230 | enabled: true, | 230 | enabled: true, |
| 231 | parentID: Pointers.getPointerProperties(_this.teleportParabolaHandInvisible).renderStates["invisible"].end, | 231 | parentID: Pointers.getPointerProperties(_this.teleportParabolaHandInvisible).renderStates["invisible"].end, |
| 232 | filter: Picks.PICK_ENTITIES + Picks.PICK_AVATARS, | 232 | filter: Picks.PICK_ENTITIES | Picks.PICK_AVATARS, |
| 233 | shape: { | 233 | shape: { |
| 234 | shapeType: "capsule-y", | 234 | shapeType: "capsule-y", |
| 235 | dimensions: { | 235 | dimensions: { |
| @@ -245,7 +245,7 @@ Script.include("/~/system/libraries/controllers.js"); · 9 unmodified lines | |||
| 245 | _this.teleportHeadCollisionPick = Picks.createPick(PickType.Collision, { | 245 | _this.teleportHeadCollisionPick = Picks.createPick(PickType.Collision, { |
| 246 | enabled: true, | 246 | enabled: true, |
| 247 | parentID: Pointers.getPointerProperties(_this.teleportParabolaHeadInvisible).renderStates["invisible"].end, | 247 | parentID: Pointers.getPointerProperties(_this.teleportParabolaHeadInvisible).renderStates["invisible"].end, |
| 248 | filter: Picks.PICK_ENTITIES + Picks.PICK_AVATARS, | 248 | filter: Picks.PICK_ENTITIES | Picks.PICK_AVATARS, |
| 249 | shape: { | 249 | shape: { |
| 250 | shapeType: "capsule-y", | 250 | shapeType: "capsule-y", |
| 251 | dimensions: { | 251 | dimensions: { |