Fixed bug in samples conversion introduced by WebGL-related changes and...

samples/samples_gen.py

 #!/usr/bin/env python
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import posixpath
 import sys
 import os.path
 
 output_filename = 'samples_gen.gyp'
@@ skipping 79 matching lines @@
 
 def write_action(asset, webgl_mode):
   filename = posixpath.splitext(posixpath.basename(asset['path']))[0]
   filename = filename.replace('.','_')
   filename = filename.replace('-','_')
   filename = filename.lower()
   name = "convert_" + filename
   if webgl_mode:
     name = name + "_webgl"
   output = asset['path'].replace('convert_', '')
-  output = posixpath.splitext(output)[0] + ".o3dtgz"
+  output_base = posixpath.splitext(output)[0]
+  output_tgz = output_base + ".o3dtgz"
+  output_json = output_base + "/scene.json"
+  output = output_tgz
+  if webgl_mode:
+    output = output_json
   output_dir = posixpath.dirname(output)
   output_file.write("        {\n")
   output_file.write("          'action_name': '%s',\n" % name)
   output_file.write("          'inputs': [\n")
   output_file.write("            '<(PRODUCT_DIR)/o3dConverter',\n")
   output_file.write("            '../o3d_assets/samples/%s',\n" % asset['path'])
   output_file.write("          ],\n")
   output_file.write("          'outputs': [\n")
   if sys.platform[:5] == 'linux':
     # TODO(gspencer): This is a HACK!  We shouldn't need to put the
     # absolute path here, but currently on Linux (scons), it is unable
     # to copy generated items out of the source tree (because the
     # repository mojo fails to find it and puts in the wrong path).
     output_file.write("            '%s',\n" % posixpath.abspath(output))
   else:
     output_file.write("            '../samples/%s',\n" % output)
   output_file.write("          ],\n")
   output_file.write("          'action': [\n")
   output_file.write("            '<(PRODUCT_DIR)/o3dConverter',\n")
   output_file.write("            '--no-condition',\n")
   output_file.write("            '--up-axis=%s',\n" % asset['up'])
   if webgl_mode:
     output_file.write("            '--no-binary',\n")
     output_file.write("            '--no-archive',\n")
     output_file.write("            '--convert-dds-to-png',\n")
     output_file.write("            '--convert-cg-to-glsl',\n")
   output_file.write("            '../o3d_assets/samples/%s',\n" % asset['path'])
-  output_file.write("            '<(_outputs)',\n")
+  if webgl_mode:
+    output_file.write("            '%s',\n" % output_tgz)
+  else:
+    output_file.write("            '<(_outputs)',\n")
   output_file.write("          ],\n")
   output_file.write("        },\n")
 
 for asset in assets:
   write_action(asset, False);
   if asset.has_key('webgl'):
     write_action(asset, True);
 
 output_file.write("      ],\n")
 
@@ skipping 45 matching lines @@
   output_file.write("          ],\n")
   output_file.write("        },\n")
 
 output_file.write("      ],\n")
 output_file.write("    },\n")
 output_file.write("  ],\n")
 output_file.write("}\n")
 
 print output_filename
 sys.exit(0)