summaryrefslogtreecommitdiffstats
path: root/o3d/converter
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-04 22:07:49 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-04 22:07:49 +0000
commitc54a6ad63d5636174ed6f50637b81602cbf92f10 (patch)
treed50d4f74d68c5e71dc5186be9408ac07d5913d05 /o3d/converter
parentc3bf65f5b6c64414996c80cbec80ade3bb6a68f3 (diff)
downloadchromium_src-c54a6ad63d5636174ed6f50637b81602cbf92f10.zip
chromium_src-c54a6ad63d5636174ed6f50637b81602cbf92f10.tar.gz
chromium_src-c54a6ad63d5636174ed6f50637b81602cbf92f10.tar.bz2
Adding a no-binary path to the o3dConverter
and deserializer. This CL still creates a o3dtgz file, it's just that buffers, skins and curves are stored in JSON instead of binary. I'm not sure how useful this is but it seemed like a possible short cut to testing out some stuff. Another CL will add some flag so there is no gzipped tar file, just the json. Review URL: http://codereview.chromium.org/189003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/converter')
-rw-r--r--o3d/converter/cross/converter.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/o3d/converter/cross/converter.cc b/o3d/converter/cross/converter.cc
index d2a9bda..e258780 100644
--- a/o3d/converter/cross/converter.cc
+++ b/o3d/converter/cross/converter.cc
@@ -238,7 +238,11 @@ bool Convert(const FilePath& in_filename,
if (!options.pretty_print) {
json_writer.BeginCompacting();
}
- Serializer serializer(&service_locator, &json_writer, &archive_generator);
+ Serializer::Options serializer_options(
+ options.binary ? Serializer::Options::kBinaryOutputOn :
+ Serializer::Options::kBinaryOutputOff);
+ Serializer serializer(
+ &service_locator, &json_writer, &archive_generator, serializer_options);
serializer.SerializePack(pack.Get());
json_writer.Close();
out_writer.Close();