o3djs: Make bump shader code compile for webgl.

o3d/samples/o3djs/effect.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 579 matching lines @@
 
 
 /**
  * Builds bump output coords if needed.
  * @param {boolean} bumpSampler Whether there is a bump sampler.
  * @return {string} The code for bump input coords.
  */
 o3djs.effect.buildBumpOutputCoords = function(bumpSampler) {
   var p = o3djs.effect;
   return bumpSampler ?
-      ('  ' + p.FLOAT3 + ' tangent' +
+      ('  ' + p.VARYING + p.FLOAT3 + ' ' +
+         p.VARYING_DECLARATION_PREFIX + 'tangent' +
           p.semanticSuffix(
               'TEXCOORD' + p.interpolant_++) + ';\n' +
-       '  ' + p.FLOAT3 + ' binormal' +
-          p.semanticSuffix('TEXCOORD' +
-              p.interpolant_++) + ';\n' +
-       '  ' + p.FLOAT2 + ' bumpUV' +
+       '  ' + p.VARYING + p.FLOAT3 + ' ' +
+          p.VARYING_DECLARATION_PREFIX + 'binormal' +
+          p.semanticSuffix(
+              'TEXCOORD' + p.interpolant_++) + ';\n' +
+       '  ' + p.VARYING + p.FLOAT2 + ' ' +
+          p.VARYING_DECLARATION_PREFIX + 'bumpUV' +
           p.semanticSuffix(
               'TEXCOORD' + p.interpolant_++) + ';\n') : '';
 };
 
 
 /**
  * Builds vertex and fragment shader string for a 2-color checker effect.
  * @return {string} The effect code for the shader, ready to be parsed.
  */
 o3djs.effect.buildCheckerShaderString = function() {
@@ skipping 548 matching lines @@
    * @return {string} The code for the vertex shader.
    */
   var surfaceToViewVertexShaderCode = function() {
     return '  ' + p.VERTEX_VARYING_PREFIX +
         'surfaceToView = (viewInverse[3] - ' +
          p.mul(p.ATTRIBUTE_PREFIX + 'position', 'world') + ').xyz;\n';
   };
 
   /**
    * Builds the normal map part of the vertex shader.
-   * @param {boolean} opt_bumpSampler Whether there is a bump
-   *     sampler. Default = false.
    * @return {string} The code for normal mapping in the vertex shader.
    */
-  var bumpVertexShaderCode = function(opt_bumpSampler) {
+  var bumpVertexShaderCode = function() {
     return bumpSampler ?
         ('  ' + p.VERTEX_VARYING_PREFIX + 'binormal = ' +
          p.mul(p.FLOAT4 + '(' +
          p.ATTRIBUTE_PREFIX + 'binormal, 0)',
              'worldInverseTranspose') + '.xyz;\n' +
          '  ' + p.VERTEX_VARYING_PREFIX + 'tangent = ' +
          p.mul(p.FLOAT4 +
          '(' + p.ATTRIBUTE_PREFIX + 'tangent, 0)',
              'worldInverseTranspose') + '.xyz;\n') : '';
   };
 
   /**
    * Builds the normal calculation of the pixel shader.
    * @return {string} The code for normal computation in the pixel shader.
    */
   var getNormalShaderCode = function() {
-    return bumpSampler ?
-        (p.MATRIX3 + ' tangentToWorld = ' + p.MATRIX3 +
-            '(' + p.ATTRIBUTE_PREFIX + 'tangent,\n' +
+    if (bumpSampler) {
+      var type = getSamplerType(bumpSampler);
+      var tex2D = p.TEXTURE + type;
+      return (
+         p.MATRIX3 + ' tangentToWorld = ' + p.MATRIX3 +
+            '(' + p.PIXEL_VARYING_PREFIX + 'tangent,\n' +
          '                                   ' +
-         p.ATTRIBUTE_PREFIX + 'binormal,\n' +
+         p.PIXEL_VARYING_PREFIX + 'binormal,\n' +
          '                                   ' +
-         p.ATTRIBUTE_PREFIX + 'normal);\n' +
-         p.FLOAT3 + ' tangentNormal = tex2D(bumpSampler, ' +
-         p.ATTRIBUTE_PREFIX + 'bumpUV.xy).xyz -\n' +
+         p.PIXEL_VARYING_PREFIX + 'normal);\n' +
+         p.FLOAT3 + ' tangentNormal = ' + tex2D + '(bumpSampler, ' +
+         p.PIXEL_VARYING_PREFIX + 'bumpUV.xy).xyz -\n' +
          '                       ' + p.FLOAT3 +
          '(0.5, 0.5, 0.5);\n' + p.FLOAT3 + ' normal = ' +
          p.mul('tangentNormal', 'tangentToWorld') + ';\n' +
          'normal = normalize(' + p.PIXEL_VARYING_PREFIX +
-         'normal);\n') : '  ' + p.FLOAT3 + ' normal = normalize(' +
+         'normal);\n');
+    } else {
+      return '  ' + p.FLOAT3 + ' normal = normalize(' +
          p.PIXEL_VARYING_PREFIX + 'normal);\n';
+    }
   };
 
   /**
    * Builds the vertex declarations for a given material.
    * @param {!o3d.Material} material The material to inspect.
    * @param {boolean} diffuse Whether to include stuff for diffuse
    *     calculations.
    * @param {boolean} specular Whether to include stuff for diffuse
    *     calculations.
    * @return {string} The code for the vertex declarations.
@@ skipping 153 matching lines @@
   effect.name = o3djs.effect.TWO_COLOR_CHECKER_EFFECT_NAME;
   return effect;
 };
 
 
 // For compatability with o3d code, the default language is o3d shading
 // language.
 o3djs.effect.setLanguage('o3d');