From 68a8bc224c155be4a163aef899182285408a76c6 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 25 Jul 2020 09:16:06 +0200 Subject: [PATCH] Internet Independent --- Animation.js | 131 +++++++++++++++++-------------------- Canvas.js | 15 ++--- CockpitSpace/FullScreen.js | 2 +- Globals.js | 3 +- 4 files changed, 69 insertions(+), 82 deletions(-) diff --git a/Animation.js b/Animation.js index cab8a470c..b43fcf413 100644 --- a/Animation.js +++ b/Animation.js @@ -59,89 +59,80 @@ function newAnimation () { function animationLoop () { try { - if (window.canvasApp.visible === true) { - /* We set the canvas to its normal width and height */ - // browserCanvas.width = window.innerWidth - // browserCanvas.height = window.innerHeight - CURRENT_TOP_MARGIN + /* First thing is to clear the actual canvas */ + clearBrowserCanvas() - /* First thing is to clear the actual canvas */ - clearBrowserCanvas() - - /* We loop through the callback functions collections and execute them all. */ - let performanceMap = new Map() - let totalTimeConsumed = 0 - let totalElements = 0 - let chanceToExecute - let randomNumber - let mustExecute + /* We loop through the callback functions collections and execute them all. */ + let performanceMap = new Map() + let totalTimeConsumed = 0 + let totalElements = 0 + let chanceToExecute + let randomNumber + let mustExecute // console.clear() - let row = 0 - for (const [key, callBackFunction] of callBackFunctions.entries()) { - row++ - switch (key) { - case 'Floating Space Physics': - chanceToExecute = 50 - randomNumber = Math.random() * 100 * chanceToExecute - if (randomNumber > 100 - chanceToExecute) { mustExecute = true } else { mustExecute = false } - break - default: { - mustExecute = true - } - + let row = 0 + for (const [key, callBackFunction] of callBackFunctions.entries()) { + row++ + switch (key) { + case 'Floating Space Physics': + chanceToExecute = 50 + randomNumber = Math.random() * 100 * chanceToExecute + if (randomNumber > 100 - chanceToExecute) { mustExecute = true } else { mustExecute = false } + break + default: { + mustExecute = true } - let timeConsumed = 0 - if (mustExecute === true) { - let t0 = performance.now() - callBackFunction() - let t1 = performance.now() - timeConsumed = t1 - t0 - if (key === 'Charting Space Draw') { - if (Math.random() * 100 > 99) { - totalConsumption = 0 - totalCounter = 0 - } - totalConsumption = totalConsumption + timeConsumed - totalCounter = totalCounter + 1 - } - performanceMap.set(key, timeConsumed) - totalTimeConsumed = totalTimeConsumed + timeConsumed - totalElements++ - } } + let timeConsumed = 0 + if (mustExecute === true) { + let t0 = performance.now() + callBackFunction() + let t1 = performance.now() + timeConsumed = t1 - t0 + if (key === 'Charting Space Draw') { + if (Math.random() * 100 > 99) { + totalConsumption = 0 + totalCounter = 0 + } + + totalConsumption = totalConsumption + timeConsumed + totalCounter = totalCounter + 1 + } + performanceMap.set(key, timeConsumed) + totalTimeConsumed = totalTimeConsumed + timeConsumed + totalElements++ + } + } /* Frame per Seconds */ - ANIMATION_FRAME_PER_SECONDS = Math.trunc(1000 / totalTimeConsumed) + ANIMATION_FRAME_PER_SECONDS = Math.trunc(1000 / totalTimeConsumed) /* Performance Check */ - if (SHOW_ANIMATION_PERFORMACE === true) { - row = 0 - for (const [key, timeConsumed] of performanceMap.entries()) { - row++ - labelToPrint = key + ' ' + timeConsumed.toFixed(4) - printLabel(labelToPrint, 10, 100 + row * 30, 1, 20, UI_COLOR.RED) - let percentage = timeConsumed * 100 / totalTimeConsumed - labelToPrint = key + ' ' + percentage.toFixed(1) + '%' - printLabel(labelToPrint, 300, 100 + row * 30, 1, 20, UI_COLOR.RED) - } + if (SHOW_ANIMATION_PERFORMACE === true) { + row = 0 + for (const [key, timeConsumed] of performanceMap.entries()) { + row++ + labelToPrint = key + ' ' + timeConsumed.toFixed(4) + printLabel(labelToPrint, 10, 100 + row * 30, 1, 20, UI_COLOR.RED) + let percentage = timeConsumed * 100 / totalTimeConsumed + labelToPrint = key + ' ' + percentage.toFixed(1) + '%' + printLabel(labelToPrint, 300, 100 + row * 30, 1, 20, UI_COLOR.RED) + } /* Other Variables */ - row++ - printLabel(DEBUG.variable1, 300, 100 + row * 30, 1, 20, UI_COLOR.RED) - row++ - printLabel(DEBUG.variable2, 300, 100 + row * 30, 1, 20, UI_COLOR.RED) - row++ - printLabel(DEBUG.variable3, 300, 100 + row * 30, 1, 20, UI_COLOR.RED) - row++ - printLabel(DEBUG.variable4, 300, 100 + row * 30, 1, 20, UI_COLOR.RED) - row++ - printLabel('Animation Frame Per Seconds: ' + ANIMATION_FRAME_PER_SECONDS, 300, 100 + row * 30, 1, 20, UI_COLOR.TITANIUM_YELLOW) - } - } else { - browserCanvas.width = 1 - browserCanvas.height = 1 + row++ + printLabel(DEBUG.variable1, 300, 100 + row * 30, 1, 20, UI_COLOR.RED) + row++ + printLabel(DEBUG.variable2, 300, 100 + row * 30, 1, 20, UI_COLOR.RED) + row++ + printLabel(DEBUG.variable3, 300, 100 + row * 30, 1, 20, UI_COLOR.RED) + row++ + printLabel(DEBUG.variable4, 300, 100 + row * 30, 1, 20, UI_COLOR.RED) + row++ + printLabel('Animation Frame Per Seconds: ' + ANIMATION_FRAME_PER_SECONDS, 300, 100 + row * 30, 1, 20, UI_COLOR.TITANIUM_YELLOW) } /* Video Recording */ diff --git a/Canvas.js b/Canvas.js index af920101a..50f08991c 100644 --- a/Canvas.js +++ b/Canvas.js @@ -97,12 +97,11 @@ function newCanvas () { function initialize () { try { + browserResized() initializeBrowserCanvas() - addCanvasEvents() - /* Instantiate all the children spaces of Canvas object */ - + /* Instantiate all the children spaces of Canvas object */ thisObject.floatingSpace = newFloatingSpace() thisObject.floatingSpace.initialize() @@ -199,14 +198,10 @@ function newCanvas () { } function browserResized () { - try { - browserCanvas = document.getElementById('canvas') + browserCanvas = document.getElementById('canvas') - browserCanvas.width = window.innerWidth - browserCanvas.height = window.innerHeight - CURRENT_TOP_MARGIN - } catch (err) { - if (ERROR_LOG === true) { logger.write('[ERROR] browserResized -> err = ' + err.stack) } - } + browserCanvas.width = window.innerWidth + browserCanvas.height = window.innerHeight - CURRENT_TOP_MARGIN } function checkMediaRecording (event) { diff --git a/CockpitSpace/FullScreen.js b/CockpitSpace/FullScreen.js index 12951403f..9fb2717d9 100644 --- a/CockpitSpace/FullScreen.js +++ b/CockpitSpace/FullScreen.js @@ -82,7 +82,7 @@ function newFullScreen () { } else { thisObject.status = 'Off' goOutFullscreen() - CURRENT_TOP_MARGIN = window.canvasApp.topMargin + CURRENT_TOP_MARGIN = TOP_MARGIN AT_FULL_SCREEN_MODE = false } } diff --git a/Globals.js b/Globals.js index d9a737c01..f47174216 100644 --- a/Globals.js +++ b/Globals.js @@ -178,7 +178,8 @@ let INITIAL_ZOOM_LEVEL = -28.25 // This is the zoom level at the view port let INITIAL_TIME_PERIOD = ONE_DAY_IN_MILISECONDS // This value will be overwritten at the canvas.chartingSpace.viewport.initialize if the user had a prevous session with this same browser. let VERY_LARGE_NUMBER = 100000000000000 -let CURRENT_TOP_MARGIN = window.canvasApp.topMargin +const TOP_MARGIN = 0 +let CURRENT_TOP_MARGIN = TOP_MARGIN let AT_FULL_SCREEN_MODE = false let maxDate = new Date();