mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-07-22 21:28:59 +02:00
make the oculus reticle a sphere overlay
This commit is contained in:
parent
a37fcbeb3b
commit
ec126f16d5
1 changed files with 22 additions and 15 deletions
|
@ -35,7 +35,7 @@ var orbCenter = Vec3.multiply(orbNaturalCenter, SCALING_FACTOR);
|
||||||
var panelsCenter = Vec3.multiply(panelsNaturalCenter, SCALING_FACTOR);
|
var panelsCenter = Vec3.multiply(panelsNaturalCenter, SCALING_FACTOR);
|
||||||
var panelsCenterShift = Vec3.subtract(panelsCenter, orbCenter);
|
var panelsCenterShift = Vec3.subtract(panelsCenter, orbCenter);
|
||||||
|
|
||||||
var ORB_SHIFT = { x: 0, y: -1.5, z: 0.5};
|
var ORB_SHIFT = { x: 0, y: -1.4, z: -0.8};
|
||||||
|
|
||||||
function drawLobby() {
|
function drawLobby() {
|
||||||
if (!panelWall) {
|
if (!panelWall) {
|
||||||
|
@ -66,19 +66,15 @@ function drawLobby() {
|
||||||
panelWall = Overlays.addOverlay("model", panelWallProps);
|
panelWall = Overlays.addOverlay("model", panelWallProps);
|
||||||
orbShell = Overlays.addOverlay("model", orbShellProps);
|
orbShell = Overlays.addOverlay("model", orbShellProps);
|
||||||
|
|
||||||
// Create a reticle image in center of screen
|
// Create a reticle in center of screen
|
||||||
var screenSize = Controller.getViewportDimensions();
|
var RETICLE_SPHERE_SIZE = 0.05;
|
||||||
var reticleProps = {
|
reticle = Overlays.addOverlay("sphere", {
|
||||||
x: screenSize.x / 2 - 16,
|
position: Vec3.sum(Camera.getPosition(), Quat.getFront(Camera.getOrientation())),
|
||||||
y: screenSize.y / 2 - 16,
|
size: RETICLE_SPHERE_SIZE,
|
||||||
width: 32,
|
color: { red: 0, green: 255, blue: 0 },
|
||||||
height: 32,
|
alpha: 1.0,
|
||||||
color: { red: 255, green: 255, blue: 255},
|
solid: true
|
||||||
alpha: 1,
|
});
|
||||||
imageURL: HIFI_PUBLIC_BUCKET + "images/reticle.png",
|
|
||||||
};
|
|
||||||
|
|
||||||
reticle = Overlays.addOverlay("image", reticleProps);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -109,6 +105,8 @@ function cleanupLobby() {
|
||||||
Overlays.deleteOverlay(orbShell);
|
Overlays.deleteOverlay(orbShell);
|
||||||
Overlays.deleteOverlay(reticle);
|
Overlays.deleteOverlay(reticle);
|
||||||
panelWall = false;
|
panelWall = false;
|
||||||
|
orbShell = false;
|
||||||
|
reticle = false;
|
||||||
locations = {};
|
locations = {};
|
||||||
toggleEnvironmentRendering(true);
|
toggleEnvironmentRendering(true);
|
||||||
}
|
}
|
||||||
|
@ -164,7 +162,16 @@ function toggleEnvironmentRendering(shouldRender) {
|
||||||
Menu.setIsOptionChecked("Avatars", shouldRender);
|
Menu.setIsOptionChecked("Avatars", shouldRender);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function update(deltaTime) {
|
||||||
|
maybeCleanupLobby();
|
||||||
|
if (reticle) {
|
||||||
|
Overlays.editOverlay(reticle, {
|
||||||
|
position: Vec3.sum(Camera.getPosition(), Quat.getFront(Camera.getOrientation()))
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Controller.actionStartEvent.connect(actionStartEvent);
|
Controller.actionStartEvent.connect(actionStartEvent);
|
||||||
Controller.backStartEvent.connect(backStartEvent);
|
Controller.backStartEvent.connect(backStartEvent);
|
||||||
Script.update.connect(maybeCleanupLobby);
|
Script.update.connect(update);
|
||||||
Script.scriptEnding.connect(maybeCleanupLobby);
|
Script.scriptEnding.connect(maybeCleanupLobby);
|
Loading…
Reference in a new issue