diff options
| -rw-r--r-- | o3d/samples/o3djs/material.js | 2 | ||||
| -rw-r--r-- | o3d/samples/old-school-shadows.html | 6 | ||||
| -rw-r--r-- | o3d/tests/selenium/sample_list.txt | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/o3d/samples/o3djs/material.js b/o3d/samples/o3djs/material.js index dde37de..a2aa67c 100644 --- a/o3d/samples/o3djs/material.js +++ b/o3d/samples/o3djs/material.js @@ -396,7 +396,7 @@ o3djs.material.createCheckerMaterial = function(pack, opt_transparent, opt_checkSize) { opt_color1 = opt_color1 || [0.4, 0.5, 0.5, 1]; - opt_color2 = opt_color2 || [0.4, 0.8, 0.8, 1]; + opt_color2 = opt_color2 || [0.6, 0.8, 0.8, 1]; opt_checkSize = opt_checkSize || 10; var effect = o3djs.effect.createCheckerEffect(pack); diff --git a/o3d/samples/old-school-shadows.html b/o3d/samples/old-school-shadows.html index 844603e..580f057 100644 --- a/o3d/samples/old-school-shadows.html +++ b/o3d/samples/old-school-shadows.html @@ -171,9 +171,9 @@ function initStep3(texture, exception) { sphereMaterial.getParam('specularFactor').value = 0.4; // The material for the ground. - var checkerMaterial = o3djs.material.createMaterialFromFile( - g_pack, 'shaders/green-blue-checker.shader', - g_viewInfo.performanceDrawList); + var checkerMaterial = o3djs.material.createCheckerMaterial( + g_pack, + g_viewInfo); // Make a material to use for the shadow. A standard constant shader will // be fine. diff --git a/o3d/tests/selenium/sample_list.txt b/o3d/tests/selenium/sample_list.txt index 9bca0b8..de0f665 100644 --- a/o3d/tests/selenium/sample_list.txt +++ b/o3d/tests/selenium/sample_list.txt @@ -70,7 +70,7 @@ medium 2d screenshot pdiff_threshold(41200) medium animation large animated-scene screenshot timeout(45000) pdiff_threshold(200) large beachdemo/beachdemo screenshot timeout(120000) pdiff_threshold(1900) pdiff_threshold_mac(2100) downsample(1) except(*iexplore, *googlechrome) -medium billboards screenshot pdiff_threshold(300000) +medium billboards screenshot pdiff_threshold(2000) medium bitmap-draw-image screenshot pdiff_threshold(300) medium canvas screenshot pdiff_threshold(4700) pdiff_threshold_mac(14600) medium canvas-fonts screenshot pdiff_threshold(1100) pdiff_threshold_mac(21900) @@ -111,7 +111,7 @@ medium zsorting screenshot pdiff_threshold(39500) large simpleviewer/simpleviewer screenshot pdiff_threshold(100) large trends/trends timeout(30000) medium GoogleIO-2009/step09ex screenshot pdiff_threshold(1900) -large GoogleIO-2009/step14ex screenshot pdiff_threshold(8000) +large GoogleIO-2009/step14ex screenshot pdiff_threshold(8000) timeout(45000) # -- tests below this line are tests for which there is a python # function to custom run the test. As such, only the 'except' and |