Revision: 61858
https://developer.blender.org/rBL61858
Author: jensverwiebe
Date: 2017-04-21 13:32:39 +0200 (Fri, 21 Apr 2017)
Log Message:
-----------
Upd darwin9 alembic to 1.7.1
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Argument.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Foundation.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArchive.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArrayProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IBaseProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ICompoundProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IObject.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IScalarProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchema.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchemaObject.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedArrayProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedScalarProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArchive.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArrayProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OBaseProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OCompoundProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OObject.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OScalarProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchema.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchemaObject.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedArrayProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedScalarProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/ICollections.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/OCollections.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/SchemaInfoDeclarations.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/MetaData.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreFactory/IFactory.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/ICamera.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/ICurves.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/IFaceSet.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/IGeomBase.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/ILight.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/INuPatch.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/IPoints.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/IPolyMesh.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/ISubD.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/IXform.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OCamera.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OCurves.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OFaceSet.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OGeomBase.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OGeomParam.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OLight.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/ONuPatch.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OPoints.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OPolyMesh.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OSubD.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/OXform.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcGeom/SchemaInfoDeclarations.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcMaterial/IMaterial.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcMaterial/OMaterial.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcMaterial/SchemaInfoDeclarations.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Util/Config.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Util/Export.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Util/Foundation.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Util/PlainOldDataType.h
trunk/lib/darwin-9.x.universal/alembic/lib/cmake/Alembic/AlembicConfig.cmake
trunk/lib/darwin-9.x.universal/alembic/lib/cmake/Alembic/AlembicConfigVersion.cmake
trunk/lib/darwin-9.x.universal/alembic/lib/cmake/Alembic/AlembicTargets.cmake
trunk/lib/darwin-9.x.universal/alembic/lib/libAlembic.a
Added Paths:
-----------
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreLayer/
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreLayer/Read.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreLayer/Util.h
trunk/lib/darwin-9.x.universal/alembic/lib/cmake/Alembic/AlembicTargets-noconfig.cmake
Removed Paths:
-------------
trunk/lib/darwin-9.x.universal/alembic/lib/cmake/Alembic/AlembicTargets-release.cmake
Modified: trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Argument.h
===================================================================
--- trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Argument.h
2017-04-21 10:19:34 UTC (rev 61857)
+++ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Argument.h
2017-04-21 11:32:39 UTC (rev 61858)
@@ -49,16 +49,18 @@
{
public:
Arguments( ErrorHandler::Policy iPolicy = ErrorHandler::kThrowPolicy,
- const AbcA::MetaData &iMetaData = AbcA::MetaData(),
- AbcA::TimeSamplingPtr iTimeSampling =
- AbcA::TimeSamplingPtr(),
- uint32_t iTimeIndex = 0,
- SchemaInterpMatching iMatch = kNoMatching )
+ const AbcA::MetaData &iMetaData = AbcA::MetaData(),
+ AbcA::TimeSamplingPtr iTimeSampling =
+ AbcA::TimeSamplingPtr(),
+ uint32_t iTimeIndex = 0,
+ SchemaInterpMatching iMatch = kNoMatching,
+ SparseFlag iSparse = kFull )
: m_errorHandlerPolicy( iPolicy ),
m_metaData( iMetaData ),
m_timeSampling( iTimeSampling ),
m_timeSamplingIndex( iTimeIndex ),
- m_matching( iMatch ){}
+ m_matching( iMatch ),
+ m_sparse( iSparse ) {}
void operator()( const uint32_t & iTimeSamplingIndex)
{ m_timeSamplingIndex = iTimeSamplingIndex; }
@@ -75,6 +77,9 @@
void operator()( const SchemaInterpMatching &iMatching )
{ m_matching = iMatching; }
+ void operator()( const SparseFlag &iSparse )
+ { m_sparse = iSparse; }
+
ErrorHandler::Policy getErrorHandlerPolicy() const
{ return m_errorHandlerPolicy; }
@@ -90,6 +95,9 @@
SchemaInterpMatching getSchemaInterpMatching() const
{ return m_matching; }
+ bool isSparse() const
+ { return m_sparse == kSparse; }
+
private:
ErrorHandler::Policy m_errorHandlerPolicy;
AbcA::MetaData m_metaData;
@@ -96,10 +104,11 @@
AbcA::TimeSamplingPtr m_timeSampling;
uint32_t m_timeSamplingIndex;
SchemaInterpMatching m_matching;
+ SparseFlag m_sparse;
};
//-*****************************************************************************
-// Right now there are 4 types of arguments that you'd pass into
+// Right now there are 6 types of arguments that you'd pass into
// our various classes for construction.
// ErrorHandlerPolicy - always defaults to QuietNoop
// MetaData - always defaults to ""
@@ -106,6 +115,7 @@
// matching - schema interpretation matching
// TimeSampling - always defaults to default uniform
// TimeSamplingIndex - always defaults to 0
+// Sparse - always defaults to kFull
class Argument
{
public:
@@ -132,6 +142,10 @@
m_whichVariant( kArgumentSchemaInterpMatching ),
m_variant( iMatch ) {}
+ Argument( SparseFlag iSparse ) :
+ m_whichVariant( kArgumentSparse ),
+ m_variant( iSparse ) {}
+
void setInto( Arguments &iArgs ) const
{
switch ( m_whichVariant )
@@ -156,6 +170,10 @@
iArgs( m_variant.schemaInterpMatching );
break;
+ case kArgumentSparse:
+ iArgs( m_variant.sparseFlag );
+ break;
+
// no-op
case kArgumentNone:
break;
@@ -180,7 +198,8 @@
kArgumentTimeSamplingIndex,
kArgumentMetaData,
kArgumentTimeSamplingPtr,
- kArgumentSchemaInterpMatching
+ kArgumentSchemaInterpMatching,
+ kArgumentSparse
} const m_whichVariant;
union ArgumentVariant
@@ -202,11 +221,15 @@
explicit ArgumentVariant( SchemaInterpMatching iMatch ) :
schemaInterpMatching( iMatch ) {}
+ explicit ArgumentVariant( SparseFlag iSparse ) :
+ sparseFlag( iSparse ) {}
+
ErrorHandler::Policy policy;
Alembic::Util::uint32_t timeSamplingIndex;
const AbcA::MetaData * metaData;
const AbcA::TimeSamplingPtr * timeSamplingPtr;
SchemaInterpMatching schemaInterpMatching;
+ SparseFlag sparseFlag;
} const m_variant;
};
@@ -219,12 +242,14 @@
( SOMETHING iSomething,
const Argument &iArg0,
const Argument &iArg1 = Argument(),
- const Argument &iArg2 = Argument() )
+ const Argument &iArg2 = Argument(),
+ const Argument &iArg3 = Argument() )
{
Arguments args( GetErrorHandlerPolicy( iSomething ) );
iArg0.setInto( args );
iArg1.setInto( args );
iArg2.setInto( args );
+ iArg3.setInto( args );
return args.getErrorHandlerPolicy();
}
@@ -232,12 +257,14 @@
inline ErrorHandler::Policy GetErrorHandlerPolicyFromArgs
( const Argument &iArg0,
const Argument &iArg1 = Argument(),
- const Argument &iArg2 = Argument() )
+ const Argument &iArg2 = Argument(),
+ const Argument &iArg3 = Argument() )
{
Arguments args;
iArg0.setInto( args );
iArg1.setInto( args );
iArg2.setInto( args );
+ iArg3.setInto( args );
return args.getErrorHandlerPolicy();
}
@@ -245,12 +272,14 @@
inline AbcA::MetaData GetMetaData
( const Argument &iArg0,
const Argument &iArg1 = Argument(),
- const Argument &iArg2 = Argument() )
+ const Argument &iArg2 = Argument(),
+ const Argument &iArg3 = Argument() )
{
Arguments args;
iArg0.setInto( args );
iArg1.setInto( args );
iArg2.setInto( args );
+ iArg3.setInto( args );
return args.getMetaData();
}
@@ -258,12 +287,14 @@
inline AbcA::TimeSamplingPtr GetTimeSampling
( const Argument &iArg0,
const Argument &iArg1 = Argument(),
- const Argument &iArg2 = Argument() )
+ const Argument &iArg2 = Argument(),
+ const Argument &iArg3 = Argument() )
{
Arguments args;
iArg0.setInto( args );
iArg1.setInto( args );
iArg2.setInto( args );
+ iArg3.setInto( args );
return args.getTimeSampling();
}
@@ -271,12 +302,14 @@
inline uint32_t GetTimeSamplingIndex
( const Argument &iArg0,
const Argument &iArg1 = Argument(),
- const Argument &iArg2 = Argument() )
+ const Argument &iArg2 = Argument(),
+ const Argument &iArg3 = Argument() )
{
Arguments args;
iArg0.setInto( args );
iArg1.setInto( args );
iArg2.setInto( args );
+ iArg3.setInto( args );
return args.getTimeSamplingIndex();
}
@@ -284,15 +317,32 @@
inline SchemaInterpMatching GetSchemaInterpMatching
( const Argument &iArg0,
const Argument &iArg1 = Argument(),
- const Argument &iArg2 = Argument() )
+ const Argument &iArg2 = Argument(),
+ const Argument &iArg3 = Argument() )
{
Arguments args;
iArg0.setInto( args );
iArg1.setInto( args );
iArg2.setInto( args );
+ iArg3.setInto( args );
return args.getSchemaInterpMatching();
}
+//-*****************************************************************************
+inline bool IsSparse
+( const Argument &iArg0,
+ const Argument &iArg1 = Argument(),
+ const Argument &iArg2 = Argument(),
+ const Argument &iArg3 = Argument() )
+{
+ Arguments args;
+ iArg0.setInto( args );
+ iArg1.setInto( args );
+ iArg2.setInto( args );
+ iArg3.setInto( args );
+ return args.isSparse();
+}
+
} // End namespace ALEMBIC_VERSION_NS
using namespace ALEMBIC_VERSION_NS;
Modified:
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Foundation.h
===================================================================
--- trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Foundation.h
2017-04-21 10:19:34 UTC (rev 61857)
+++ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Foundation.h
2017-04-21 11:32:39 UTC (rev 61858)
@@ -1,6 +1,6 @@
//-*****************************************************************************
//
-// Copyright (c) 2009-2012,
+// Copyright (c) 2009-2016,
// Sony Pictures Imageworks, Inc. and
// Industrial Light & Magic, a division of Lucasfilm Entertainment Company
Ltd.
//
@@ -106,9 +106,19 @@
};
//-*****************************************************************************
+//! Flag used during write which indicates whether we are writing out the
+//! full schema, or just parts of it.
//-*****************************************************************************
+enum SparseFlag
+{
+ kFull,
+ kSparse
+};
+
//-*****************************************************************************
//-*****************************************************************************
+//-*****************************************************************************
+//-*****************************************************************************
// IMPORTED IMATH TYPES
//-*****************************************************************************
//-*****************************************************************************
Modified: trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArchive.h
===================================================================
--- trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArchive.h
2017-04-21 10:19:34 UTC (rev 61857)
+++ trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArchive.h
2017-04-21 11:32:39 UTC (rev 61858)
@@ -90,10 +90,6 @@
//! ...
AbcA::ArchiveReaderPtr iPtr,
- //! Wrap existing
- //! ...
- WrapExistingFlag /* iWrap */,
-
//! Optional error handling policy
//! ...
ErrorHandler::Policy iPolicy = ErrorHandler::kThrowPolicy )
@@ -103,6 +99,17 @@
getErrorHandler().setPolicy( iPolicy );
}
+ // Deprecated in favor of the constructor above
+ IArchive(
+ AbcA::ArchiveReaderPtr iPtr,
+ WrapExistingFlag /* iWrap */,
+ ErrorHandler::Policy iPolicy = ErrorHandler::kThrowPolicy )
+ : m_archive( iPtr )
+ {
+ // Set the error handling policy.
+ getErrorHandler().setPolicy( iPolicy );
+ }
+
//! Destructor
//! ...
~IArchive();
@@ -120,11 +127,11 @@
//! This returns the single top-level IObject that exists
//! automatically as part of the archive.
- IObject getTop();
+ IObject getTop() const;
//! Get the read array sample cache. It may be a NULL pointer.
//! Caches can be shared amongst separate archives, and caching
- //! will is disabled if a NULL cache is returned here.
+ //! will be disabled if a NULL cache is returned here.
AbcA::ReadArraySampleCachePtr getReadArraySampleCachePtr();
//! Set the read array sample cache. It may also be a NULL pointer.
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
