mirror of
https://github.com/lubosz/overte.git
synced 2025-04-24 03:53:52 +02:00
Single reticle in the lobby
This commit is contained in:
parent
36eecf1d15
commit
0a4f74cf9c
1 changed files with 0 additions and 48 deletions
|
@ -13,7 +13,6 @@ Script.include("libraries/globals.js");
|
|||
|
||||
var panelWall = false;
|
||||
var orbShell = false;
|
||||
var reticle = false;
|
||||
var descriptionText = false;
|
||||
|
||||
// used for formating the description text, in meters
|
||||
|
@ -23,8 +22,6 @@ var numberOfLines = 2;
|
|||
var textMargin = 0.0625;
|
||||
var lineHeight = (textHeight - (2 * textMargin)) / numberOfLines;
|
||||
|
||||
var lastMouseMove = 0;
|
||||
var IDLE_HOVER_TIME = 2000; // if you haven't moved the mouse in 2 seconds, and in HMD mode, then we use reticle for hover
|
||||
var avatarStickPosition = {};
|
||||
|
||||
var orbNaturalExtentsMin = { x: -1.230354, y: -1.22077, z: -1.210487 };
|
||||
|
@ -57,13 +54,6 @@ var elevatorSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Lobby/eleva
|
|||
var currentMuzakInjector = null;
|
||||
var currentSound = null;
|
||||
|
||||
var inOculusMode = false;
|
||||
|
||||
function reticlePosition() {
|
||||
var RETICLE_DISTANCE = 1;
|
||||
return Vec3.sum(Camera.position, Vec3.multiply(Quat.getFront(Camera.orientation), RETICLE_DISTANCE));
|
||||
}
|
||||
|
||||
function textOverlayPosition() {
|
||||
var TEXT_DISTANCE_OUT = 6;
|
||||
var TEXT_DISTANCE_DOWN = -2;
|
||||
|
@ -124,22 +114,6 @@ function drawLobby() {
|
|||
panelWall = Overlays.addOverlay("model", panelWallProps);
|
||||
orbShell = Overlays.addOverlay("model", orbShellProps);
|
||||
descriptionText = Overlays.addOverlay("text3d", descriptionTextProps);
|
||||
|
||||
inOculusMode = Menu.isOptionChecked("Enable VR Mode");
|
||||
|
||||
// for HMD wearers, create a reticle in center of screen
|
||||
if (inOculusMode) {
|
||||
var CURSOR_SCALE = 0.025;
|
||||
|
||||
reticle = Overlays.addOverlay("billboard", {
|
||||
url: HIFI_PUBLIC_BUCKET + "images/cursor.svg",
|
||||
position: reticlePosition(),
|
||||
ignoreRayIntersection: true,
|
||||
isFacingAvatar: true,
|
||||
alpha: 1.0,
|
||||
scale: CURSOR_SCALE
|
||||
});
|
||||
}
|
||||
|
||||
// add an attachment on this avatar so other people see them in the lobby
|
||||
MyAvatar.attach(HELMET_ATTACHMENT_URL, "Neck", {x: 0, y: 0, z: 0}, Quat.fromPitchYawRollDegrees(0, 0, 0), 1.15);
|
||||
|
@ -227,14 +201,8 @@ function cleanupLobby() {
|
|||
Overlays.deleteOverlay(orbShell);
|
||||
Overlays.deleteOverlay(descriptionText);
|
||||
|
||||
|
||||
if (reticle) {
|
||||
Overlays.deleteOverlay(reticle);
|
||||
}
|
||||
|
||||
panelWall = false;
|
||||
orbShell = false;
|
||||
reticle = false;
|
||||
|
||||
Audio.stopInjector(currentDrone);
|
||||
currentDrone = null;
|
||||
|
@ -358,20 +326,6 @@ function handleLookAt(pickRay) {
|
|||
function update(deltaTime) {
|
||||
maybeCleanupLobby();
|
||||
if (panelWall) {
|
||||
|
||||
if (reticle) {
|
||||
Overlays.editOverlay(reticle, {
|
||||
position: reticlePosition()
|
||||
});
|
||||
|
||||
var nowDate = new Date();
|
||||
var now = nowDate.getTime();
|
||||
if (now - lastMouseMove > IDLE_HOVER_TIME) {
|
||||
var pickRay = Camera.computeViewPickRay(0.5, 0.5);
|
||||
handleLookAt(pickRay);
|
||||
}
|
||||
}
|
||||
|
||||
Overlays.editOverlay(descriptionText, { position: textOverlayPosition() });
|
||||
|
||||
// if the reticle is up then we may need to play the next muzak
|
||||
|
@ -383,8 +337,6 @@ function update(deltaTime) {
|
|||
|
||||
function mouseMoveEvent(event) {
|
||||
if (panelWall) {
|
||||
var nowDate = new Date();
|
||||
lastMouseMove = nowDate.getTime();
|
||||
var pickRay = Camera.computePickRay(event.x, event.y);
|
||||
handleLookAt(pickRay);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue