Browse Source

Updating validation images wioth new config

Raanan Weber 7 years ago
parent
commit
14fff269a9
49 changed files with 5 additions and 7 deletions
  1. BIN
      Viewer/tests/validation/ReferenceImages/Control.png
  2. BIN
      Viewer/tests/validation/ReferenceImages/ControlDefault.png
  3. BIN
      Viewer/tests/validation/ReferenceImages/Diffuse.png
  4. BIN
      Viewer/tests/validation/ReferenceImages/Emissive.png
  5. BIN
      Viewer/tests/validation/ReferenceImages/MainColorEnv0-0.png
  6. BIN
      Viewer/tests/validation/ReferenceImages/MainColorEnv0-100.png
  7. BIN
      Viewer/tests/validation/ReferenceImages/MainColorEnv0-50.png
  8. BIN
      Viewer/tests/validation/ReferenceImages/MainColorEnv100-0.png
  9. BIN
      Viewer/tests/validation/ReferenceImages/MainColorEnv100-100.png
  10. BIN
      Viewer/tests/validation/ReferenceImages/MainColorEnv100-50.png
  11. BIN
      Viewer/tests/validation/ReferenceImages/MainColorEnv50-0.png
  12. BIN
      Viewer/tests/validation/ReferenceImages/MainColorEnv50-100.png
  13. BIN
      Viewer/tests/validation/ReferenceImages/MainColorEnv50-50.png
  14. BIN
      Viewer/tests/validation/ReferenceImages/Specular0-0.png
  15. BIN
      Viewer/tests/validation/ReferenceImages/Specular0-100.png
  16. BIN
      Viewer/tests/validation/ReferenceImages/Specular0-25.png
  17. BIN
      Viewer/tests/validation/ReferenceImages/Specular0-50.png
  18. BIN
      Viewer/tests/validation/ReferenceImages/Specular0-75.png
  19. BIN
      Viewer/tests/validation/ReferenceImages/Specular100-0.png
  20. BIN
      Viewer/tests/validation/ReferenceImages/Specular100-100.png
  21. BIN
      Viewer/tests/validation/ReferenceImages/Specular100-25.png
  22. BIN
      Viewer/tests/validation/ReferenceImages/Specular100-50.png
  23. BIN
      Viewer/tests/validation/ReferenceImages/Specular100-75.png
  24. BIN
      Viewer/tests/validation/ReferenceImages/Specular25-0.png
  25. BIN
      Viewer/tests/validation/ReferenceImages/Specular25-100.png
  26. BIN
      Viewer/tests/validation/ReferenceImages/Specular25-25.png
  27. BIN
      Viewer/tests/validation/ReferenceImages/Specular25-50.png
  28. BIN
      Viewer/tests/validation/ReferenceImages/Specular25-75.png
  29. BIN
      Viewer/tests/validation/ReferenceImages/Specular50-0.png
  30. BIN
      Viewer/tests/validation/ReferenceImages/Specular50-100.png
  31. BIN
      Viewer/tests/validation/ReferenceImages/Specular50-25.png
  32. BIN
      Viewer/tests/validation/ReferenceImages/Specular50-50.png
  33. BIN
      Viewer/tests/validation/ReferenceImages/Specular50-75.png
  34. BIN
      Viewer/tests/validation/ReferenceImages/Specular75-0.png
  35. BIN
      Viewer/tests/validation/ReferenceImages/Specular75-100.png
  36. BIN
      Viewer/tests/validation/ReferenceImages/Specular75-25.png
  37. BIN
      Viewer/tests/validation/ReferenceImages/Specular75-50.png
  38. BIN
      Viewer/tests/validation/ReferenceImages/Specular75-75.png
  39. BIN
      Viewer/tests/validation/ReferenceImages/SpecularEnv0-0.png
  40. BIN
      Viewer/tests/validation/ReferenceImages/SpecularEnv0-100.png
  41. BIN
      Viewer/tests/validation/ReferenceImages/SpecularEnv0-50.png
  42. BIN
      Viewer/tests/validation/ReferenceImages/SpecularEnv100-0.png
  43. BIN
      Viewer/tests/validation/ReferenceImages/SpecularEnv100-100.png
  44. BIN
      Viewer/tests/validation/ReferenceImages/SpecularEnv100-50.png
  45. BIN
      Viewer/tests/validation/ReferenceImages/SpecularEnv50-0.png
  46. BIN
      Viewer/tests/validation/ReferenceImages/SpecularEnv50-100.png
  47. BIN
      Viewer/tests/validation/ReferenceImages/SpecularEnv50-50.png
  48. 1 1
      Viewer/tests/validation/config.json
  49. 4 6
      Viewer/tests/validation/validation.js

BIN
Viewer/tests/validation/ReferenceImages/Control.png


BIN
Viewer/tests/validation/ReferenceImages/ControlDefault.png


BIN
Viewer/tests/validation/ReferenceImages/Diffuse.png


BIN
Viewer/tests/validation/ReferenceImages/Emissive.png


BIN
Viewer/tests/validation/ReferenceImages/MainColorEnv0-0.png


BIN
Viewer/tests/validation/ReferenceImages/MainColorEnv0-100.png


BIN
Viewer/tests/validation/ReferenceImages/MainColorEnv0-50.png


BIN
Viewer/tests/validation/ReferenceImages/MainColorEnv100-0.png


BIN
Viewer/tests/validation/ReferenceImages/MainColorEnv100-100.png


BIN
Viewer/tests/validation/ReferenceImages/MainColorEnv100-50.png


BIN
Viewer/tests/validation/ReferenceImages/MainColorEnv50-0.png


BIN
Viewer/tests/validation/ReferenceImages/MainColorEnv50-100.png


BIN
Viewer/tests/validation/ReferenceImages/MainColorEnv50-50.png


BIN
Viewer/tests/validation/ReferenceImages/Specular0-0.png


BIN
Viewer/tests/validation/ReferenceImages/Specular0-100.png


BIN
Viewer/tests/validation/ReferenceImages/Specular0-25.png


BIN
Viewer/tests/validation/ReferenceImages/Specular0-50.png


BIN
Viewer/tests/validation/ReferenceImages/Specular0-75.png


BIN
Viewer/tests/validation/ReferenceImages/Specular100-0.png


BIN
Viewer/tests/validation/ReferenceImages/Specular100-100.png


BIN
Viewer/tests/validation/ReferenceImages/Specular100-25.png


BIN
Viewer/tests/validation/ReferenceImages/Specular100-50.png


BIN
Viewer/tests/validation/ReferenceImages/Specular100-75.png


BIN
Viewer/tests/validation/ReferenceImages/Specular25-0.png


BIN
Viewer/tests/validation/ReferenceImages/Specular25-100.png


BIN
Viewer/tests/validation/ReferenceImages/Specular25-25.png


BIN
Viewer/tests/validation/ReferenceImages/Specular25-50.png


BIN
Viewer/tests/validation/ReferenceImages/Specular25-75.png


BIN
Viewer/tests/validation/ReferenceImages/Specular50-0.png


BIN
Viewer/tests/validation/ReferenceImages/Specular50-100.png


BIN
Viewer/tests/validation/ReferenceImages/Specular50-25.png


BIN
Viewer/tests/validation/ReferenceImages/Specular50-50.png


BIN
Viewer/tests/validation/ReferenceImages/Specular50-75.png


BIN
Viewer/tests/validation/ReferenceImages/Specular75-0.png


BIN
Viewer/tests/validation/ReferenceImages/Specular75-100.png


BIN
Viewer/tests/validation/ReferenceImages/Specular75-25.png


BIN
Viewer/tests/validation/ReferenceImages/Specular75-50.png


BIN
Viewer/tests/validation/ReferenceImages/Specular75-75.png


BIN
Viewer/tests/validation/ReferenceImages/SpecularEnv0-0.png


BIN
Viewer/tests/validation/ReferenceImages/SpecularEnv0-100.png


BIN
Viewer/tests/validation/ReferenceImages/SpecularEnv0-50.png


BIN
Viewer/tests/validation/ReferenceImages/SpecularEnv100-0.png


BIN
Viewer/tests/validation/ReferenceImages/SpecularEnv100-100.png


BIN
Viewer/tests/validation/ReferenceImages/SpecularEnv100-50.png


BIN
Viewer/tests/validation/ReferenceImages/SpecularEnv50-0.png


BIN
Viewer/tests/validation/ReferenceImages/SpecularEnv50-100.png


BIN
Viewer/tests/validation/ReferenceImages/SpecularEnv50-50.png


+ 1 - 1
Viewer/tests/validation/config.json

@@ -5,7 +5,7 @@
             "title": "Control Default",
             "title": "Control Default",
             "createMesh": true,
             "createMesh": true,
             "configuration": {
             "configuration": {
-                "extends": "default"
+                "extends": "minimal"
             },
             },
             "referenceImage": "ControlDefault.png"
             "referenceImage": "ControlDefault.png"
         },
         },

+ 4 - 6
Viewer/tests/validation/validation.js

@@ -138,6 +138,8 @@ function evaluate(test, resultCanvas, result, renderImage, index, waitRing, done
 
 
     var renderB64 = saveRenderImage(renderData, currentViewer.canvas);
     var renderB64 = saveRenderImage(renderData, currentViewer.canvas);
     renderImage.src = renderB64;
     renderImage.src = renderB64;
+
+    // save all reference images
     // downloadDataUrlFromJavascript(test.referenceImage, renderB64)
     // downloadDataUrlFromJavascript(test.referenceImage, renderB64)
 
 
     done(testRes, renderB64);
     done(testRes, renderB64);
@@ -151,11 +153,6 @@ function runTest(index, done) {
 
 
     var test = Object.assign({}, config.tests[index]);
     var test = Object.assign({}, config.tests[index]);
 
 
-    //process params
-    /*if (params) {
-        processTest(test, "", params);
-    }*/
-
     var container = document.createElement("div");
     var container = document.createElement("div");
     container.id = "container#" + index;
     container.id = "container#" + index;
     container.className = "container";
     container.className = "container";
@@ -244,7 +241,7 @@ function runTest(index, done) {
     currentViewer.onInitDoneObservable.add(() => {
     currentViewer.onInitDoneObservable.add(() => {
 
 
         var currentFrame = 0;
         var currentFrame = 0;
-        var waitForFrame = test.waitForFrame || 0;
+        var waitForFrame = test.waitForFrame || 1;
 
 
         if (test.model) {
         if (test.model) {
             currentViewer.initModel(test.model);
             currentViewer.initModel(test.model);
@@ -284,6 +281,7 @@ function prepareMeshForViewer(viewer, configuration, test) {
         sphereMesh.material = material;
         sphereMesh.material = material;
     }
     }
     meshModel.addMesh(sphereMesh, true);
     meshModel.addMesh(sphereMesh, true);
+    meshModel.rootMesh.position.y = 0.5;
 }
 }
 
 
 function init() {
 function init() {