mirror of
https://github.com/overte-org/overte.git
synced 2025-04-21 09:44:21 +02:00
add semicolons back to all of lobby, fix long line
This commit is contained in:
Stephen Birarda
parent
4a32b5acf3
commit
136aba450b
1 changed files with 56 additions and 55 deletions
|
|
@ -11,47 +11,47 @@
|
|||
|
||||
Script.include("libraries/globals.js");
|
||||
|
||||
var panelWall = false
|
||||
var orbShell = false
|
||||
var reticle = false
|
||||
var panelWall = false;
|
||||
var orbShell = false;
|
||||
var reticle = false;
|
||||
|
||||
var avatarStickPosition = {}
|
||||
var avatarStickPosition = {};
|
||||
|
||||
var orbNaturalExtentsMin = { x: -1230, y: -1223, z: -1210 }
|
||||
var orbNaturalExtentsMax = { x: 1230, y: 1229, z: 1223 }
|
||||
var panelsNaturalExtentsMin = { x: -1181, y: -326, z: 56 }
|
||||
var panelsNaturalExtentsMax = { x: 1181, y: 576, z: 1183 }
|
||||
var orbNaturalExtentsMin = { x: -1230, y: -1223, z: -1210 };
|
||||
var orbNaturalExtentsMax = { x: 1230, y: 1229, z: 1223 };
|
||||
var panelsNaturalExtentsMin = { x: -1181, y: -326, z: 56 };
|
||||
var panelsNaturalExtentsMax = { x: 1181, y: 576, z: 1183 };
|
||||
|
||||
var orbNaturalDimensions = Vec3.subtract(orbNaturalExtentsMax, orbNaturalExtentsMin)
|
||||
var panelsNaturalDimensions = Vec3.subtract(panelsNaturalExtentsMax, panelsNaturalExtentsMin)
|
||||
var orbNaturalDimensions = Vec3.subtract(orbNaturalExtentsMax, orbNaturalExtentsMin);
|
||||
var panelsNaturalDimensions = Vec3.subtract(panelsNaturalExtentsMax, panelsNaturalExtentsMin);
|
||||
|
||||
var SCALING_FACTOR = 0.01;
|
||||
var orbDimensions = Vec3.multiply(orbNaturalDimensions, SCALING_FACTOR)
|
||||
var panelsDimensions = Vec3.multiply(panelsNaturalDimensions, SCALING_FACTOR)
|
||||
var orbDimensions = Vec3.multiply(orbNaturalDimensions, SCALING_FACTOR);
|
||||
var panelsDimensions = Vec3.multiply(panelsNaturalDimensions, SCALING_FACTOR);
|
||||
|
||||
var orbNaturalCenter = Vec3.sum(orbNaturalExtentsMin, Vec3.multiply(orbNaturalDimensions, 0.5))
|
||||
var panelsNaturalCenter = Vec3.sum(panelsNaturalExtentsMin, Vec3.multiply(panelsNaturalDimensions, 0.5))
|
||||
var orbCenter = Vec3.multiply(orbNaturalCenter, SCALING_FACTOR)
|
||||
var panelsCenter = Vec3.multiply(panelsNaturalCenter, SCALING_FACTOR)
|
||||
var panelsCenterShift = Vec3.subtract(panelsCenter, orbCenter)
|
||||
var orbNaturalCenter = Vec3.sum(orbNaturalExtentsMin, Vec3.multiply(orbNaturalDimensions, 0.5));
|
||||
var panelsNaturalCenter = Vec3.sum(panelsNaturalExtentsMin, Vec3.multiply(panelsNaturalDimensions, 0.5));
|
||||
var orbCenter = Vec3.multiply(orbNaturalCenter, SCALING_FACTOR);
|
||||
var panelsCenter = Vec3.multiply(panelsNaturalCenter, SCALING_FACTOR);
|
||||
var panelsCenterShift = Vec3.subtract(panelsCenter, orbCenter);
|
||||
|
||||
var ORB_SHIFT = { x: 0, y: -1.5, z: 0.5}
|
||||
var ORB_SHIFT = { x: 0, y: -1.5, z: 0.5};
|
||||
|
||||
function drawLobby() {
|
||||
if (!panelWall) {
|
||||
print("Adding overlays for the lobby panel wall and orb shell.")
|
||||
print("Adding overlays for the lobby panel wall and orb shell.");
|
||||
|
||||
var cameraEuler = Quat.safeEulerAngles(Camera.getOrientation());
|
||||
var towardsMe = Quat.angleAxis(cameraEuler.y + 180, { x: 0, y: 1, z: 0})
|
||||
var towardsMe = Quat.angleAxis(cameraEuler.y + 180, { x: 0, y: 1, z: 0});
|
||||
|
||||
var orbPosition = Vec3.sum(Camera.getPosition(), Vec3.multiplyQbyV(towardsMe, ORB_SHIFT))
|
||||
var orbPosition = Vec3.sum(Camera.getPosition(), Vec3.multiplyQbyV(towardsMe, ORB_SHIFT));
|
||||
|
||||
var panelWallProps = {
|
||||
url: HIFI_PUBLIC_BUCKET + "models/sets/Lobby/LobbyPrototype/PanelWall3.fbx",
|
||||
position: Vec3.sum(orbPosition, Vec3.multiplyQbyV(towardsMe, panelsCenterShift)),
|
||||
rotation: towardsMe,
|
||||
dimensions: panelsDimensions
|
||||
}
|
||||
};
|
||||
|
||||
var orbShellProps = {
|
||||
url: HIFI_PUBLIC_BUCKET + "models/sets/Lobby/LobbyConcepts/Lobby5_OrbShellOnly.fbx",
|
||||
|
|
@ -59,12 +59,12 @@ function drawLobby() {
|
|||
rotation: towardsMe,
|
||||
dimensions: orbDimensions,
|
||||
ignoreRayIntersection: true
|
||||
}
|
||||
};
|
||||
|
||||
avatarStickPosition = MyAvatar.position
|
||||
avatarStickPosition = MyAvatar.position;
|
||||
|
||||
panelWall = Overlays.addOverlay("model", panelWallProps)
|
||||
orbShell = Overlays.addOverlay("model", orbShellProps)
|
||||
panelWall = Overlays.addOverlay("model", panelWallProps);
|
||||
orbShell = Overlays.addOverlay("model", orbShellProps);
|
||||
|
||||
// Create a reticle image in center of screen
|
||||
var screenSize = Controller.getViewportDimensions();
|
||||
|
|
@ -76,20 +76,20 @@ function drawLobby() {
|
|||
color: { red: 255, green: 255, blue: 255},
|
||||
alpha: 1,
|
||||
imageURL: HIFI_PUBLIC_BUCKET + "images/reticle.png",
|
||||
}
|
||||
};
|
||||
|
||||
reticle = Overlays.addOverlay("image", reticleProps);
|
||||
}
|
||||
}
|
||||
|
||||
var locations = {}
|
||||
var locations = {};
|
||||
|
||||
function changeLobbyTextures() {
|
||||
var req = new XMLHttpRequest();
|
||||
req.open("GET", "https://data.highfidelity.io/api/v1/locations?limit=21", false);
|
||||
req.send();
|
||||
|
||||
locations = JSON.parse(req.responseText).data.locations
|
||||
locations = JSON.parse(req.responseText).data.locations;
|
||||
|
||||
var NUM_PANELS = locations.length;
|
||||
|
||||
|
|
@ -99,18 +99,18 @@ function changeLobbyTextures() {
|
|||
|
||||
for (var j = 0; j < NUM_PANELS; j++) {
|
||||
textureProp["textures"]["file" + (j + 1)] = "http:" + locations[j].thumbnail_url
|
||||
}
|
||||
};
|
||||
|
||||
Overlays.editOverlay(panelWall, textureProp)
|
||||
Overlays.editOverlay(panelWall, textureProp);
|
||||
}
|
||||
|
||||
function cleanupLobby() {
|
||||
Overlays.deleteOverlay(panelWall)
|
||||
Overlays.deleteOverlay(orbShell)
|
||||
Overlays.deleteOverlay(reticle)
|
||||
panelWall = false
|
||||
locations = {}
|
||||
toggleEnvironmentRendering(true)
|
||||
Overlays.deleteOverlay(panelWall);
|
||||
Overlays.deleteOverlay(orbShell);
|
||||
Overlays.deleteOverlay(reticle);
|
||||
panelWall = false;
|
||||
locations = {};
|
||||
toggleEnvironmentRendering(true);
|
||||
}
|
||||
|
||||
function actionStartEvent(event) {
|
||||
|
|
@ -121,17 +121,18 @@ function actionStartEvent(event) {
|
|||
var result = Overlays.findRayIntersection(pickRay);
|
||||
|
||||
if (result.intersects && result.overlayID == panelWall) {
|
||||
var panelName = result.extraInfo
|
||||
var panelStringIndex = panelName.indexOf("Panel")
|
||||
var panelName = result.extraInfo;
|
||||
var panelStringIndex = panelName.indexOf("Panel");
|
||||
if (panelStringIndex != -1) {
|
||||
var panelIndex = parseInt(panelName.slice(5)) - 1
|
||||
var panelIndex = parseInt(panelName.slice(5)) - 1;
|
||||
if (panelIndex < locations.length) {
|
||||
var actionLocation = locations[panelIndex]
|
||||
var actionLocation = locations[panelIndex];
|
||||
|
||||
print("Jumping to " + actionLocation.name + " at " + actionLocation.path + " in " + actionLocation.domain.name + " after click on panel " + panelIndex)
|
||||
print("Jumping to " + actionLocation.name + " at " + actionLocation.path
|
||||
+ " in " + actionLocation.domain.name + " after click on panel " + panelIndex);
|
||||
|
||||
Window.location = actionLocation
|
||||
maybeCleanupLobby()
|
||||
Window.location = actionLocation;
|
||||
maybeCleanupLobby();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -140,11 +141,11 @@ function actionStartEvent(event) {
|
|||
|
||||
function backStartEvent() {
|
||||
if (!panelWall) {
|
||||
toggleEnvironmentRendering(false)
|
||||
drawLobby()
|
||||
changeLobbyTextures()
|
||||
toggleEnvironmentRendering(false);
|
||||
drawLobby();
|
||||
changeLobbyTextures();
|
||||
} else {
|
||||
cleanupLobby()
|
||||
cleanupLobby();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -152,17 +153,17 @@ var CLEANUP_EPSILON_DISTANCE = 0.025
|
|||
|
||||
function maybeCleanupLobby() {
|
||||
if (panelWall && Vec3.length(Vec3.subtract(avatarStickPosition, MyAvatar.position)) > CLEANUP_EPSILON_DISTANCE) {
|
||||
cleanupLobby()
|
||||
cleanupLobby();
|
||||
}
|
||||
}
|
||||
|
||||
function toggleEnvironmentRendering(shouldRender) {
|
||||
Menu.setIsOptionChecked("Voxels", shouldRender)
|
||||
Menu.setIsOptionChecked("Models", shouldRender)
|
||||
Menu.setIsOptionChecked("Metavoxels", shouldRender)
|
||||
Menu.setIsOptionChecked("Voxels", shouldRender);
|
||||
Menu.setIsOptionChecked("Models", shouldRender);
|
||||
Menu.setIsOptionChecked("Metavoxels", shouldRender);
|
||||
}
|
||||
|
||||
Controller.actionStartEvent.connect(actionStartEvent)
|
||||
Controller.backStartEvent.connect(backStartEvent)
|
||||
Script.update.connect(maybeCleanupLobby)
|
||||
Controller.actionStartEvent.connect(actionStartEvent);
|
||||
Controller.backStartEvent.connect(backStartEvent);
|
||||
Script.update.connect(maybeCleanupLobby);
|
||||
Script.scriptEnding.connect(maybeCleanupLobby);
|
||||
Loading…
Reference in a new issue