Added culling sample.

samples/o3d-webgl/param.js

 /*
  * Copyright 2010, 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 571 matching lines @@
   this.transpose_ = true;
 };
 o3d.inherit('ViewInverseTransposeParamMatrix4', 'CompositionParamMatrix4');
 
 
 /**
  * @constructor
  */
 o3d.ViewProjectionParamMatrix4 = function() {
   o3d.CompositionParamMatrix4.call(this);
-  this.matrix_names_ = ['projection', 'view'];
+  this.matrix_names_ = ['viewProjection'];
 };
 o3d.inherit('ViewProjectionParamMatrix4', 'CompositionParamMatrix4');
 
 
 /**
  * @constructor
  */
 o3d.ViewProjectionInverseParamMatrix4 = function() {
   o3d.CompositionParamMatrix4.call(this);
-  this.matrix_names_ = ['projection', 'view'];
+  this.matrix_names_ = ['viewProjection'];
   this.inverse_ = true;
 };
 o3d.inherit('ViewProjectionInverseParamMatrix4', 'CompositionParamMatrix4');
 
 
 /**
  * @constructor
  */
 o3d.ViewProjectionTransposeParamMatrix4 = function() {
   o3d.CompositionParamMatrix4.call(this);
-  this.matrix_names_ = ['projection', 'view'];
+  this.matrix_names_ = ['viewProjection'];
   this.transpose_ = true;
 };
 o3d.inherit('ViewProjectionTransposeParamMatrix4', 'CompositionParamMatrix4');
 
 
 /**
  * @constructor
  */
 o3d.ViewProjectionInverseTransposeParamMatrix4 = function() {
   o3d.CompositionParamMatrix4.call(this);
-  this.matrix_names_ = ['projection', 'view'];
+  this.matrix_names_ = ['viewProjection'];
   this.inverse_ = true;
   this.transpose_ = true;
 };
 o3d.inherit('ViewProjectionInverseTransposeParamMatrix4',
     'CompositionParamMatrix4');
 
 
 /**
  * @constructor
  */
@@ skipping 83 matching lines @@
 };
 o3d.inherit('WorldViewInverseTransposeParamMatrix4',
     'CompositionParamMatrix4');
 
 
 /**
  * @constructor
  */
 o3d.WorldViewProjectionParamMatrix4 = function() {
   o3d.CompositionParamMatrix4.call(this);
-  this.matrix_names_ = ['projection', 'view', 'world'];
+  this.matrix_names_ = ['worldViewProjection'];
 };
 o3d.inherit('WorldViewProjectionParamMatrix4',
     'CompositionParamMatrix4');
 
 
 /**
  * @constructor
  */
 o3d.WorldViewProjectionInverseParamMatrix4 = function() {
   o3d.CompositionParamMatrix4.call(this);
-  this.matrix_names_ = ['projection', 'view', 'world'];
+  this.matrix_names_ = ['worldViewProjection'];
   this.inverse_ = true;
 };
 o3d.inherit('WorldViewProjectionInverseParamMatrix4',
     'CompositionParamMatrix4');
 
 
 /**
  * @constructor
  */
 o3d.WorldViewProjectionTransposeParamMatrix4 = function() {
   o3d.CompositionParamMatrix4.call(this);
-  this.matrix_names_ = ['projection', 'view', 'world'];
+  this.matrix_names_ = ['worldViewProjection'];
   this.transpose_ = true;
 };
 o3d.inherit('WorldViewProjectionTransposeParamMatrix4',
     'CompositionParamMatrix4');
 
 
 /**
  * @constructor
  */
 o3d.WorldViewProjectionInverseTransposeParamMatrix4 = function() {
   o3d.CompositionParamMatrix4.call(this);
-  this.matrix_names_ = ['projection', 'view', 'world'];
+  this.matrix_names_ = ['worldViewProjection'];
   this.inverse_ = true;
   this.transpose_ = true;
 };
 o3d.inherit('WorldViewProjectionInverseTransposeParamMatrix4',
     'CompositionParamMatrix4');
 
 /**
  * Called to specify the value of a uniform variable.
  */
 o3d.ParamFloat.prototype.applyToLocation = function(gl, location) {
@@ skipping 41 matching lines @@
  */
 o3d.ParamSampler.prototype.applyToLocation = function(gl, location) {
   // When before the effect object assigns values to parameters,
   // it sets this variable to 0.
   var i = o3d.Param.texture_index_;
   gl.activeTexture(gl.TEXTURE0 + i);
 
   var value = null;
   var target = 0;
 
-  if (this.value) {
-    this.value.bindAndSetParameters_();
-    gl.uniform1i(location, i);
-    o3d.Param.texture_index_++;
+  if (this.value && this.value.texture && this.value.texture.texture_) {
+    value = this.value.texture.texture_;
+    target = this.value.texture.texture_target_;
   }
+
+  gl.bindTexture(target, value);
+  gl.uniform1i(location, i);
+  o3d.Param.texture_index_++;
 };
 
 
 /**
  * Object to compute all combinations of world/view/projection
  * inverse/transpose matrices and provide them as parameters.
  *
  * @type {o3d.ParamObject}
  */
 o3d.Param.SAS = new o3d.ParamObject;
@@ skipping 64 matching lines @@
  */
 o3d.Param.SAS.setView = function(view) {
   this['view'] = view;
 };
 
 /**
  * Sets the base world matrix that gets use to compute all other products for
  * SAS parameters.
  */
 o3d.Param.SAS.setProjection = function(projection) {
-  // TODO(petersont): this wasn't being used. Need to adjust all of
-  // the handwritten GLSL shaders to incorporate the modification of
-  // gl_Position based on dx_clipping.
-  /*
-  var adjustedProjection =
-          [[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 2, 0], [0, 0, -1, 1]];
-      o3d.Transform.compose(
-          adjustedProjection, projection, adjustedProjection);
-  */
   this['projection'] = projection;
 };
 
+/**
+ * Sets the viewProjection matrix.
+ */
+o3d.Param.SAS.setViewProjection = function(viewProjection) {
+  this['viewProjection'] = viewProjection;
+};
 
+/**
+ * Sets the worldViewProjection matrix.
+ */
+o3d.Param.SAS.setWorldViewProjection = function(worldViewProjection) {
+  this['worldViewProjection'] = worldViewProjection;
+};