Removed old assets and trademarks from images

lvcabral · Sep 8, 2019 · 2f27c2a · 2f27c2a
1 parent 4931e1c
commit 2f27c2a
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 174 deletions.
diff --git a/app/assets/3ballset.png b/app/assets/3ballset.png
diff --git a/app/assets/4ballset.png b/app/assets/4ballset.png
diff --git a/app/assets/5ballset.png b/app/assets/5ballset.png
diff --git a/app/assets/6ballset.png b/app/assets/6ballset.png
diff --git a/app/assets/8ballset.png b/app/assets/8ballset.png
diff --git a/app/assets/bitmapset.xml b/app/assets/bitmapset.xml
diff --git a/app/css/default.css b/app/css/default.css
@@ -31,7 +31,7 @@ body {
 
 #channelInfo{
 	position: absolute;
-	left: 340px; 
+	left: 320px; 
 	top: 560px;
 	color: white;
 	z-index: 30;

diff --git a/app/images/AmigaBoingBall.png b/app/images/AmigaBoingBall.png
diff --git a/app/images/BallShadow.png b/app/images/BallShadow.png
diff --git a/app/images/brightscript-tv.png b/app/images/brightscript-tv.png
diff --git a/app/images/roku-logo.png b/app/images/roku-logo.png
diff --git a/app/images/roku-tv.png b/app/images/roku-tv.png
diff --git a/app/images/sprite.png b/app/images/sprite.png
diff --git a/app/index.js b/app/index.js
@@ -62,8 +62,12 @@ fileSelector.onchange = function() {
     var file = this.files[0];
     var reader = new FileReader();
     reader.onload = function(progressEvent) {
+        paths = [];
+        imgs = [];
+        txts = [];
         source.push(this.result);
-        loadAssets(file.name);
+        paths.push({ url: "source/" + file.name, id: 0, type: "source" });
+        runChannel();
     };
     source = [];
     if (brsWorker != undefined) {
@@ -259,38 +263,6 @@ function openChannelZip(f) {
     );
 }
 
-function loadAssets(fileName) {
-    var loader = new Worker("app/loader.js");
-    var files = [];
-    files.push({ path: "images/sprite.png", type: "image/png" });
-    files.push({ path: "images/roku-logo.png", type: "image/png" });
-    files.push({ path: "images/AmigaBoingBall.png", type: "image/png" });
-    files.push({ path: "images/BallShadow.png", type: "image/png" });
-    files.push({ path: "assets/3ballset.png", type: "image/png" });
-    files.push({ path: "assets/4ballset.png", type: "image/png" });
-    files.push({ path: "assets/5ballset.png", type: "image/png" });
-    files.push({ path: "assets/6ballset.png", type: "image/png" });
-    files.push({ path: "assets/8ballset.png", type: "image/png" });
-    files.push({ path: "assets/bitmapset.xml", type: "text/xml" });
-    loader.onmessage = function(e) {
-        paths = [];
-        imgs = [];
-        txts = [];
-        e.data.forEach(file => {
-            paths.push(file.path);
-            if (file.bmp) {
-                imgs.push(file.bmp);
-            } else {
-                txts.push(file.txt);
-            }
-        });
-        loader.terminate();
-        paths.push({ url: "source/" + fileName, id: 0, type: "source" });
-        runChannel();
-    };
-    loader.postMessage({ assets: files });
-}
-
 function runChannel() {
     ctx.fillStyle = "rgba(0, 0, 0, 1)";
     ctx.fillRect(0, 0, display.width, display.height);
@@ -326,9 +298,7 @@ function drawCanvas() {
         ctx.drawImage(bufferCanvas, 0, 0, screenSize.width, screenSize.height);
         dirty = false;
     }
-    //requestAnimationFrame(drawCanvas);
 }
-//requestAnimationFrame(drawCanvas);
 
 function keyDownHandler(event) {
     if (event.keyCode == 8) {

diff --git a/app/loader.js b/app/loader.js
diff --git a/index.html b/index.html
@@ -19,7 +19,7 @@
             <hr>
         </h2>
         <div style="position: relative; left: 0px; top: 0px">
-            <img class="img" src="app/images/roku-tv.png" width="1252" height="650"/>
+            <img class="img" src="app/images/brightscript-tv.png" width="1252" height="650"/>
             <canvas id="display" width="854px" height="480px"></canvas>
             <a href="#" onclick="loadZip('channels/Prince-of-Persia-Roku-015.zip')">
                 <img id="channel1" src="app/images/prince-of-persia-icon.png" title="Open Prince of Persia game channel"/>