Jelajahi Sumber

preparing for local assets delivery in validation testing

Raanan Weber 7 tahun lalu
induk
melakukan
8a97b37cb4

+ 1 - 1
Viewer/tests/validation/index.css

@@ -70,7 +70,7 @@ body {
 
 babylon {
     position: absolute !important;
-    transform: translateY(600px);
+    transform: translateX(-600px);
     width: 600px;
     height: 400px;
 }

+ 3 - 2
Viewer/tests/validation/karma.conf.js

@@ -19,10 +19,11 @@ module.exports = function (config) {
             './tests/validation/integration.js',
             './tests/validation/validation.js',
             { pattern: './tests/**/*', watched: false, included: false, served: true },
-            { pattern: '../dist/**/*', watched: false, included: false, served: true },
+            { pattern: './dist/assets/**/*', watched: false, included: false, served: true },
         ],
         proxies: {
-            '/tests/': '/base/tests/'
+            '/tests/': '/base/tests/',
+            '/dist/assets/': '/base//dist/assets/'
         },
 
         port: 3000,

+ 8 - 9
Viewer/tests/validation/validation.js

@@ -71,8 +71,6 @@ function getRenderData(canvas, engine) {
         }
     }
 
-    console.log(engine, engine.getRenderingCanvas());
-
     return renderData;
 }
 
@@ -125,8 +123,6 @@ function evaluate(test, resultCanvas, result, renderImage, index, waitRing, done
     var renderB64 = saveRenderImage(renderData, currentViewer.canvas);
     renderImage.src = renderB64;
 
-
-
     done(testRes, renderB64);
 }
 
@@ -191,15 +187,18 @@ function runTest(index, done) {
 
     // create a new viewer
     currentViewer && currentViewer.dispose();
+    currentViewer = null;
     currentScene = null;
-    console.log("currentViewer", index);
+    viewerElement.innerHTML = '';
     currentViewer = new BabylonViewer.DefaultViewer(viewerElement, configuration);
 
-    currentViewer.onModelLoadedObservable.add(() => {
-        console.log("currentViewer", index);
-        setTimeout(() => {
+    var currentFrame = 0;
+    var waitForFrame = test.waitForFrame || 80;
+    currentViewer.onFrameRenderedObservable.add(() => {
+        if (currentFrame === waitForFrame) {
             evaluate(test, resultCanvas, result, renderImage, index, waitRing, done);
-        }, 1000);
+        }
+        currentFrame++;
     });
 }