summaryrefslogtreecommitdiffstats
path: root/o3d/samples/zsorting.html
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 04:21:40 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 04:21:40 +0000
commit70c8e97a69ef8806b1812b2cd0ebe831f3792cb6 (patch)
tree4c5b5e5b71ce99f91910b3fd569443f0f07a4e72 /o3d/samples/zsorting.html
parent13a8961bf84b7132e2ae588ea644bf7b8012fe75 (diff)
downloadchromium_src-70c8e97a69ef8806b1812b2cd0ebe831f3792cb6.zip
chromium_src-70c8e97a69ef8806b1812b2cd0ebe831f3792cb6.tar.gz
chromium_src-70c8e97a69ef8806b1812b2cd0ebe831f3792cb6.tar.bz2
Update samples to use more utility functions where
appropriate. A few places used pseudoRandom. That is in math.js now so they use that. Other places there is now o3djs.material.createBasicMaterial and o3djs.material.createMaterialFromFile that save 10-20 lines per sample. This CL will require new reference images. There are 2 other things I'd like to consider. #1) Changing every sample that uses shaders/texture-only.shader to use o3djs.material.createConstantMaterial or some variation. The problem with o3djs.material.createConstantMaterial is it requires you pass it a texture if you want a constant textured material. All the samples create the material first, then later add the texture. So, I could add a new o3djs.material.createTextureOnlyMaterial. At the same time that would mean changing those samples from setting stuff on 'texSampler0' to 'emissive' #2) I'd like to change the shader builder so it stops adding "Sampler" to textured materials. As it is if the material uses a color it makes the param called "diffuse" but if it's a texture it makes it "diffuseSampler". That sucks because it means the code has to do crap like var param = material.getParam('diffuse'); if (param) { // it's a color } else { param = material.getParam('diffuseSampler'); if (param) { // it's a texture. } } If we stopped that silliness we could just do var param = material.getParam('diffuse'); if (param) { if (param.isA('o3d.ParamTexture')) { // it's textured. } else { // it's not. } } Unfortunately to fix this requires changing the o3dConverter as well since it uses those conventions. Should we do this? Review URL: http://codereview.chromium.org/182024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/zsorting.html')
-rw-r--r--o3d/samples/zsorting.html31
1 files changed, 5 insertions, 26 deletions
diff --git a/o3d/samples/zsorting.html b/o3d/samples/zsorting.html
index 55826ba..8168aaa 100644
--- a/o3d/samples/zsorting.html
+++ b/o3d/samples/zsorting.html
@@ -49,7 +49,7 @@ o3djs.require('o3djs.util');
o3djs.require('o3djs.math');
o3djs.require('o3djs.rendergraph');
o3djs.require('o3djs.primitives');
-o3djs.require('o3djs.effect');
+o3djs.require('o3djs.material');
// Events
// init() once the page has finished loading.
@@ -100,7 +100,7 @@ function createInstances(pack, shape) {
(x - UNITS_ACROSS_GROUP * 0.5) * UNIT_SPACING,
(y - UNITS_ACROSS_GROUP * 0.5) * UNIT_SPACING,
(z - UNITS_ACROSS_GROUP * 0.5) * UNIT_SPACING);
- transform.createParam('colorMult', 'ParamFloat4').value = [
+ transform.createParam('diffuse', 'ParamFloat4').value = [
(g * UNITS_ACROSS_GROUP + x) * (1 / TOTAL_ACROSS),
(h * UNITS_ACROSS_GROUP + y) * (1 / TOTAL_ACROSS),
(i * UNITS_ACROSS_GROUP + z) * (1 / TOTAL_ACROSS),
@@ -147,30 +147,9 @@ function initStep2(clientElements) {
0.1,
10000);
- // Create and load the effect.
- var effect = g_pack.createObject('Effect');
- o3djs.effect.loadEffect(effect, 'shaders/phong-with-colormult.shader');
-
- // Create a Material for the effect.
- var material = g_pack.createObject('Material');
-
- // Apply our effect to this material.
- material.effect = effect;
-
- // Set the material's drawList
- material.drawList = g_viewInfo.zOrderedDrawList;
-
- // Create the params the effect needs on the material.
- effect.createUniformParameters(material);
-
- // Set the material parameters.
- material.getParam('lightWorldPos').value = [1000, 1000, 0];
- material.getParam('lightIntensity').value = [1, 1, 1, 1];
- material.getParam('ambientIntensity').value = [0.1, 0.1, 0.1, 1];
- material.getParam('ambient').value = [1, 1, 1, 1];
- material.getParam('diffuse').value = [1, 1, 1, 1];
- material.getParam('specular').value = [0.5, 0.5, 0.5, 1];
- material.getParam('shininess').value = 50;
+ // Create a Material.
+ var material = o3djs.material.createBasicMaterial(
+ g_pack, g_viewInfo, [1, 1, 1, 1], true);
// Create a sphere.
var shape = o3djs.primitives.createSphere(g_pack, material, 30, 20, 20);