Fixes the shader builder so the constant shader

does not need normals. This means more files,
like sketchup files with no materials applied
will at least load (though they will most likely
still display incorrectly until we get the 
double-sided info in)

Review URL: http://codereview.chromium.org/119029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17938 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 9 deletions

diff --git a/o3d/samples/o3djs/effect.js b/o3d/samples/o3djs/effect.js
index 469d4e4..d9d22c4 100644
--- a/o3d/samples/o3djs/effect.js
+++ b/o3d/samples/o3djs/effect.js
@@ -620,15 +620,17 @@ o3djs.effect.buildStandardShaderString = function(material,
    */
   var buildVertexDecls = function(material, diffuse, specular) {
     var str = 'struct InVertex {\n' +
-              '  float4 position     : POSITION;\n' +
-              '  float3 normal       : NORMAL;\n' +
-              buildTexCoords(material) +
-              buildBumpInputCoords() +
-              '};\n' +
-              'struct OutVertex {\n' +
-              '  float4 position     : POSITION;\n' +
-              buildTexCoords(material) +
-              buildBumpOutputCoords();
+              '  float4 position     : POSITION;\n';
+    if (diffuse || specular) {
+      str += '  float3 normal       : NORMAL;\n';
+    }
+    str += buildTexCoords(material) +
+           buildBumpInputCoords() +
+           '};\n' +
+           'struct OutVertex {\n' +
+           '  float4 position     : POSITION;\n' +
+           buildTexCoords(material) +
+           buildBumpOutputCoords();
     if (diffuse || specular) {
       str += '  float3 normal        : TEXCOORD' + interpolant++ + ';\n' +
              '  float3 surfaceToLight: TEXCOORD' + interpolant++ + ';\n';