Changed cg_to_glsl converter script to also look in the script's...

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 15 matching lines @@
 
 # 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.
 
 CGC = '/usr/bin/cgc'
 if not os.path.exists(CGC):
   CGC = 'c:/Program Files (x86)/NVIDIA Corporation/Cg/bin/cgc.exe'
   if not os.path.exists(CGC):
     CGC = 'c:/Program Files (x86)/NVIDIA Corporation/Cg/bin/cgc.exe'
+    if not os.path.exists(CGC):
+      script_path = os.path.abspath(sys.path[0])
+      # Try again looking in the current working directory to match
+      # the layout of the prebuilt o3dConverter binaries.
+      CGC = os.path.join(script_path, 'cgc')
+      if not os.path.exists(CGC):
+        CGC = os.path.join(script_path, 'cgc.exe')
 
 # cgc complains about TANGENT1 and BINORMAL1 semantics, so we hack it by
 # replacing standard semantics with ATTR8-ATTR12 and then renaming them back to
 # their original names.
 ATTRIBUTES_TO_SEMANTICS = dict(
     attr8 = 'normal',
     attr9 = 'tangent',
     attr10 = 'binormal',
     attr11 = 'tangent1',
     attr12 = 'binormal1')
@@ skipping 186 matching lines @@
     else:
       f = open(options.file)
     input = f.read()
   except KeyboardInterrupt:
     input = None
 
   if not input:
     cmdline_parser.print_help()
   else:
     main(input)