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

Update teleport script to handle detecting seats

Browse source
This commit is contained in:
Ryan Huffman 2017-02-14 10:33:08 -08:00 committed by Atlante45
parent 9197819291
commit c632884aac
1 changed files with 50 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
scripts/system/controllers/teleport.js
View file

@ -24,6 +24,12 @@ var TARGET_MODEL_DIMENSIONS = {
z: 1.15 z: 1.15
}; };
var COLORS_TELEPORT_SEAT = {
red: 0,
green: 0,
blue: 255
}
var COLORS_TELEPORT_CAN_TELEPORT = { var COLORS_TELEPORT_CAN_TELEPORT = {
red: 97, red: 97,
green: 247, green: 247,
@ -36,7 +42,7 @@ var COLORS_TELEPORT_CANNOT_TELEPORT = {
blue: 141 blue: 141
}; };
var COLORS_TELEPORT_TOO_CLOSE = { var COLORS_TELEPORT_CANCEL = {
red: 255, red: 255,
green: 184, green: 184,
blue: 73 blue: 73
@ -94,6 +100,7 @@ var TARGET = {
function Teleporter() { function Teleporter() {
var _this = this; var _this = this;
this.active = false;
this.state = TELEPORTER_STATES.IDLE; this.state = TELEPORTER_STATES.IDLE;
this.currentTarget = TARGET.INVALID; this.currentTarget = TARGET.INVALID;
@ -138,7 +145,7 @@ function Teleporter() {
this.hideOverlayBeams(); this.hideOverlayBeams();
if (this.updateConnected === true) { if (this.updateConnected === true) {
Script.update.disconnect(this.update); Script.update.disconnect(this, this.update);
} }
}; };
@ -165,13 +172,13 @@ function Teleporter() {
this.activeHand = hand; this.activeHand = hand;
this.enableMappings(); this.enableMappings();
Script.update.connect(this.update); Script.update.connect(this, this.update);
this.updateConnected = true; this.updateConnected = true;
}; };
this.exitTeleportMode = function(value) { this.exitTeleportMode = function(value) {
if (this.updateConnected === true) { if (this.updateConnected === true) {
Script.update.disconnect(this.update); Script.update.disconnect(this, this.update);
} }
this.disableMappings(); this.disableMappings();
@ -184,14 +191,6 @@ function Teleporter() {
inTeleportMode = false; inTeleportMode = false;
}; };
this.hideCancelOverlay = function() {
Overlays.editOverlay(this.cancelOverlay, { visible: false });
}
this.hideTargetOverlay = function() {
Overlays.editOverlay(this.targetOverlay, { visible: false });
}
this.hideOverlayBeams = function() { this.hideOverlayBeams = function() {
for (key in this.overlayLines) { for (key in this.overlayLines) {
if (this.overlayLines[key] !== null) { if (this.overlayLines[key] !== null) {
@ -223,22 +222,21 @@ function Teleporter() {
var intersection = Entities.findRayIntersection(pickRay, true, [], [this.targetEntity], true, true); var intersection = Entities.findRayIntersection(pickRay, true, [], [this.targetEntity], true, true);
var isValidTeleportLocation = false;
var teleportLocationType = getTeleportTargetType(intersection); var teleportLocationType = getTeleportTargetType(intersection);
if (teleportLocationType === TARGET.NONE) { if (teleportLocationType === TARGET.NONE) {
this.hideTargetOverlay(); _this.hideTargetOverlay();
var farPosition = Vec3.sum(pickRay.origin, Vec3.multiply(pickRay.direction, 50)); var farPosition = Vec3.sum(pickRay.origin, Vec3.multiply(pickRay.direction, 50));
this.updateLineOverlay(_this.activeHand, pickRay.origin, farPosition, COLORS_TELEPORT_CANNOT_TELEPORT); this.updateLineOverlay(_this.activeHand, pickRay.origin, farPosition, COLORS_TELEPORT_CANNOT_TELEPORT);
} else if (teleportLocationType === TARGET.INVALID) { } else if (teleportLocationType === TARGET.INVALID) {
this.hideTargetOverlay(); this.hideTargetOverlay();
this.updateLineOverlay(_this.activeHand, pickRay.origin, intersection.intersection, COLORS_TELEPORT_TOO_CLOSE); this.updateLineOverlay(_this.activeHand, pickRay.origin, intersection.intersection, COLORS_TELEPORT_CANCEL);
this.updateCancelOverlay(intersection); this.updateCancelOverlay(intersection);
} else if (teleportLocationType === TARGET.SURFACE) { } else if (teleportLocationType === TARGET.SURFACE) {
if (this.state === TELEPORTER_STATES.COOL_IN) { if (this.state === TELEPORTER_STATES.COOL_IN) {
this.hideTargetOverlay(); this.hideTargetOverlay();
this.updateLineOverlay(_this.activeHand, pickRay.origin, intersection.intersection, COLORS_TELEPORT_TOO_CLOSE); this.updateLineOverlay(_this.activeHand, pickRay.origin, intersection.intersection, COLORS_TELEPORT_CANCEL);
this.updateCancelOverlay(intersection); this.updateCancelOverlay(intersection);
} else { } else {
this.hideCancelOverlay(); this.hideCancelOverlay();
@ -247,25 +245,29 @@ function Teleporter() {
this.updateTargetOverlay(intersection); this.updateTargetOverlay(intersection);
} }
} else if (teleportLocationType === TARGET.SEAT) { } else if (teleportLocationType === TARGET.SEAT) {
this.hideCancelOverlay();
this.updateLineOverlay(_this.activeHand, pickRay.origin, intersection.intersection, COLORS_TELEPORT_SEAT);
this.updateTargetOverlay(intersection);
} }
if (((_this.activeHand == 'left' ? leftPad : rightPad).buttonValue === 0) && inTeleportMode === true) { if (((_this.activeHand == 'left' ? leftPad : rightPad).buttonValue === 0) && inTeleportMode === true) {
_this.exitTeleportMode(); _this.exitTeleportMode();
if (isValidTeleportLocation === true) {
_this.exitTeleportMode();
_this.hideCancelOverlay(); _this.hideCancelOverlay();
return; _this.hideTargetOverlay();
}
if (teleportLocationType === TARGET.NONE || teleportLocationType === TARGET.INVALID || this.state === TELEPORTER_STATES.COOL_IN) {
// Do nothing
} else if (teleportLocationType === TARGET.SEAT) {
Entities.callEntityMethod(intersection.entityID, 'sit');
} else if (teleportLocationType === TARGET.SURFACE) {
var offset = getAvatarFootOffset(); var offset = getAvatarFootOffset();
intersection.intersection.y += offset; intersection.intersection.y += offset;
_this.exitTeleportMode(); MyAvatar.position = intersection.intersection;
_MyAvatar.position = intersection.intersection;
_this.hideTargetOverlay();
_this.hideCancelOverlay();
HMD.centerUI(); HMD.centerUI();
} }
}
}; };
this.updateLineOverlay = function(hand, closePoint, farPoint, color) { this.updateLineOverlay = function(hand, closePoint, farPoint, color) {
@ -293,6 +295,14 @@ function Teleporter() {
} }
}; };
this.hideCancelOverlay = function() {
Overlays.editOverlay(this.cancelOverlay, { visible: false });
};
this.hideTargetOverlay = function() {
Overlays.editOverlay(this.targetOverlay, { visible: false });
};
this.updateTargetOverlay = function(intersection) { this.updateTargetOverlay = function(intersection) {
var rotation = Quat.lookAt(intersection.intersection, MyAvatar.position, Vec3.UP); var rotation = Quat.lookAt(intersection.intersection, MyAvatar.position, Vec3.UP);
var euler = Quat.safeEulerAngles(rotation); var euler = Quat.safeEulerAngles(rotation);
@ -340,20 +350,16 @@ function getAvatarFootOffset() {
var jointName = d.joint; var jointName = d.joint;
if (jointName === "RightUpLeg") { if (jointName === "RightUpLeg") {
upperLeg = d.translation.y; upperLeg = d.translation.y;
} } else if (jointName === "RightLeg") {
if (jointName === "RightLeg") {
lowerLeg = d.translation.y; lowerLeg = d.translation.y;
} } else if (jointName === "RightFoot") {
if (jointName === "RightFoot") {
foot = d.translation.y; foot = d.translation.y;
} } else if (jointName === "RightToeBase") {
if (jointName === "RightToeBase") {
toe = d.translation.y; toe = d.translation.y;
} } else if (jointName === "RightToe_End") {
if (jointName === "RightToe_End") {
toeTop = d.translation.y; toeTop = d.translation.y;
} }
}) });
var offset = upperLeg + lowerLeg + foot + toe + toeTop; var offset = upperLeg + lowerLeg + foot + toe + toeTop;
offset = offset / 100; offset = offset / 100;
@ -407,25 +413,28 @@ function parseJSON(json) {
// point that is being intersected with is looked at. If this normal is more // point that is being intersected with is looked at. If this normal is more
// than MAX_ANGLE_FROM_UP_TO_TELEPORT degrees from <0, 1, 0> (straight up), then // than MAX_ANGLE_FROM_UP_TO_TELEPORT degrees from <0, 1, 0> (straight up), then
// you can't teleport there. // you can't teleport there.
var MAX_ANGLE_FROM_UP_TO_TELEPORT = 70; const MAX_ANGLE_FROM_UP_TO_TELEPORT = 70;
function getTeleportTargetType(intersection) { function getTeleportTargetType(intersection) {
if (!intersection.intersects) { if (!intersection.intersects) {
return TARGET.NONE; return TARGET.NONE;
} }
var data = Entities.getEntityProperties(intersection.entityID, 'userData').userData; var userData = Entities.getEntityProperties(intersection.entityID, 'userData').userData;
var data = parseJSON(userData);
print("Data is:", intersection.entityID, userData);
if (data !== undefined && data.seat !== undefined) { if (data !== undefined && data.seat !== undefined) {
return TARGET.SEAT; return TARGET.SEAT;
} }
var surfaceNormal = intersection.surfaceNormal;
var adj = Math.sqrt(surfaceNormal.x * surfaceNormal.x + surfaceNormal.z * surfaceNormal.z); var adj = Math.sqrt(surfaceNormal.x * surfaceNormal.x + surfaceNormal.z * surfaceNormal.z);
var angleUp = Math.atan2(surfaceNormal.y, adj) * (180 / Math.PI); var angleUp = Math.atan2(surfaceNormal.y, adj) * (180 / Math.PI);
if (angleUp < (90 - MAX_ANGLE_FROM_UP_TO_TELEPORT) || if (angleUp < (90 - MAX_ANGLE_FROM_UP_TO_TELEPORT) ||
angleUp > (90 + MAX_ANGLE_FROM_UP_TO_TELEPORT) || angleUp > (90 + MAX_ANGLE_FROM_UP_TO_TELEPORT) ||
Vec3.distance(MyAvatar.position, intersection.intersection) <= TELEPORT_CANCEL_RANGE) { Vec3.distance(MyAvatar.position, intersection.intersection) <= TELEPORT_CANCEL_RANGE) {
return TARGET.SURFACE;
} else {
return TARGET.INVALID; return TARGET.INVALID;
} else {
return TARGET.SURFACE;
} }
}; };