repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 17218caabb4d5564f2aa06170247588e15f84de3:
path_to: 
revision_to: 

commit 17218caabb4d5564f2aa06170247588e15f84de3
Author: James Baicoianu 
Date:   Wed Feb 26 15:14:02 2020 -0800

    Fixed texture colorspace tests

diff --git a/tests/karma.conf.js b/tests/karma.conf.js

--- a/tests/karma.conf.js
+++ b/tests/karma.conf.js
@@ -26,7 +26,7 @@ module.exports = function(config) {
       //'tests/imagediff.js',
       //{pattern: 'tests/janusweb.test.js', watched: true, included: true, served: true},
       {pattern: 'tests/assets/*.test.js', watched: true, included: true, served: true},
-      //{pattern: 'tests/render/*.test.js', watched: true, included: true, served: true},
+      {pattern: 'tests/render/*.test.js', watched: true, included: true, served: true},
       {pattern: 'tests/room.test.js', watched: true, included: true, served: true},
     ],

diff --git a/tests/render/textures.test.js b/tests/render/textures.test.js

--- a/tests/render/textures.test.js
+++ b/tests/render/textures.test.js
@@ -13,7 +13,8 @@ describe("JanusWeb Render textures", function() {
         resolution: resolution,
         autoload: false,
         showchat: false,
-        networking: false
+        networking: false,
+        shownavigation: false
       }).then(function(newclient) { 
         client = newclient;
         janusweb = client.janusweb;
@@ -31,9 +32,10 @@ describe("JanusWeb Render textures", function() {
     canvas = canvases[0];
     done();
   });
+
   it("defines testing assets", function(done) {
     setTimeout(function() {
-      elation.engine.assets.loadJSON([
+      let assetpack = elation.engine.assets.loadJSON([
         { assettype: 'image', name: 'solid_red_jpg', src: '../tests/images/solid-red.jpg' },
         { assettype: 'image', name: 'solid_red_png', src: '../tests/images/solid-red.png' },
         { assettype: 'image', name: 'solid_blue_jpg', src: '../tests/images/solid-blue.jpg' },
@@ -42,56 +44,83 @@ describe("JanusWeb Render textures", function() {
         { assettype: 'image', name: 'solid_green_png', src: '../tests/images/solid-green.png' },

         { assettype: 'image', name: 'transparent_red_50_png', src: '../tests/images/transparent-red-50.png' },
-        { assettype: 'image', name: 'transparent_red_50_gif', src: '../tests/images/transparent-red-50.gif' },
+        //{ assettype: 'image', name: 'transparent_red_50_gif', src: '../tests/images/transparent-red-50.gif' },
         { assettype: 'image', name: 'transparent_blue_50_png', src: '../tests/images/transparent-blue-50.png' },
-        { assettype: 'image', name: 'transparent_blue_50_gif', src: '../tests/images/transparent-blue-50.gif' },
+        //{ assettype: 'image', name: 'transparent_blue_50_gif', src: '../tests/images/transparent-blue-50.gif' },
         { assettype: 'image', name: 'transparent_green_50_png', src: '../tests/images/transparent-green-50.png' },
-        { assettype: 'image', name: 'transparent_green_50_gif', src: '../tests/images/transparent-green-50.gif' },
+        //{ assettype: 'image', name: 'transparent_green_50_gif', src: '../tests/images/transparent-green-50.gif' },
       ], elation.config.get('janusweb.datapath') + 'assets/');
+
+      expect(assetpack.assets.length).toBe(9);
       done();
     }, 1000);
   });

+
   it("loads a solid red texture", function(done) {
-    var roomsrc = '';
+    var roomsrc = `
+
+  
+   
+  
+  
+  
+ 
+`;

     var testroom = janusweb.loadFromSource(roomsrc, true);
     elation.events.add(testroom, 'room_load_complete', function() {
-      client.view.getPixelAt(0,0).then(function(color) {
-        expect(color[0]).toBe(255);
-        expect(color[1]).toBe(0);
-        expect(color[2]).toBe(0);
-        expect(color[3]).toBe(255);
-        done();
-      });
+      setTimeout(() => {
+        client.view.getPixelAt(0,0).then(function(color) {
+          expect(color[0]).toBe(255);
+          expect(color[1]).toBe(0);
+          expect(color[2]).toBe(0);
+          expect(color[3]).toBe(255);
+          done();
+        });
+      }, 100);
     });
   });
+
   it("loads a solid green texture", function(done) {
-    var roomsrc = '';
+    var roomsrc = `
+
+ 
+   
+ 
+ 
+  
+ 
+`;

     var testroom = janusweb.loadFromSource(roomsrc, true);
     elation.events.add(testroom, 'room_load_complete', function() {
-      client.view.getPixelAt(0,0).then(function(color) {
-        expect(color[0]).toBe(0);
-        expect(color[1]).toBe(255);
-        expect(color[2]).toBe(0);
-        expect(color[3]).toBe(255);
-        done();
-      });
+      setTimeout(() => {
+        client.view.getPixelAt(0,0).then(function(color) {
+          expect(color[0]).toBe(0);
+          expect(color[1]).toBe(255);
+          expect(color[2]).toBe(0);
+          expect(color[3]).toBe(255);
+          done();
+        });
+      }, 100);
     });
   });
+
   it("loads a solid blue texture", function(done) {
     var roomsrc = '';

     var testroom = janusweb.loadFromSource(roomsrc, true);
     elation.events.add(testroom, 'room_load_complete', function() {
-      client.view.getPixelAt(0,0).then(function(color) {
-        expect(color[0]).toBe(0);
-        expect(color[1]).toBe(0);
-        expect(color[2]).toBe(255);
-        expect(color[3]).toBe(255);
-        done();
-      });
+      setTimeout(() => {
+        client.view.getPixelAt(0,0).then(function(color) {
+          expect(color[0]).toBe(0);
+          expect(color[1]).toBe(0);
+          expect(color[2]).toBe(255);
+          expect(color[3]).toBe(255);
+          done();
+        });
+      }, 100);
     });
   });
   it("loads a transparent red texture", function(done) {
@@ -99,13 +128,15 @@ describe("JanusWeb Render textures", function() {

     var testroom = janusweb.loadFromSource(roomsrc, true);
     elation.events.add(testroom, 'room_load_complete', function() {
-      client.view.getPixelAt(0,0).then(function(color) {
-        expect(color[0]).toBe(127);
-        expect(color[1]).toBe(0);
-        expect(color[2]).toBe(0);
-        expect(color[3]).toBe(255);
-        done();
-      });
+      setTimeout(() => {
+        client.view.getPixelAt(0,0).then(function(color) {
+          expect(color[0]).toBe(127);
+          expect(color[1]).toBe(0);
+          expect(color[2]).toBe(0);
+          expect(color[3]).toBe(255);
+          done();
+        });
+      }, 100);
     });
   });
   it("loads a transparent red texture over a solid green texture", function(done) {
@@ -113,17 +144,20 @@ describe("JanusWeb Render textures", function() {

     var testroom = janusweb.loadFromSource(roomsrc, true);
     elation.events.add(testroom, 'room_load_complete', function() {
-      client.view.getPixelAt(0,0).then(function(color) {
-console.log('got a color', color);
-        expect(color[0]).toBe(127);
-        expect(color[1]).toBe(128);
-        expect(color[2]).toBe(0);
-        expect(color[3]).toBe(255);
-        done();
-      });
+      setTimeout(() => {
+        client.view.getPixelAt(0,0).then(function(color) {
+  console.log('got a color', color);
+          expect(color[0]).toBe(127);
+          expect(color[1]).toBe(128);
+          expect(color[2]).toBe(0);
+          expect(color[3]).toBe(255);
+          done();
+        });
+      }, 100);
     });
   });

+
   it("should stop when done", function(done) {
     elation.events.add(client.engine, 'engine_stop', function() {
       expect(client.engine.running).toBe(false);

-----END OF PAGE-----