mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 18:50:00 +02:00
Clean up code
Fix code to standards
This commit is contained in:
parent
2edd252576
commit
ffe66cd5c5
1 changed files with 36 additions and 36 deletions
|
@ -76,7 +76,7 @@ var ready = true;
|
||||||
|
|
||||||
// When our script shuts down, we should clean up all of our overlays
|
// When our script shuts down, we should clean up all of our overlays
|
||||||
function scriptEnding() {
|
function scriptEnding() {
|
||||||
for (i = 0; i < notifications.length; i++){
|
for (i = 0; i < notifications.length; i++) {
|
||||||
Overlays.deleteOverlay(notifications[i]);
|
Overlays.deleteOverlay(notifications[i]);
|
||||||
Overlays.deleteOverlay(buttons[i]);
|
Overlays.deleteOverlay(buttons[i]);
|
||||||
}
|
}
|
||||||
|
@ -91,23 +91,23 @@ var myAlpha = [];
|
||||||
var arrays = [];
|
var arrays = [];
|
||||||
|
|
||||||
// This function creates and sizes the overlays
|
// This function creates and sizes the overlays
|
||||||
function createNotification(text){
|
function createNotification(text) {
|
||||||
var count = (text.match(/\n/g) || []).length;
|
var count = (text.match(/\n/g) || []).length;
|
||||||
var breakPoint = 43.0; // length when new line is added
|
var breakPoint = 43.0; // length when new line is added
|
||||||
var extraLine = 0;
|
var extraLine = 0;
|
||||||
var breaks = 0;
|
var breaks = 0;
|
||||||
var height = 40.0;
|
var height = 40.0;
|
||||||
var stack = 0;
|
var stack = 0;
|
||||||
if (text.length >= breakPoint){
|
if (text.length >= breakPoint) {
|
||||||
breaks = count;
|
breaks = count;
|
||||||
}
|
}
|
||||||
var extraLine = breaks * 16.0;
|
var extraLine = breaks * 16.0;
|
||||||
for (i = 0; i < heights.length; i++){
|
for (i = 0; i < heights.length; i++) {
|
||||||
stack = stack + heights[i];
|
stack = stack + heights[i];
|
||||||
}
|
}
|
||||||
var level = (stack + 20.0 );
|
var level = (stack + 20.0);
|
||||||
height = height + extraLine;
|
height = height + extraLine;
|
||||||
var overlayProperties = {
|
var overlayProperties = {
|
||||||
x: overlayLocationX,
|
x: overlayLocationX,
|
||||||
y: level,
|
y: level,
|
||||||
width: width,
|
width: width,
|
||||||
|
@ -142,18 +142,18 @@ function createNotification(text){
|
||||||
// specifically notification "heights", "times" of creation, and .
|
// specifically notification "heights", "times" of creation, and .
|
||||||
function Notify(notice, button, height){
|
function Notify(notice, button, height){
|
||||||
|
|
||||||
notifications.push((Overlays.addOverlay("text",notice)));
|
notifications.push((Overlays.addOverlay("text", notice)));
|
||||||
buttons.push((Overlays.addOverlay("image",button)));
|
buttons.push((Overlays.addOverlay("image",button)));
|
||||||
times.push(new Date().getTime() / 1000);
|
times.push(new Date().getTime() / 1000);
|
||||||
height = height + 1.0;
|
height = height + 1.0;
|
||||||
heights.push(height);
|
heights.push(height);
|
||||||
myAlpha.push(0);
|
myAlpha.push(0);
|
||||||
var last = notifications.length - 1;
|
var last = notifications.length - 1;
|
||||||
createArrays(notifications[last], buttons[last], times[last], heights[last], myAlpha[last]);
|
createArrays(notifications[last], buttons[last], times[last], heights[last], myAlpha[last]);
|
||||||
fadeIn(notifications[last], buttons[last])
|
fadeIn(notifications[last], buttons[last])
|
||||||
}
|
}
|
||||||
|
|
||||||
function fadeIn(noticeIn, buttonIn){
|
function fadeIn(noticeIn, buttonIn) {
|
||||||
var myLength = arrays.length;
|
var myLength = arrays.length;
|
||||||
var q = 0;
|
var q = 0;
|
||||||
var pauseTimer = null;
|
var pauseTimer = null;
|
||||||
|
@ -170,14 +170,14 @@ function fadeIn(noticeIn, buttonIn){
|
||||||
|
|
||||||
|
|
||||||
// push data from above to the 2 dimensional array
|
// push data from above to the 2 dimensional array
|
||||||
function createArrays(notice, button, createTime, height, myAlpha){
|
function createArrays(notice, button, createTime, height, myAlpha) {
|
||||||
arrays.push([notice, button, createTime, height, myAlpha]);
|
arrays.push([notice, button, createTime, height, myAlpha]);
|
||||||
}
|
}
|
||||||
// handles mouse clicks on buttons
|
// handles mouse clicks on buttons
|
||||||
function mousePressEvent(event) {
|
function mousePressEvent(event) {
|
||||||
var clickedOverlay = Overlays.getOverlayAtPoint({x: event.x, y: event.y}); //identify which overlay was clicked
|
var clickedOverlay = Overlays.getOverlayAtPoint({x: event.x, y: event.y}); //identify which overlay was clicked
|
||||||
for (i = 0; i < buttons.length; i++){ //if user clicked a button
|
for (i = 0; i < buttons.length; i++) { //if user clicked a button
|
||||||
if(clickedOverlay == buttons[i]){
|
if(clickedOverlay == buttons[i]) {
|
||||||
Overlays.deleteOverlay(notifications[i]);
|
Overlays.deleteOverlay(notifications[i]);
|
||||||
Overlays.deleteOverlay(buttons[i]);
|
Overlays.deleteOverlay(buttons[i]);
|
||||||
notifications.splice(i, 1);
|
notifications.splice(i, 1);
|
||||||
|
@ -191,25 +191,25 @@ function mousePressEvent(event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Control key remains active only while key is held down
|
// Control key remains active only while key is held down
|
||||||
function keyReleaseEvent(key){
|
function keyReleaseEvent(key) {
|
||||||
if (key.key == 16777249){
|
if (key.key == 16777249) {
|
||||||
ctrlIsPressed = false;
|
ctrlIsPressed = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Triggers notification on specific key driven events
|
// Triggers notification on specific key driven events
|
||||||
function keyPressEvent(key) {
|
function keyPressEvent(key) {
|
||||||
if (key.key == 16777249){
|
if (key.key == 16777249) {
|
||||||
ctrlIsPressed = true;
|
ctrlIsPressed = true;
|
||||||
}
|
}
|
||||||
if (key.text == "a") {
|
if (key.text == "a") {
|
||||||
var noteString = "Turning to the Left";
|
var noteString = "Turning to the Left";
|
||||||
createNotification(noteString);
|
createNotification(noteString);
|
||||||
}
|
}
|
||||||
if (key.text == "d") {
|
if (key.text == "d") {
|
||||||
var noteString = "Turning to the Right";
|
var noteString = "Turning to the Right";
|
||||||
createNotification(noteString);
|
createNotification(noteString);
|
||||||
}
|
}
|
||||||
if (key.text == "s") {
|
if (key.text == "s") {
|
||||||
if (ctrlIsPressed == true){
|
if (ctrlIsPressed == true){
|
||||||
var noteString = "You have taken a snapshot";
|
var noteString = "You have taken a snapshot";
|
||||||
|
@ -219,20 +219,20 @@ function keyPressEvent(key) {
|
||||||
if (key.text == "q") {
|
if (key.text == "q") {
|
||||||
var noteString = "Enable Scripted Motor control is now on.";
|
var noteString = "Enable Scripted Motor control is now on.";
|
||||||
wordWrap(noteString);
|
wordWrap(noteString);
|
||||||
}
|
}
|
||||||
if (key.text == "w") {
|
if (key.text == "w") {
|
||||||
var noteString = "This notification spans 2 lines. The overlay will resize to fit new lines.";
|
var noteString = "This notification spans 2 lines. The overlay will resize to fit new lines.";
|
||||||
var noteString = "editVoxels.js stopped, editModels.js stopped, selectAudioDevice.js stopped.";
|
var noteString = "editVoxels.js stopped, editModels.js stopped, selectAudioDevice.js stopped.";
|
||||||
wordWrap(noteString);
|
wordWrap(noteString);
|
||||||
}
|
}
|
||||||
if (key.text == "e") {
|
if (key.text == "e") {
|
||||||
var noteString = "This is an example of a multiple line notification. This notification will span 3 lines."
|
var noteString = "This is an example of a multiple line notification. This notification will span 3 lines."
|
||||||
wordWrap(noteString);
|
wordWrap(noteString);
|
||||||
}
|
}
|
||||||
if (key.text == "r") {
|
if (key.text == "r") {
|
||||||
var noteString = "This is a very long line of text that we are going to use in this example to divide it into rows of maximum 43 chars and see how many lines we use.";
|
var noteString = "This is a very long line of text that we are going to use in this example to divide it into rows of maximum 43 chars and see how many lines we use.";
|
||||||
wordWrap(noteString);
|
wordWrap(noteString);
|
||||||
}
|
}
|
||||||
if (key.text == "SPACE") {
|
if (key.text == "SPACE") {
|
||||||
var noteString = "You have pressed the Spacebar, This is an example of a multiple line notification. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam.";
|
var noteString = "You have pressed the Spacebar, This is an example of a multiple line notification. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam.";
|
||||||
wordWrap(noteString);
|
wordWrap(noteString);
|
||||||
|
@ -240,7 +240,7 @@ function keyPressEvent(key) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// formats string to add newline every 43 chars
|
// formats string to add newline every 43 chars
|
||||||
function wordWrap(str){
|
function wordWrap(str) {
|
||||||
var result = stringDivider(str, 43.0, "\n");
|
var result = stringDivider(str, 43.0, "\n");
|
||||||
createNotification(result);
|
createNotification(result);
|
||||||
}
|
}
|
||||||
|
@ -261,7 +261,7 @@ function stringDivider(str, slotWidth, spaceReplacer) {
|
||||||
|
|
||||||
// This fires a notification on window resize
|
// This fires a notification on window resize
|
||||||
function checkSize(){
|
function checkSize(){
|
||||||
if((Window.innerWidth!=ourWidth)||(Window.innerHeight!=ourHeight)){
|
if((Window.innerWidth != ourWidth)||(Window.innerHeight != ourHeight)) {
|
||||||
var windowResize = "Window has been resized";
|
var windowResize = "Window has been resized";
|
||||||
ourWidth = Window.innerWidth;
|
ourWidth = Window.innerWidth;
|
||||||
ourHeight = Window.innerHeight;
|
ourHeight = Window.innerHeight;
|
||||||
|
@ -285,7 +285,7 @@ function onOnlineUsersChanged(users) {
|
||||||
for (user in last_users) {
|
for (user in last_users) {
|
||||||
if (users.indexOf(last_users[user]) == -1.0) {
|
if (users.indexOf(last_users[user]) == -1.0) {
|
||||||
leavers.push(last_users[user]);
|
leavers.push(last_users[user]);
|
||||||
createNotification(last_users[user] + " Has left");
|
createNotification(last_users[user] + " Has left");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
last_users = users;
|
last_users = users;
|
||||||
|
@ -312,20 +312,20 @@ function update(){
|
||||||
if ((frame % 60.0) == 0) { // only update once a second
|
if ((frame % 60.0) == 0) { // only update once a second
|
||||||
checkSize(); // checks for size change to trigger windowResize notification
|
checkSize(); // checks for size change to trigger windowResize notification
|
||||||
locationY = 20.0;
|
locationY = 20.0;
|
||||||
for (var i = 0; i < arrays.length; i++){ //repositions overlays as others fade
|
for (var i = 0; i < arrays.length; i++) { //repositions overlays as others fade
|
||||||
var nextOverlay = Overlays.getOverlayAtPoint({x: overlayLocationX, y: locationY });
|
var nextOverlay = Overlays.getOverlayAtPoint({x: overlayLocationX, y: locationY});
|
||||||
Overlays.editOverlay(notifications[i], { x:overlayLocationX, y:locationY});
|
Overlays.editOverlay(notifications[i], { x:overlayLocationX, y:locationY});
|
||||||
Overlays.editOverlay(buttons[i], { x:buttonLocationX, y:locationY + 12.0});
|
Overlays.editOverlay(buttons[i], { x:buttonLocationX, y:locationY + 12.0});
|
||||||
locationY=locationY + arrays[i][3];
|
locationY = locationY + arrays[i][3];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// This checks the age of the notification and prepares to fade it after 9.0 seconds (var persistTime - 1)
|
// This checks the age of the notification and prepares to fade it after 9.0 seconds (var persistTime - 1)
|
||||||
for (var i = 0; i < arrays.length; i++){
|
for (var i = 0; i < arrays.length; i++) {
|
||||||
if (ready){
|
if (ready){
|
||||||
var j = arrays[i][2];
|
var j = arrays[i][2];
|
||||||
var k = j + persistTime;
|
var k = j + persistTime;
|
||||||
if (k < (new Date().getTime() / 1000)){
|
if (k < (new Date().getTime() / 1000)) {
|
||||||
ready = false;
|
ready = false;
|
||||||
noticeOut = arrays[i][0];
|
noticeOut = arrays[i][0];
|
||||||
buttonOut = arrays[i][1];
|
buttonOut = arrays[i][1];
|
||||||
|
@ -337,8 +337,8 @@ function update(){
|
||||||
}
|
}
|
||||||
|
|
||||||
// this fades the notification ready for dismissal, and removes it from the arrays
|
// this fades the notification ready for dismissal, and removes it from the arrays
|
||||||
function fadeOut(noticeOut, buttonOut, arraysOut){
|
function fadeOut(noticeOut, buttonOut, arraysOut) {
|
||||||
var myLength = arrays.length;
|
var myLength = arrays.length;
|
||||||
var r = 9.0;
|
var r = 9.0;
|
||||||
var pauseTimer = null;
|
var pauseTimer = null;
|
||||||
pauseTimer = Script.setInterval(function() {
|
pauseTimer = Script.setInterval(function() {
|
||||||
|
@ -356,8 +356,8 @@ function fadeOut(noticeOut, buttonOut, arraysOut){
|
||||||
}
|
}
|
||||||
|
|
||||||
// This handles the final dismissal of a notification after fading
|
// This handles the final dismissal of a notification after fading
|
||||||
function dismiss(firstNoteOut, firstButOut, firstOut){
|
function dismiss(firstNoteOut, firstButOut, firstOut) {
|
||||||
var working = firstOut
|
var working = firstOut
|
||||||
Overlays.deleteOverlay(firstNoteOut);
|
Overlays.deleteOverlay(firstNoteOut);
|
||||||
Overlays.deleteOverlay(firstButOut);
|
Overlays.deleteOverlay(firstButOut);
|
||||||
notifications.splice(firstOut, 1);
|
notifications.splice(firstOut, 1);
|
||||||
|
|
Loading…
Reference in a new issue