Fixed bug in naming of texCoord[0..7] parameters discovered by petersont....

cg_to_glsl/convert.py

 #!/usr/bin/python
 import optparse
 import os
 import re
 import subprocess
 import sys
 
 # This script takes an o3d cg shader from standard input and does the following:
 #
 # * it extracts entry points to vertex and fragment shaders as specified by
 #   VertexShaderEntryPoint and PixelShaderEntryPoint instructions;
 #
 # * renames NORMAL, TANGENT{,1} and BINORMAL{,1} attributes to ATTR8-12;
 #
 # * runs cgc with glslv and glslf profiles with those entry points;
 #
 # * renames attributes and uniforms back to their orignal names;
 #
 # * changes 'uniform vecN var[N]' to 'uniform matN var';
 #
-# * renames gl_Vertex and gl_MultiTexCoordN to position and texcoordN
+# * renames gl_Vertex and gl_MultiTexCoordN to position and texCoordN
 #   respectively and adds attribute declarations;
 #
 # * prints the results to standard output, separating them with SplitMarker
 #   instruction and keeping the MatrixLoadOrder instruction as is.
 
 # Cygwin lies about the OS name ("posix" instead of "nt"), the line
 # separator, and perhaps other things. For most robust behavior, try
 # to find cgc on disk.
 
 def find_o3d_root():
@@ skipping 125 matching lines @@
       body)
 
   attributes = []
   if 'gl_Vertex' in body:
     # Change gl_Vertex to position and add attribute declaration.
     body = re.sub(r'\bgl_Vertex\b', 'position', body)
     attributes.append('attribute vec4 position;')
 
   for n in xrange(8):
     if 'gl_MultiTexCoord%d' % n in body:
-      # Change gl_MultiTexCoordN (0<=N<=7) to texcoordN and add attribute
+      # Change gl_MultiTexCoordN (0<=N<=7) to texCoordN and add attribute
       # declaration.
-      body = re.sub(r'\bgl_MultiTexCoord%d\b' % n, 'texcoord%d' % n, body)
-      attributes.append('attribute vec4 texcoord%d;' % n)
+      body = re.sub(r'\bgl_MultiTexCoord%d\b' % n, 'texCoord%d' % n, body)
+      attributes.append('attribute vec4 texCoord%d;' % n)
 
   # ATTRIBUTES_TO_SEMANTICS should have taken care of normals.
   assert 'gl_Normal' not in body
 
   if 'gl_Position' in body:
     # If there is exactly one assignment to gl_Position, modify it similar to
     # how RewriteVertexProgramSource in gl/effect_gl.cc does it.  The input is
     # taken from vec4 dx_clipping uniform.
     #
     # If there is more than one gl_Position mentioned in the shader, the
@@ skipping 91 matching lines @@
     else:
       f = open(options.file)
     input = f.read()
   except KeyboardInterrupt:
     input = None
 
   if not input:
     cmdline_parser.print_help()
   else:
     main(input, CGC)