Incremental progress toward archive loading in o3d-webgl. Implemented...

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
@@ skipping 82 matching lines @@
     # If there is more than one gl_Position mentioned in the shader, the
     # converter fails.
     assert len(re.findall('gl_Position', body)) == 1
     attributes.append('vec4 _glPositionTemp;')
     attributes.append('uniform vec4 dx_clipping;')
     body = re.sub(r'\bgl_Position\b([^;]*);',
                   r'_glPositionTemp\1; gl_Position = vec4(' +
                   r'_glPositionTemp.x + _glPositionTemp.w * dx_clipping.x, ' +
                   r'dx_clipping.w * ' +
                   r'(_glPositionTemp.y + _glPositionTemp.w * dx_clipping.y), ' +
-                  r'_glPositionTemp.z * 2 - _glPositionTemp.w, ' +
+                  r'_glPositionTemp.z * 2.0 - _glPositionTemp.w, ' +
                   r'_glPositionTemp.w);', body)
 
   return '\n'.join(attributes) + '\n\n' + body
 
 
 def fix_glsl(glsl_shader):
   header, body = re.split(r'\n\n', glsl_shader, 1)
   assert all(l.startswith('//') for l in header.splitlines())
   input_mapping = get_input_mapping(header)
   return header + '\n\n' + fix_glsl_body(body, input_mapping)
@@ skipping 67 matching lines @@
 
     try:
       input = sys.stdin.read()
     except KeyboardInterrupt:
       input = None
 
     if not input:
       cmdline_parser.print_help()
     else:
       main(input)