diff options
| author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 22:48:21 +0000 |
|---|---|---|
| committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 22:48:21 +0000 |
| commit | 505e780e7cabf2e30f9e786480f3b83b5936098c (patch) | |
| tree | 047cd4b1f78211e8384fb68f5b6fd6fab457e069 /o3d/samples | |
| parent | 49771931b836901f82adb465a4aa8dfceb9356d5 (diff) | |
| download | chromium_src-505e780e7cabf2e30f9e786480f3b83b5936098c.zip chromium_src-505e780e7cabf2e30f9e786480f3b83b5936098c.tar.gz chromium_src-505e780e7cabf2e30f9e786480f3b83b5936098c.tar.bz2 | |
Fix createCheckerMaterial to use same colors as it original used.
and increase timeout for Google IO step14ex. Also make
old-school-shadows use createCheckerMaterial
Review URL: http://codereview.chromium.org/155554
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples')
| -rw-r--r-- | o3d/samples/o3djs/material.js | 2 | ||||
| -rw-r--r-- | o3d/samples/old-school-shadows.html | 6 |
2 files changed, 4 insertions, 4 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. |