diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 06:05:23 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 06:05:23 +0000 |
| commit | e08b2652afb31bad466bc69d1f1aa3b80298361f (patch) | |
| tree | 305527e71cd5d41394aab78e3607c9e8c31e7451 /o3d/utils | |
| parent | b2d346da57198822ddf59563a7c100eb6f6bc5a2 (diff) | |
| download | chromium_src-e08b2652afb31bad466bc69d1f1aa3b80298361f.zip chromium_src-e08b2652afb31bad466bc69d1f1aa3b80298361f.tar.gz chromium_src-e08b2652afb31bad466bc69d1f1aa3b80298361f.tar.bz2 | |
Added --convert-dds-to-png command line option to the COLLADA converter,
which causes all DDS textures to be outputted as PNGs. This required
changes to the serialization code to reconstitute cube map textures from
six separate images. Some bugs in the plugin were uncovered with this
change which have been worked around for the time being.
Pulled in libtxc_dxtn library for decompressing DXTn textures.
Tested by converting teapot with --convert-dds-to-png and running
helloworld.html and render-mode.html.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1677002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/utils')
| -rw-r--r-- | o3d/utils/cross/file_path_utils.cc | 8 | ||||
| -rw-r--r-- | o3d/utils/cross/file_path_utils.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/o3d/utils/cross/file_path_utils.cc b/o3d/utils/cross/file_path_utils.cc index bea30de..257ac0c 100644 --- a/o3d/utils/cross/file_path_utils.cc +++ b/o3d/utils/cross/file_path_utils.cc @@ -71,6 +71,14 @@ FilePath UTF8ToFilePath(const String& input) { #endif } +FilePath::StringType UTF8ToFilePathStringType(const String& input) { +#if defined(OS_WIN) + return UTF8ToWide(input); +#else + return input; +#endif +} + bool AbsolutePath(FilePath* absolute_path) { #if defined(OS_WIN) return file_util::AbsolutePath(absolute_path); diff --git a/o3d/utils/cross/file_path_utils.h b/o3d/utils/cross/file_path_utils.h index 7398e8b..463b47de 100644 --- a/o3d/utils/cross/file_path_utils.h +++ b/o3d/utils/cross/file_path_utils.h @@ -49,6 +49,7 @@ std::wstring FilePathToWide(const FilePath& input); FilePath WideToFilePath(const std::wstring& input); String FilePathToUTF8(const FilePath& input); FilePath UTF8ToFilePath(const String& input); +FilePath::StringType UTF8ToFilePathStringType(const String& input); // On Windows, this is just the same as file_util::AbsolutePath. // On the Posix implementation of file_util::AbsolutePath, |