History

Comply with review comments

luiscuenca committed 8 years ago

Commit fedea6e1 parent 82b662d2 files · +6 −4Browse files

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

Unified · Split

scripts/system/controllers/controllerModules/teleport.js+3−3
@@ -224,12 +224,12 @@ Script.include("/~/system/libraries/controllers.js"); · 223 unmodified lines
224224 var capsuleData = MyAvatar.getCollisionCapsule();
225225
226226 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;
228228
229229 _this.teleportHandCollisionPick = Picks.createPick(PickType.Collision, {
230230 enabled: true,
231231 parentID: Pointers.getPointerProperties(_this.teleportParabolaHandInvisible).renderStates["invisible"].end,
232− filter: Picks.PICK_ENTITIES + Picks.PICK_AVATARS,
232+ filter: Picks.PICK_ENTITIES | Picks.PICK_AVATARS,
233233 shape: {
234234 shapeType: "capsule-y",
235235 dimensions: {
@@ -245,7 +245,7 @@ Script.include("/~/system/libraries/controllers.js"); · 9 unmodified lines
245245 _this.teleportHeadCollisionPick = Picks.createPick(PickType.Collision, {
246246 enabled: true,
247247 parentID: Pointers.getPointerProperties(_this.teleportParabolaHeadInvisible).renderStates["invisible"].end,
248− filter: Picks.PICK_ENTITIES + Picks.PICK_AVATARS,
248+ filter: Picks.PICK_ENTITIES | Picks.PICK_AVATARS,
249249 shape: {
250250 shapeType: "capsule-y",
251251 dimensions: {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t