o3djs: Multiple simple lights, and a new demo.

o3djs/material.js

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 95 matching lines @@
  * This function is very specific to our sample importer. It expects that if
  * no Effect exists on a material that certain extra Params have been created
  * on the Material to give us instructions on what to Effects to create.
  *
  * @param {!o3d.Pack} pack Pack to manage created objects.
  * @param {!o3djs.rendergraph.ViewInfo} viewInfo as returned from
  *     o3djs.rendergraph.createView.
  * @param {!o3d.Material} material to prepare.
  * @param {string} opt_effectType type of effect to create ('phong',
  *     'lambert', 'constant').
+ * @param {Object} opt_options Extra options for effect.getStandardShader
  *
  * @see o3djs.material.attachStandardEffect
  */
 o3djs.material.prepareMaterial = function(pack,
                                           viewInfo,
                                           material,
-                                          opt_effectType) {
+                                          opt_effectType,
+                                          opt_options) {
   // Assume we want the performance list
   var drawList = viewInfo.performanceDrawList;
   // First check if we have a tag telling us that it is or is not
   // transparent
   if (!material.drawList) {
     var param = material.getParam('collada.transparent');
     if (param && param.className == 'o3d.ParamBoolean') {
       material.drawList = param.value ? viewInfo.zOrderedDrawList :
                                         viewInfo.performanceDrawList;
     }
   }
   // If the material has no effect, try to build shaders for it.
   if (!material.effect) {
     // If the user didn't pass an effect type in see if one was stored there
     // by our importer.
     if (!opt_effectType) {
       // Retrieve the lightingType parameter from the material, if any.
       var lightingType = o3djs.effect.getColladaLightingType(material);
       if (lightingType) {
         opt_effectType = lightingType;
       }
     }
     if (opt_effectType) {
       o3djs.material.attachStandardEffect(pack,
                                           material,
                                           viewInfo,
-                                          opt_effectType);
+                                          opt_effectType,
+                                          opt_options);
       // For collada common profile stuff guess what drawList to use. Note: We
       // can only do this for collada common profile stuff because we supply
       // the shaders and therefore now the inputs and how they are used.
       // For other shaders you've got to do this stuff yourself. On top of
       // that this is a total guess. Just because a texture has no alpha
       // it does not follow that you don't want it in the zOrderedDrawList.
       // That is application specific. Here we are just making a guess and
       // hoping that it covers most cases.
       if (material.drawList == null) {
         // Check the common profile params.
@@ skipping 18 matching lines @@
  *
  * This function is very specific to our sample importer. It expects that if
  * no Effect exists on a material that certain extra Params have been created
  * on the Material to give us instructions on what to Effects to create.
  *
  * @param {!o3d.Pack} pack Pack to prepare.
  * @param {!o3djs.rendergraph.ViewInfo} viewInfo as returned from
  *     o3djs.rendergraph.createView.
  * @param {!o3d.Pack} opt_effectPack Pack to create effects in. If this
  *     is not specifed the pack to prepare above will be used.
+ * @param {Object} opt_options Extra options for effect.getStandardShader
  *
  * @see o3djs.material.prepareMaterial
  */
 o3djs.material.prepareMaterials = function(pack,
                                            viewInfo,
-                                           opt_effectPack) {
+                                           opt_effectPack,
+                                           opt_options) {
   var materials = pack.getObjectsByClassName('o3d.Material');
   for (var mm = 0; mm < materials.length; mm++) {
     o3djs.material.prepareMaterial(opt_effectPack || pack,
                                    viewInfo,
-                                   materials[mm]);
+                                   materials[mm],
+                                   opt_options);
   }
 };
 
 /**
  * Builds a standard effect for a given material.
  * If the material already has an effect, none is created.
  * @param {!o3d.Pack} pack Pack to manage created objects.
  * @param {!o3d.Material} material The material for which to create an
  *     effect.
  * @param {string} effectType Type of effect to create ('phong', 'lambert',
  *     'constant').
+ * @param {Object} opt_options Extra options for effect.getStandardShader
  *
  * @see o3djs.effect.attachStandardShader
  */
 o3djs.material.attachStandardEffectEx = function(pack,
                                                  material,
-                                                 effectType) {
+                                                 effectType,
+                                                 opt_options) {
   if (!material.effect) {
     if (!o3djs.effect.attachStandardShader(pack,
                                            material,
                                            [0, 0, 0],
-                                           effectType)) {
+                                           effectType,
+                                           opt_options)) {
       throw 'Could not attach a standard effect';
     }
   }
 };
 
 /**
  * Builds a standard effect for a given material.  The position of the
  * default light is set to the view position.  If the material already has
  * an effect, none is created.
  * @param {!o3d.Pack} pack Pack to manage created objects.
  * @param {!o3d.Material} material The material for which to create an
  *     effect.
  * @param {!o3djs.rendergraph.ViewInfo} viewInfo as returned from
  *     o3djs.rendergraph.createView.
  * @param {string} effectType Type of effect to create ('phong', 'lambert',
  *     'constant').
+ * @param {Object} opt_options Extra options for effect.getStandardShader
  *
  * @see o3djs.effect.attachStandardShader
  */
 o3djs.material.attachStandardEffect = function(pack,
                                                material,
                                                viewInfo,
-                                               effectType) {
+                                               effectType,
+                                               opt_options) {
   if (!material.effect) {
     var lightPos =
         o3djs.math.matrix4.getTranslation(
             o3djs.math.inverse(viewInfo.drawContext.view));
     if (!o3djs.effect.attachStandardShader(pack,
                                            material,
                                            lightPos,  // TODO(gman): remove this
-                                           effectType)) {
+                                           effectType,
+                                           opt_options)) {
       throw 'Could not attach a standard effect';
     }
   }
 };
 
 /**
  * Prepares all the materials in the given pack by setting their
  * drawList.
  * @param {!o3d.Pack} pack Pack to manage created objects.
  * @param {!o3d.DrawList} drawList DrawList to assign to materials.
@@ skipping 309 matching lines @@
  * @param {!o3d.Pack} pack Pack to create params in.
  * @return {!Object} params A object where each property is the name of a param
  *     and its value is that param.
  */
 o3djs.material.createAndBindStandardParams = function(pack) {
   var params = o3djs.material.createStandardParams(pack);
   o3djs.material.bindParams(pack, params);
   return params;
 };