Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 03:35:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Comply with review comments

Browse source
This commit is contained in:
luiscuenca 2018-09-11 12:23:25 -07:00
parent 82b662d08e
commit fedea6e84d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MyAvatar.cpp
View file

@ -3311,8 +3311,10 @@ QVariantMap MyAvatar::getCollisionCapsule() {
glm::vec3 start, end; glm::vec3 start, end;
float radius; float radius;
getCapsule(start, end, radius); getCapsule(start, end, radius);
QVariantMap capsule; QVariantMap capsule;
capsule["height"] = QVariant(glm::length(start - end)); capsule["start"] = vec3toVariant(start);
capsule["end"] = vec3toVariant(end);
capsule["radius"] = QVariant(radius); capsule["radius"] = QVariant(radius);
return capsule; return capsule;
} }

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

@ -224,12 +224,12 @@ Script.include("/~/system/libraries/controllers.js");
var capsuleData = MyAvatar.getCollisionCapsule(); var capsuleData = MyAvatar.getCollisionCapsule();
var radius = capsuleData.radius / MyAvatar.scale; var radius = capsuleData.radius / MyAvatar.scale;
var height = (capsuleData.height + (capsuleData.radius * 2.0)) / MyAvatar.scale; var height = (Vec3.distance(capsuleData.start, capsuleData.end) + (capsuleData.radius * 2.0)) / MyAvatar.scale;
_this.teleportHandCollisionPick = Picks.createPick(PickType.Collision, { _this.teleportHandCollisionPick = Picks.createPick(PickType.Collision, {
enabled: true, enabled: true,
parentID: Pointers.getPointerProperties(_this.teleportParabolaHandInvisible).renderStates["invisible"].end, parentID: Pointers.getPointerProperties(_this.teleportParabolaHandInvisible).renderStates["invisible"].end,
filter: Picks.PICK_ENTITIES + Picks.PICK_AVATARS, filter: Picks.PICK_ENTITIES | Picks.PICK_AVATARS,
shape: { shape: {
shapeType: "capsule-y", shapeType: "capsule-y",
dimensions: { dimensions: {
@ -245,7 +245,7 @@ Script.include("/~/system/libraries/controllers.js");
_this.teleportHeadCollisionPick = Picks.createPick(PickType.Collision, { _this.teleportHeadCollisionPick = Picks.createPick(PickType.Collision, {
enabled: true, enabled: true,
parentID: Pointers.getPointerProperties(_this.teleportParabolaHeadInvisible).renderStates["invisible"].end, parentID: Pointers.getPointerProperties(_this.teleportParabolaHeadInvisible).renderStates["invisible"].end,
filter: Picks.PICK_ENTITIES + Picks.PICK_AVATARS, filter: Picks.PICK_ENTITIES | Picks.PICK_AVATARS,
shape: { shape: {
shapeType: "capsule-y", shapeType: "capsule-y",
dimensions: { dimensions: {