[Bf-blender-cvs] [a83a61b] alembic_pointcache: Replaced use of the HDF5 Alembic backend by Ogawa.

[Lukas Tönne]

Commit: a83a61b03b9226f9b6acb0bf717d394ed77204fe
Author: Lukas Tönne
Date:   Sat Feb 28 15:50:22 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rBa83a61b03b9226f9b6acb0bf717d394ed77204fe

Replaced use of the HDF5 Alembic backend by Ogawa.

Ogawa is replacing HDF5 as the new de-facto standard. Selecting either
should be more formalized and a user option, for now it's just hardcoded.

===================================================================

M	build_files/cmake/Modules/FindAlembic.cmake
M	source/blender/pointcache/alembic/abc_reader.cpp
M	source/blender/pointcache/alembic/abc_writer.cpp

===================================================================

diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake
index ec8cdab..00d9aef 100644
--- a/build_files/cmake/Modules/FindAlembic.cmake
+++ b/build_files/cmake/Modules/FindAlembic.cmake
@@ -37,6 +37,8 @@ SET(_alembic_FIND_COMPONENTS
   AlembicAbcCoreAbstract
   AlembicAbcGeom
   AlembicAbcCoreHDF5
+  AlembicAbcCoreOgawa
+  AlembicOgawa
   AlembicUtil
 )
 
diff --git a/source/blender/pointcache/alembic/abc_reader.cpp b/source/blender/pointcache/alembic/abc_reader.cpp
index 19c9e96..cbbc873 100644
--- a/source/blender/pointcache/alembic/abc_reader.cpp
+++ b/source/blender/pointcache/alembic/abc_reader.cpp
@@ -16,7 +16,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <Alembic/AbcCoreHDF5/ReadWrite.h>
+//#include <Alembic/AbcCoreHDF5/ReadWrite.h>
+#include <Alembic/AbcCoreOgawa/ReadWrite.h>
 #include <Alembic/Abc/ArchiveInfo.h>
 
 #include "abc_reader.h"
@@ -36,7 +37,8 @@ AbcReaderArchive::AbcReaderArchive(Scene *scene, const std::string &filename, Er
     m_error_handler(error_handler)
 {
 	PTC_SAFE_CALL_BEGIN
-	archive = IArchive(AbcCoreHDF5::ReadArchive(), filename, Abc::ErrorHandler::kThrowPolicy);
+//	archive = IArchive(AbcCoreHDF5::ReadArchive(), filename, Abc::ErrorHandler::kThrowPolicy);
+	archive = IArchive(AbcCoreOgawa::ReadArchive(), filename, Abc::ErrorHandler::kThrowPolicy);
 	PTC_SAFE_CALL_END_HANDLER(m_error_handler)
 }
 
diff --git a/source/blender/pointcache/alembic/abc_writer.cpp b/source/blender/pointcache/alembic/abc_writer.cpp
index f2fbce4..438918c 100644
--- a/source/blender/pointcache/alembic/abc_writer.cpp
+++ b/source/blender/pointcache/alembic/abc_writer.cpp
@@ -16,7 +16,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+//#include <Alembic/AbcCoreHDF5/ReadWrite.h>
 #include <Alembic/AbcCoreHDF5/ReadWrite.h>
+#include <Alembic/AbcCoreOgawa/ReadWrite.h>
 
 #include "abc_writer.h"
 
@@ -48,7 +50,8 @@ AbcWriterArchive::AbcWriterArchive(Scene *scene, const std::string &filename, Er
 	ensure_directory(filename.c_str());
 	
 	PTC_SAFE_CALL_BEGIN
-	archive = OArchive(AbcCoreHDF5::WriteArchive(), filename, Abc::ErrorHandler::kThrowPolicy);
+//	archive = OArchive(AbcCoreHDF5::WriteArchive(), filename, Abc::ErrorHandler::kThrowPolicy);
+	archive = OArchive(AbcCoreOgawa::WriteArchive(), filename, Abc::ErrorHandler::kThrowPolicy);
 	
 	chrono_t cycle_time = this->seconds_per_frame();
 	chrono_t start_time = this->start_time();