diff --git a/COLLADAFramework/CMakeLists.txt b/COLLADAFramework/CMakeLists.txt index 7855b046d0d77d80e75a02c8a5bdf980af006b16..eaef34bc03dd948cd53926926194e55b77174d67 100644 --- a/COLLADAFramework/CMakeLists.txt +++ b/COLLADAFramework/CMakeLists.txt @@ -12,6 +12,7 @@ set(INST_SRC include/COLLADAFWAnimatable.h include/COLLADAFWAnimatableFloat.h include/COLLADAFWAnimation.h + include/COLLADAFWAnimationClip.h include/COLLADAFWAnimationCurve.h include/COLLADAFWAnimationList.h include/COLLADAFWAnnotate.h @@ -125,6 +126,7 @@ set(INST_SRC set(SRC + src/COLLADAFWAnimationClip.cpp src/COLLADAFWLight.cpp src/COLLADAFWEffectCommon.cpp src/COLLADAFWInstanceKinematicsScene.cpp diff --git a/COLLADAFramework/include/COLLADAFW.h b/COLLADAFramework/include/COLLADAFW.h index 5ca272c1683dcb65e04d1ea9da8bf6a18efe10e8..5c279a9d588dfbbc01168ca3927a4d3e4189b291 100644 --- a/COLLADAFramework/include/COLLADAFW.h +++ b/COLLADAFramework/include/COLLADAFW.h @@ -15,6 +15,7 @@ #include "COLLADAFWAnimatable.h" #include "COLLADAFWAnimatableFloat.h" #include "COLLADAFWAnimation.h" +#include "COLLADAFWAnimationClip.h" #include "COLLADAFWAnimationCurve.h" #include "COLLADAFWAnimationList.h" #include "COLLADAFWAnnotate.h" diff --git a/COLLADAFramework/include/COLLADAFWAnimationClip.h b/COLLADAFramework/include/COLLADAFWAnimationClip.h new file mode 100644 index 0000000000000000000000000000000000000000..9651037f279d3c60982a47c90a3489ba04255176 --- /dev/null +++ b/COLLADAFramework/include/COLLADAFWAnimationClip.h @@ -0,0 +1,57 @@ +#ifndef __COLLADAFW_ANIMATIONCLIP_H__ +#define __COLLADAFW_ANIMATIONCLIP_H__ + +#include "COLLADAFWPrerequisites.h" +#include "COLLADAFWObject.h" +#include "COLLADAFWUniqueId.h" + + +namespace COLLADAFW +{ + class AnimationClip : public ObjectTemplate<COLLADA_TYPE::ANIMATION_CLIP> + { + private: + /** + * The original object id, if it in the original file format exist. + */ + String mOriginalId; + + /** The list of unique animation ids of the instance animations in this clip. */ + UniqueIdArray mInstanceAnimationUniqueIds; + + /** The text string name of this element. Optional. */ + String mName; + + public: + + /** Constructor. */ + AnimationClip ( const UniqueId& uniqueId ); + + /** Destructor. */ + virtual ~AnimationClip(); + + /** + * The original object id, if it in the original file format exist. + */ + const String& getOriginalId () const { return mOriginalId; } + + /** + * The original object id, if it in the original file format exist. + */ + void setOriginalId ( const String& val ) { mOriginalId = val; } + + /** The text string name of this element. Optional. */ + const String& getName () const { return mName; } + + /** The text string name of this element. Optional. */ + void setName ( const String& Name ) { mName = Name; } + + /** List of the unique ids of the instance animations in this clip. */ + const UniqueIdArray& getInstanceAnimationUniqueIds() const { return mInstanceAnimationUniqueIds; } + + /** List of the unique ids of the instance animations in this clip. */ + UniqueIdArray& getInstanceAnimationUniqueIds() { return mInstanceAnimationUniqueIds; } + }; +} + +#endif // __COLLADAFW_ANIMATIONCLIP_H__ diff --git a/COLLADAFramework/include/COLLADAFWIWriter.h b/COLLADAFramework/include/COLLADAFWIWriter.h index b53906613d4c80a6d35f44e6703c8de2496543e9..3bd1ff857c76657268ae3050185ef2c4b26682bd 100644 --- a/COLLADAFramework/include/COLLADAFWIWriter.h +++ b/COLLADAFramework/include/COLLADAFWIWriter.h @@ -28,6 +28,7 @@ namespace COLLADAFW class Light; class Animation; class AnimationList; + class AnimationClip; class SkinControllerData; class Controller; class Formulas; @@ -109,6 +110,10 @@ namespace COLLADAFW @return The writer should return true, if writing succeeded, false otherwise.*/ virtual bool writeAnimationList( const AnimationList* animationList ) = 0; + /** When this method is called, the writer must write the AnimationClip. + @return The writer should return true, of writing succeeded, false otherwise.*/ + virtual bool writeAnimationClip( const AnimationClip* animationClip ) = 0; + /** When this method is called, the writer must write the skin controller data. @return The writer should return true, if writing succeeded, false otherwise.*/ virtual bool writeSkinControllerData( const SkinControllerData* skinControllerData ) = 0; diff --git a/COLLADAFramework/scripts/COLLADAFramework.vcxproj b/COLLADAFramework/scripts/COLLADAFramework.vcxproj index cf17b54977872d682d2c96ecd49b226e74ee4c8e..e51e64f3d51c1e8b78a2f8d3417d98b603c9b1d9 100644 --- a/COLLADAFramework/scripts/COLLADAFramework.vcxproj +++ b/COLLADAFramework/scripts/COLLADAFramework.vcxproj @@ -1200,6 +1200,7 @@ </Lib> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\src\COLLADAFWAnimationClip.cpp" /> <ClCompile Include="..\src\COLLADAFWAxisInfo.cpp" /> <ClCompile Include="..\src\COLLADAFWCamera.cpp" /> <ClCompile Include="..\src\COLLADAFWColor.cpp" /> @@ -1278,6 +1279,7 @@ <ClInclude Include="..\include\COLLADAFWAnimatable.h" /> <ClInclude Include="..\include\COLLADAFWAnimatableFloat.h" /> <ClInclude Include="..\include\COLLADAFWAnimation.h" /> + <ClInclude Include="..\include\COLLADAFWAnimationClip.h" /> <ClInclude Include="..\include\COLLADAFWAnimationCurve.h" /> <ClInclude Include="..\include\COLLADAFWAnimationList.h" /> <ClInclude Include="..\include\COLLADAFWAnnotate.h" /> diff --git a/COLLADAFramework/scripts/COLLADAFramework.vcxproj.filters b/COLLADAFramework/scripts/COLLADAFramework.vcxproj.filters index 92413aec741f59a1213b889458bb77d4c2397c37..c941f02c6c19993a921af9107dc2c0168102bb2a 100644 --- a/COLLADAFramework/scripts/COLLADAFramework.vcxproj.filters +++ b/COLLADAFramework/scripts/COLLADAFramework.vcxproj.filters @@ -17,6 +17,9 @@ </Filter> </ItemGroup> <ItemGroup> + <ClCompile Include="..\src\COLLADAFWAnimationClip.cpp"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\src\COLLADAFWCamera.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -148,6 +151,9 @@ <ClInclude Include="..\include\COLLADAFWAnimation.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\include\COLLADAFWAnimationClip.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\include\COLLADAFWAnimationCurve.h"> <Filter>Header Files</Filter> </ClInclude> diff --git a/COLLADAFramework/src/COLLADAFWAnimationClip.cpp b/COLLADAFramework/src/COLLADAFWAnimationClip.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e4c1c05f82131810bb10f4f52de848f53507dbcb --- /dev/null +++ b/COLLADAFramework/src/COLLADAFWAnimationClip.cpp @@ -0,0 +1,19 @@ +#include "COLLADAFWStableHeaders.h" +#include "COLLADAFWAnimationClip.h" + + +namespace COLLADAFW +{ + + //------------------------------ + AnimationClip::AnimationClip ( const UniqueId& uniqueId ) + : ObjectTemplate<COLLADA_TYPE::ANIMATION_CLIP> ( uniqueId ) + { + } + + //------------------------------ + AnimationClip::~AnimationClip() + { + } + +} // namespace COLLADAFW diff --git a/COLLADAMax/include/COLLADAMaxDocumentImporter.h b/COLLADAMax/include/COLLADAMaxDocumentImporter.h index 463505d41a029f37111ed4f5d1c648da0d752e19..7b09bbbc88c9c5368c13dcb2f98d9ee6352bab12 100644 --- a/COLLADAMax/include/COLLADAMaxDocumentImporter.h +++ b/COLLADAMax/include/COLLADAMaxDocumentImporter.h @@ -416,6 +416,10 @@ namespace COLLADAMax @return True on succeeded, false otherwise.*/ virtual bool writeAnimationList( const COLLADAFW::AnimationList* animationList ); + /** Writes the animation clip. + @return True on succeeded, flase otherwise.*/ + virtual bool writeAnimationClip( const COLLADAFW::AnimationClip* animationClip ) { return true; } + /** When this method is called, the writer must write the skin controller data. @return The writer should return true, if writing succeeded, false otherwise.*/ virtual bool writeSkinControllerData( const COLLADAFW::SkinControllerData* skinControllerData ); diff --git a/COLLADAMaya/COLLADAMaya.xcodeproj/project.pbxproj b/COLLADAMaya/COLLADAMaya.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index f9ae355fbc0510768251f5a8271b25b1cb51f568..df29b1fc20b4a67f33f489b86653a13ed46a3143 --- a/COLLADAMaya/COLLADAMaya.xcodeproj/project.pbxproj +++ b/COLLADAMaya/COLLADAMaya.xcodeproj/project.pbxproj @@ -790,6 +790,14 @@ CE8D7C580F98C055007F8DF9 /* GeneratedSaxParserRawUnknownElementHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE8D7C550F98C055007F8DF9 /* GeneratedSaxParserRawUnknownElementHandler.cpp */; }; CE8D7C7E0F98C0A1007F8DF9 /* GeneratedSaxParserIUnknownElementHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = CE8D7C7B0F98C0A1007F8DF9 /* GeneratedSaxParserIUnknownElementHandler.h */; }; CE8D7C7F0F98C0A1007F8DF9 /* GeneratedSaxParserRawUnknownElementHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = CE8D7C7C0F98C0A1007F8DF9 /* GeneratedSaxParserRawUnknownElementHandler.h */; }; + D4E84DF021A47A9D003AAB34 /* COLLADAFWAnimationClip.h in Headers */ = {isa = PBXBuildFile; fileRef = D4E84DEF21A47A9C003AAB34 /* COLLADAFWAnimationClip.h */; }; + D4E84DF321A47AC7003AAB34 /* COLLADAFWAnimationClip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E84DF121A47AAA003AAB34 /* COLLADAFWAnimationClip.cpp */; }; + D4E84DF721A47AFC003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E84DF621A47AFB003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader.cpp */; }; + D4E84DF821A47B3A003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader14.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E84DF421A47AE5003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader14.cpp */; }; + D4E84DFA21A47B54003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader15.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E84DF921A47B53003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader15.cpp */; }; + D4E84DFC21A47B78003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = D4E84DFB21A47B78003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader.h */; }; + D4E84DFE21A47B8E003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader15.h in Headers */ = {isa = PBXBuildFile; fileRef = D4E84DFD21A47B8E003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader15.h */; }; + D4E84E0021A47B9A003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader14.h in Headers */ = {isa = PBXBuildFile; fileRef = D4E84DFF21A47B9A003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader14.h */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -1746,6 +1754,14 @@ CE8D7DAA0F98D435007F8DF9 /* COLLADASaxFWLTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADASaxFWLTypes.cpp; path = ../COLLADASaxFrameworkLoader/src/COLLADASaxFWLTypes.cpp; sourceTree = SOURCE_ROOT; }; CE8D7DAB0F98D435007F8DF9 /* COLLADASaxFWLVisualSceneLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADASaxFWLVisualSceneLoader.cpp; path = ../COLLADASaxFrameworkLoader/src/COLLADASaxFWLVisualSceneLoader.cpp; sourceTree = SOURCE_ROOT; }; D2AAC09D05546B4700DB518D /* COLLADAMaya.bundle */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = COLLADAMaya.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + D4E84DEF21A47A9C003AAB34 /* COLLADAFWAnimationClip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = COLLADAFWAnimationClip.h; path = ../COLLADAFramework/include/COLLADAFWAnimationClip.h; sourceTree = "<group>"; }; + D4E84DF121A47AAA003AAB34 /* COLLADAFWAnimationClip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADAFWAnimationClip.cpp; path = ../COLLADAFramework/src/COLLADAFWAnimationClip.cpp; sourceTree = "<group>"; }; + D4E84DF421A47AE5003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader14.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADASaxFWLLibraryAnimationClipsLoader14.cpp; path = ../COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryAnimationClipsLoader14.cpp; sourceTree = "<group>"; }; + D4E84DF621A47AFB003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADASaxFWLLibraryAnimationClipsLoader.cpp; path = ../COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryAnimationClipsLoader.cpp; sourceTree = "<group>"; }; + D4E84DF921A47B53003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader15.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADASaxFWLLibraryAnimationClipsLoader15.cpp; path = ../COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryAnimationClipsLoader15.cpp; sourceTree = "<group>"; }; + D4E84DFB21A47B78003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = COLLADASaxFWLLibraryAnimationClipsLoader.h; path = ../COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryAnimationClipsLoader.h; sourceTree = "<group>"; }; + D4E84DFD21A47B8E003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader15.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryAnimationClipsLoader15.h; sourceTree = "<group>"; }; + D4E84DFF21A47B9A003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader14.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryAnimationClipsLoader14.h; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1907,6 +1923,7 @@ CE2272E4104D1DD100C4F29B /* generated15 */ = { isa = PBXGroup; children = ( + D4E84DFD21A47B8E003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader15.h */, CE27BA6816D5132900C109C3 /* COLLADASaxFWLAssetLoader15.h */, CE27BA6916D5132900C109C3 /* COLLADASaxFWLColladaParserAutoGen15.h */, CE27BA6A16D5132900C109C3 /* COLLADASaxFWLColladaParserAutoGen15Attributes.h */, @@ -1942,6 +1959,7 @@ CE227319104D1DF800C4F29B /* generated14 */ = { isa = PBXGroup; children = ( + D4E84DFF21A47B9A003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader14.h */, CE7820A70FF112A800A767EA /* COLLADASaxFWLAssetLoader14.h */, CE22731B104D1DF800C4F29B /* COLLADASaxFWLColladaParserAutoGen14.h */, CE22731C104D1DF900C4F29B /* COLLADASaxFWLColladaParserAutoGen14Attributes.h */, @@ -2135,6 +2153,7 @@ CE7290AE10AC751300AE5662 /* include */ = { isa = PBXGroup; children = ( + D4E84DFB21A47B78003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader.h */, CE27BA9E16D513B100C109C3 /* COLLADASaxFWLAccessor.h */, CE27BA9F16D513B100C109C3 /* COLLADASaxFWLArrayElement.h */, CE27BAA016D513B200C109C3 /* COLLADASaxFWLAssetLoader.h */, @@ -2217,8 +2236,8 @@ CE7290AF10AC751900AE5662 /* source */ = { isa = PBXGroup; children = ( + D4E84DF621A47AFB003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader.cpp */, CE27BA4416D4F7D400C109C3 /* COLLADASaxFWLSplineLoader.cpp */, - 24FFE6C814A525E000D718C2 /* COLLADASaxFWLLibraryKinematicsScenesLoader15.cpp */, 24FFE6BF14A525CC00D718C2 /* COLLADASaxFWLInstanceArticulatedSystemLoader.cpp */, 24FFE6C014A525CC00D718C2 /* COLLADASaxFWLInstanceKinematicsModelLoader.cpp */, 24FFE6C114A525CC00D718C2 /* COLLADASaxFWLLibraryKinematicsScenesLoader.cpp */, @@ -2336,6 +2355,7 @@ CE72910210AC7FD300AE5662 /* source */ = { isa = PBXGroup; children = ( + D4E84DF121A47AAA003AAB34 /* COLLADAFWAnimationClip.cpp */, 24FFE6CB14A5269600D718C2 /* COLLADAFWInstanceKinematicsScene.cpp */, CE787CB20F58400C0019C2D7 /* COLLADAFWMaterial.cpp */, CE787CB30F58400C0019C2D7 /* COLLADAFWMatrix.cpp */, @@ -2498,6 +2518,7 @@ CE72910910AC805600AE5662 /* generated14 */ = { isa = PBXGroup; children = ( + D4E84DF421A47AE5003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader14.cpp */, CE27BA4216D4F7A200C109C3 /* COLLADASaxFWLSplineLoader14.cpp */, CE7821560FF1137C00A767EA /* COLLADASaxFWLLibraryAnimationsLoader14.cpp */, CE7821550FF1137C00A767EA /* COLLADASaxFWLGeometryLoader14.cpp */, @@ -2530,6 +2551,8 @@ CE72910A10AC806D00AE5662 /* generated15 */ = { isa = PBXGroup; children = ( + D4E84DF921A47B53003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader15.cpp */, + 24FFE6C814A525E000D718C2 /* COLLADASaxFWLLibraryKinematicsScenesLoader15.cpp */, CE78218B0FF1139E00A767EA /* COLLADASaxFWLSourceArrayLoader15.cpp */, CE7821800FF1139E00A767EA /* COLLADASaxFWLLibraryAnimationsLoader15.cpp */, CE71CDD4104D183800368D98 /* COLLADASaxFWLLibraryArticulatedSystemsLoader15.cpp */, @@ -2817,6 +2840,7 @@ CE72911810AC82DE00AE5662 /* include */ = { isa = PBXGroup; children = ( + D4E84DEF21A47A9C003AAB34 /* COLLADAFWAnimationClip.h */, CE71CD10104D0A1500368D98 /* COLLADAFW.h */, CE8D7C350F98BFED007F8DF9 /* COLLADAFWAnimatable.h */, CE79CF051020B7E900A3A027 /* COLLADAFWAnimatableFloat.h */, @@ -3467,6 +3491,7 @@ 95AF1A811CCFC236009B9B7D /* COLLADAMayaLODExporter.h in Headers */, CE0B3ED50F56AFD8004F8570 /* COLLADAMayaAnimationClipExporter.h in Headers */, CE0B3ED60F56AFD8004F8570 /* COLLADAMayaAnimationCurves.h in Headers */, + D4E84E0021A47B9A003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader14.h in Headers */, CE0B3ED70F56AFD8004F8570 /* COLLADAMayaAnimationElement.h in Headers */, CE0B3ED80F56AFD8004F8570 /* COLLADAMayaAnimationExporter.h in Headers */, CE0B3ED90F56AFD8004F8570 /* COLLADAMayaAnimationHelper.h in Headers */, @@ -3495,6 +3520,7 @@ CE0B3EF40F56AFD8004F8570 /* COLLADAMayaImportOptions.h in Headers */, CE0B3EF50F56AFD8004F8570 /* COLLADAMayaLightExporter.h in Headers */, 95133F5B1AA8BA37003AC4E2 /* COLLADASWInstancePhysicsModel.h in Headers */, + D4E84DFE21A47B8E003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader15.h in Headers */, 87D7EAFB1B0E979B000436DA /* COLLADAMayaLightProbeExporter.h in Headers */, CE0B3EF70F56AFD8004F8570 /* COLLADAMayaMaterialExporter.h in Headers */, CE0B3EFA0F56AFD8004F8570 /* COLLADAMayaMorphController.h in Headers */, @@ -3514,7 +3540,9 @@ CE0B3F0A0F56AFD8004F8570 /* COLLADAMayaSyntax.h in Headers */, 871C5B3A1BCEC138008B84FF /* COLLADAMayaPhysXExporter.h in Headers */, CE0B3F0B0F56AFD8004F8570 /* COLLADAMayaTangentPoint.h in Headers */, + D4E84DF021A47A9D003AAB34 /* COLLADAFWAnimationClip.h in Headers */, CE0B3F0C0F56AFD8004F8570 /* COLLADAMayaVisualSceneExporter.h in Headers */, + D4E84DFC21A47B78003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader.h in Headers */, 879D18E01AE8070F005C246C /* COLLADAMayaAttributeParser.h in Headers */, 95133F5D1AA8BA37003AC4E2 /* COLLADASWLibraryPhysicsModels.h in Headers */, CE7D40150FF1308D00849CFA /* COLLADAMayaBaseAnimation.h in Headers */, @@ -3961,6 +3989,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + D4E84DF321A47AC7003AAB34 /* COLLADAFWAnimationClip.cpp in Sources */, CE3E66B60FD54FA7003D1AD2 /* COLLADAFWSkinController.cpp in Sources */, CE787CC30F58400C0019C2D7 /* COLLADAFWCamera.cpp in Sources */, CE787CC40F58400C0019C2D7 /* COLLADAFWColor.cpp in Sources */, @@ -4099,6 +4128,7 @@ CE71CEA7104D1A0B00368D98 /* COLLADASaxFWLSourceArrayLoader15.cpp in Sources */, CE71CEA8104D1A0B00368D98 /* COLLADASaxFWLTransformationLoader.cpp in Sources */, CE71CEA9104D1A0B00368D98 /* COLLADASaxFWLTypes.cpp in Sources */, + D4E84DF821A47B3A003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader14.cpp in Sources */, CE71CEAA104D1A0B00368D98 /* COLLADASaxFWLVersionParser.cpp in Sources */, CE71CEAB104D1A0B00368D98 /* COLLADASaxFWLVisualSceneLoader.cpp in Sources */, CE71CEAC104D1A0B00368D98 /* COLLADASaxFWLVisualSceneLoader14.cpp in Sources */, @@ -4122,6 +4152,7 @@ buildActionMask = 2147483647; files = ( CE72916810ACA1F800AE5662 /* COLLADAMayaAnimationClipExporter.cpp in Sources */, + D4E84DFA21A47B54003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader15.cpp in Sources */, 95AF1A831CCFC257009B9B7D /* COLLADAMayaLODExporter.cpp in Sources */, CE72916910ACA1F800AE5662 /* COLLADAMayaAnimationCurves.cpp in Sources */, CE72916A10ACA1F800AE5662 /* COLLADAMayaAnimationElement.cpp in Sources */, @@ -4146,6 +4177,7 @@ 871C5B3C1BCEC149008B84FF /* COLLADAMayaPhysXExporter.cpp in Sources */, CE72917A10ACA1F800AE5662 /* COLLADAMayaGeometryExporter.cpp in Sources */, CE72917B10ACA1F800AE5662 /* COLLADAMayaGeometryPolygonExporter.cpp in Sources */, + D4E84DF721A47AFC003AAB34 /* COLLADASaxFWLLibraryAnimationClipsLoader.cpp in Sources */, CE72917C10ACA1F800AE5662 /* COLLADAMayaHwShaderExporter.cpp in Sources */, CE72917D10ACA1F800AE5662 /* COLLADAMayaImageExporter.cpp in Sources */, CE72917E10ACA1F800AE5662 /* COLLADAMayaImportOptions.cpp in Sources */, diff --git a/COLLADASaxFrameworkLoader/CMakeLists.txt b/COLLADASaxFrameworkLoader/CMakeLists.txt index 41cae6c11fee78f746cca139a0d054fda0078d13..437c06d4e140f0a44a7a01daab64bdcff9ec0879 100644 --- a/COLLADASaxFrameworkLoader/CMakeLists.txt +++ b/COLLADASaxFrameworkLoader/CMakeLists.txt @@ -41,6 +41,7 @@ set(INST_SRC include/COLLADASaxFWLJointsLoader.h include/COLLADASaxFWLKinematicsIntermediateData.h include/COLLADASaxFWLKinematicsSceneCreator.h + include/COLLADASaxFWLLibraryAnimationClipsLoader.h include/COLLADASaxFWLLibraryAnimationsLoader.h include/COLLADASaxFWLLibraryArticulatedSystemsLoader.h include/COLLADASaxFWLLibraryCamerasLoader.h @@ -94,6 +95,7 @@ set(INST_GEN14_SRC include/generated14/COLLADASaxFWLColladaParserAutoGen14Private.h include/generated14/COLLADASaxFWLColladaParserAutoGen14ValidationData.h include/generated14/COLLADASaxFWLGeometryLoader14.h + include/generated14/COLLADASaxFWLLibraryAnimationClipsLoader14.h include/generated14/COLLADASaxFWLLibraryAnimationsLoader14.h include/generated14/COLLADASaxFWLLibraryCamerasLoader14.h include/generated14/COLLADASaxFWLLibraryControllersLoader14.h @@ -120,6 +122,7 @@ set(INST_GEN15_SRC include/generated15/COLLADASaxFWLColladaParserAutoGen15ValidationData.h include/generated15/COLLADASaxFWLFormulasLoader15.h include/generated15/COLLADASaxFWLGeometryLoader15.h + include/generated15/COLLADASaxFWLLibraryAnimationClipsLoader15.h include/generated15/COLLADASaxFWLLibraryAnimationsLoader15.h include/generated15/COLLADASaxFWLLibraryArticulatedSystemsLoader15.h include/generated15/COLLADASaxFWLLibraryCamerasLoader15.h @@ -143,6 +146,7 @@ set(INST_GEN15_SRC set(SRC src/COLLADASaxFWLLibraryArticulatedSystemsLoader.cpp src/COLLADASaxFWLCOLLADACsymbol.cpp + src/COLLADASaxFWLLibraryAnimationClipsLoader.cpp src/COLLADASaxFWLLibraryAnimationsLoader.cpp src/COLLADASaxFWLIParserImpl14.cpp src/COLLADASaxFWLTransformationLoader.cpp @@ -208,6 +212,7 @@ set(SRC src/generated14/COLLADASaxFWLColladaParserAutoGen14PrivateFunctionMap.cpp src/generated14/COLLADASaxFWLLibraryMaterialsLoader14.cpp src/generated14/COLLADASaxFWLColladaParserAutoGen14PrivateFindElementHash.cpp + src/generated14/COLLADASaxFWLLibraryAnimationClipsLoader14.cpp src/generated14/COLLADASaxFWLLibraryAnimationsLoader14.cpp src/generated14/COLLADASaxFWLSceneLoader14.cpp src/generated14/COLLADASaxFWLAssetLoader14.cpp @@ -230,6 +235,7 @@ set(SRC src/generated15/COLLADASaxFWLLibraryArticulatedSystemsLoader15.cpp src/generated15/COLLADASaxFWLColladaParserAutoGen15PrivateFindElementHash.cpp src/generated15/COLLADASaxFWLColladaParserAutoGen15PrivateFunctionMapFactory.cpp + src/generated15/COLLADASaxFWLLibraryAnimationClipsLoader15.cpp src/generated15/COLLADASaxFWLLibraryAnimationsLoader15.cpp src/generated15/COLLADASaxFWLLibraryJointsLoader15.cpp src/generated15/COLLADASaxFWLLibraryNodesLoader15.cpp diff --git a/COLLADASaxFrameworkLoader/COLLADASaxFrameworkLoader.xcodeproj/project.pbxproj b/COLLADASaxFrameworkLoader/COLLADASaxFrameworkLoader.xcodeproj/project.pbxproj index 89758f07755fa521b23d9f4fb1b7afe77cce3c98..40641b039bdf4f826f539f06ed09d5732815911f 100644 --- a/COLLADASaxFrameworkLoader/COLLADASaxFrameworkLoader.xcodeproj/project.pbxproj +++ b/COLLADASaxFrameworkLoader/COLLADASaxFrameworkLoader.xcodeproj/project.pbxproj @@ -22,6 +22,7 @@ 4D0AE7081032395F00764973 /* COLLADASaxFWLIParserImpl14.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6B51032395F00764973 /* COLLADASaxFWLIParserImpl14.cpp */; }; 4D0AE7091032395F00764973 /* COLLADASaxFWLIParserImpl15.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6B61032395F00764973 /* COLLADASaxFWLIParserImpl15.cpp */; }; 4D0AE70A1032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6B71032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader.cpp */; }; + 4D0AE70A1032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6B71032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader.cpp */; }; 4D0AE70B1032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6B81032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader.cpp */; }; 4D0AE70C1032395F00764973 /* COLLADASaxFWLLibraryControllersLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6B91032395F00764973 /* COLLADASaxFWLLibraryControllersLoader.cpp */; }; 4D0AE70D1032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6BA1032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader.cpp */; }; @@ -56,6 +57,7 @@ 4D0AE72A1032395F00764973 /* COLLADASaxFWLColladaParserAutoGen14PrivateValidation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6D81032395F00764973 /* COLLADASaxFWLColladaParserAutoGen14PrivateValidation.cpp */; }; 4D0AE72B1032395F00764973 /* COLLADASaxFWLGeometryLoader14.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6D91032395F00764973 /* COLLADASaxFWLGeometryLoader14.cpp */; }; 4D0AE72C1032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader14.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6DA1032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader14.cpp */; }; + 4D0AE72C1032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader14.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6DA1032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader14.cpp */; }; 4D0AE72D1032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader14.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6DB1032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader14.cpp */; }; 4D0AE72E1032395F00764973 /* COLLADASaxFWLLibraryControllersLoader14.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6DC1032395F00764973 /* COLLADASaxFWLLibraryControllersLoader14.cpp */; }; 4D0AE72F1032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader14.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6DD1032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader14.cpp */; }; @@ -78,6 +80,7 @@ 4D0AE7401032395F00764973 /* COLLADASaxFWLColladaParserAutoGen15PrivateValidation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6EF1032395F00764973 /* COLLADASaxFWLColladaParserAutoGen15PrivateValidation.cpp */; }; 4D0AE7411032395F00764973 /* COLLADASaxFWLGeometryLoader15.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6F01032395F00764973 /* COLLADASaxFWLGeometryLoader15.cpp */; }; 4D0AE7421032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader15.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6F11032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader15.cpp */; }; + 4D0AE7421032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader15.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6F11032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader15.cpp */; }; 4D0AE7431032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader15.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6F21032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader15.cpp */; }; 4D0AE7441032395F00764973 /* COLLADASaxFWLLibraryControllersLoader15.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6F31032395F00764973 /* COLLADASaxFWLLibraryControllersLoader15.cpp */; }; 4D0AE7451032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader15.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AE6F41032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader15.cpp */; }; @@ -108,6 +111,7 @@ 4D0AE7C3103239D100764973 /* COLLADASaxFWLIParserImpl14.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE762103239D000764973 /* COLLADASaxFWLIParserImpl14.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE7C4103239D100764973 /* COLLADASaxFWLIParserImpl15.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE763103239D000764973 /* COLLADASaxFWLIParserImpl15.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE7C5103239D100764973 /* COLLADASaxFWLLibraryAnimationsLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE764103239D000764973 /* COLLADASaxFWLLibraryAnimationsLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4D0AE7C5103239D100764973 /* COLLADASaxFWLLibraryAnimationClipsLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE764103239D000764973 /* COLLADASaxFWLLibraryAnimationClipsLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE7C6103239D100764973 /* COLLADASaxFWLLibraryCamerasLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE765103239D000764973 /* COLLADASaxFWLLibraryCamerasLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE7C7103239D100764973 /* COLLADASaxFWLLibraryControllersLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE766103239D000764973 /* COLLADASaxFWLLibraryControllersLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE7C8103239D100764973 /* COLLADASaxFWLLibraryEffectsLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE767103239D000764973 /* COLLADASaxFWLLibraryEffectsLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -151,6 +155,7 @@ 4D0AE7EE103239D100764973 /* COLLADASaxFWLColladaParserAutoGen14ValidationData.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE78E103239D000764973 /* COLLADASaxFWLColladaParserAutoGen14ValidationData.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE7EF103239D100764973 /* COLLADASaxFWLGeometryLoader14.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE78F103239D000764973 /* COLLADASaxFWLGeometryLoader14.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE7F0103239D100764973 /* COLLADASaxFWLLibraryAnimationsLoader14.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE790103239D000764973 /* COLLADASaxFWLLibraryAnimationsLoader14.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4D0AE7F0103239D100764973 /* COLLADASaxFWLLibraryAnimationClipsLoader14.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE790103239D000764973 /* COLLADASaxFWLLibraryAnimationClipsLoader14.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE7F1103239D100764973 /* COLLADASaxFWLLibraryCamerasLoader14.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE791103239D000764973 /* COLLADASaxFWLLibraryCamerasLoader14.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE7F2103239D100764973 /* COLLADASaxFWLLibraryControllersLoader14.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE792103239D000764973 /* COLLADASaxFWLLibraryControllersLoader14.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE7F3103239D100764973 /* COLLADASaxFWLLibraryEffectsLoader14.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE793103239D000764973 /* COLLADASaxFWLLibraryEffectsLoader14.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -172,6 +177,7 @@ 4D0AE803103239D100764973 /* COLLADASaxFWLColladaParserAutoGen15ValidationData.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE7A4103239D000764973 /* COLLADASaxFWLColladaParserAutoGen15ValidationData.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE804103239D100764973 /* COLLADASaxFWLGeometryLoader15.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE7A5103239D000764973 /* COLLADASaxFWLGeometryLoader15.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE805103239D100764973 /* COLLADASaxFWLLibraryAnimationsLoader15.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE7A6103239D000764973 /* COLLADASaxFWLLibraryAnimationsLoader15.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4D0AE805103239D100764973 /* COLLADASaxFWLLibraryAnimationClipsLoader15.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE7A6103239D000764973 /* COLLADASaxFWLLibraryAnimationClipsLoader15.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE806103239D100764973 /* COLLADASaxFWLLibraryCamerasLoader15.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE7A7103239D000764973 /* COLLADASaxFWLLibraryCamerasLoader15.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE807103239D100764973 /* COLLADASaxFWLLibraryControllersLoader15.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE7A8103239D000764973 /* COLLADASaxFWLLibraryControllersLoader15.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D0AE808103239D100764973 /* COLLADASaxFWLLibraryEffectsLoader15.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE7A9103239D000764973 /* COLLADASaxFWLLibraryEffectsLoader15.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -246,6 +252,7 @@ 4D0AE98D10323FFB00764973 /* COLLADAFWAnimatable.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE90110323FFB00764973 /* COLLADAFWAnimatable.h */; }; 4D0AE98E10323FFB00764973 /* COLLADAFWAnimatableFloat.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE90210323FFB00764973 /* COLLADAFWAnimatableFloat.h */; }; 4D0AE98F10323FFB00764973 /* COLLADAFWAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE90310323FFB00764973 /* COLLADAFWAnimation.h */; }; + 4D0AE98F10323FFB00764973 /* COLLADAFWAnimationClip.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE90310323FFB00764973 /* COLLADAFWAnimationClip.h */; }; 4D0AE99010323FFB00764973 /* COLLADAFWAnimationCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE90410323FFB00764973 /* COLLADAFWAnimationCurve.h */; }; 4D0AE99110323FFB00764973 /* COLLADAFWAnimationList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE90510323FFB00764973 /* COLLADAFWAnimationList.h */; }; 4D0AE99210323FFB00764973 /* COLLADAFWAnnotate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D0AE90610323FFB00764973 /* COLLADAFWAnnotate.h */; }; @@ -470,6 +477,7 @@ 4D0AE6B51032395F00764973 /* COLLADASaxFWLIParserImpl14.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLIParserImpl14.cpp; sourceTree = "<group>"; }; 4D0AE6B61032395F00764973 /* COLLADASaxFWLIParserImpl15.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLIParserImpl15.cpp; sourceTree = "<group>"; }; 4D0AE6B71032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryAnimationsLoader.cpp; sourceTree = "<group>"; }; + 4D0AE6B71032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryAnimationClipsLoader.cpp; sourceTree = "<group>"; }; 4D0AE6B81032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryCamerasLoader.cpp; sourceTree = "<group>"; }; 4D0AE6B91032395F00764973 /* COLLADASaxFWLLibraryControllersLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryControllersLoader.cpp; sourceTree = "<group>"; }; 4D0AE6BA1032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryEffectsLoader.cpp; sourceTree = "<group>"; }; @@ -504,6 +512,7 @@ 4D0AE6D81032395F00764973 /* COLLADASaxFWLColladaParserAutoGen14PrivateValidation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLColladaParserAutoGen14PrivateValidation.cpp; sourceTree = "<group>"; }; 4D0AE6D91032395F00764973 /* COLLADASaxFWLGeometryLoader14.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLGeometryLoader14.cpp; sourceTree = "<group>"; }; 4D0AE6DA1032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader14.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryAnimationsLoader14.cpp; sourceTree = "<group>"; }; + 4D0AE6DA1032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader14.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryAnimationClipsLoader14.cpp; sourceTree = "<group>"; }; 4D0AE6DB1032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader14.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryCamerasLoader14.cpp; sourceTree = "<group>"; }; 4D0AE6DC1032395F00764973 /* COLLADASaxFWLLibraryControllersLoader14.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryControllersLoader14.cpp; sourceTree = "<group>"; }; 4D0AE6DD1032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader14.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryEffectsLoader14.cpp; sourceTree = "<group>"; }; @@ -526,6 +535,7 @@ 4D0AE6EF1032395F00764973 /* COLLADASaxFWLColladaParserAutoGen15PrivateValidation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLColladaParserAutoGen15PrivateValidation.cpp; sourceTree = "<group>"; }; 4D0AE6F01032395F00764973 /* COLLADASaxFWLGeometryLoader15.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLGeometryLoader15.cpp; sourceTree = "<group>"; }; 4D0AE6F11032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader15.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryAnimationsLoader15.cpp; sourceTree = "<group>"; }; + 4D0AE6F11032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader15.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryAnimationClipsLoader15.cpp; sourceTree = "<group>"; }; 4D0AE6F21032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader15.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryCamerasLoader15.cpp; sourceTree = "<group>"; }; 4D0AE6F31032395F00764973 /* COLLADASaxFWLLibraryControllersLoader15.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryControllersLoader15.cpp; sourceTree = "<group>"; }; 4D0AE6F41032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader15.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COLLADASaxFWLLibraryEffectsLoader15.cpp; sourceTree = "<group>"; }; @@ -556,6 +566,7 @@ 4D0AE762103239D000764973 /* COLLADASaxFWLIParserImpl14.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLIParserImpl14.h; sourceTree = "<group>"; }; 4D0AE763103239D000764973 /* COLLADASaxFWLIParserImpl15.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLIParserImpl15.h; sourceTree = "<group>"; }; 4D0AE764103239D000764973 /* COLLADASaxFWLLibraryAnimationsLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryAnimationsLoader.h; sourceTree = "<group>"; }; + 4D0AE764103239D000764973 /* COLLADASaxFWLLibraryAnimationClipsLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryAnimationClipsLoader.h; sourceTree = "<group>"; }; 4D0AE765103239D000764973 /* COLLADASaxFWLLibraryCamerasLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryCamerasLoader.h; sourceTree = "<group>"; }; 4D0AE766103239D000764973 /* COLLADASaxFWLLibraryControllersLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryControllersLoader.h; sourceTree = "<group>"; }; 4D0AE767103239D000764973 /* COLLADASaxFWLLibraryEffectsLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryEffectsLoader.h; sourceTree = "<group>"; }; @@ -599,6 +610,7 @@ 4D0AE78E103239D000764973 /* COLLADASaxFWLColladaParserAutoGen14ValidationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLColladaParserAutoGen14ValidationData.h; sourceTree = "<group>"; }; 4D0AE78F103239D000764973 /* COLLADASaxFWLGeometryLoader14.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLGeometryLoader14.h; sourceTree = "<group>"; }; 4D0AE790103239D000764973 /* COLLADASaxFWLLibraryAnimationsLoader14.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryAnimationsLoader14.h; sourceTree = "<group>"; }; + 4D0AE790103239D000764973 /* COLLADASaxFWLLibraryAnimationClipsLoader14.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryAnimationClipsLoader14.h; sourceTree = "<group>"; }; 4D0AE791103239D000764973 /* COLLADASaxFWLLibraryCamerasLoader14.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryCamerasLoader14.h; sourceTree = "<group>"; }; 4D0AE792103239D000764973 /* COLLADASaxFWLLibraryControllersLoader14.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryControllersLoader14.h; sourceTree = "<group>"; }; 4D0AE793103239D000764973 /* COLLADASaxFWLLibraryEffectsLoader14.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryEffectsLoader14.h; sourceTree = "<group>"; }; @@ -620,6 +632,7 @@ 4D0AE7A4103239D000764973 /* COLLADASaxFWLColladaParserAutoGen15ValidationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLColladaParserAutoGen15ValidationData.h; sourceTree = "<group>"; }; 4D0AE7A5103239D000764973 /* COLLADASaxFWLGeometryLoader15.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLGeometryLoader15.h; sourceTree = "<group>"; }; 4D0AE7A6103239D000764973 /* COLLADASaxFWLLibraryAnimationsLoader15.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryAnimationsLoader15.h; sourceTree = "<group>"; }; + 4D0AE7A6103239D000764973 /* COLLADASaxFWLLibraryAnimationClipsLoader15.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryAnimationClipsLoader15.h; sourceTree = "<group>"; }; 4D0AE7A7103239D000764973 /* COLLADASaxFWLLibraryCamerasLoader15.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryCamerasLoader15.h; sourceTree = "<group>"; }; 4D0AE7A8103239D000764973 /* COLLADASaxFWLLibraryControllersLoader15.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryControllersLoader15.h; sourceTree = "<group>"; }; 4D0AE7A9103239D000764973 /* COLLADASaxFWLLibraryEffectsLoader15.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADASaxFWLLibraryEffectsLoader15.h; sourceTree = "<group>"; }; @@ -701,6 +714,7 @@ 4D0AE90110323FFB00764973 /* COLLADAFWAnimatable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADAFWAnimatable.h; sourceTree = "<group>"; }; 4D0AE90210323FFB00764973 /* COLLADAFWAnimatableFloat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADAFWAnimatableFloat.h; sourceTree = "<group>"; }; 4D0AE90310323FFB00764973 /* COLLADAFWAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADAFWAnimation.h; sourceTree = "<group>"; }; + 4D0AE90310323FFB00764973 /* COLLADAFWAnimationClip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADAFWAnimationClip.h; sourceTree = "<group>"; }; 4D0AE90410323FFB00764973 /* COLLADAFWAnimationCurve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADAFWAnimationCurve.h; sourceTree = "<group>"; }; 4D0AE90510323FFB00764973 /* COLLADAFWAnimationList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADAFWAnimationList.h; sourceTree = "<group>"; }; 4D0AE90610323FFB00764973 /* COLLADAFWAnnotate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COLLADAFWAnnotate.h; sourceTree = "<group>"; }; @@ -992,6 +1006,7 @@ 4D0AE6B51032395F00764973 /* COLLADASaxFWLIParserImpl14.cpp */, 4D0AE6B61032395F00764973 /* COLLADASaxFWLIParserImpl15.cpp */, 4D0AE6B71032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader.cpp */, + 4D0AE6B71032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader.cpp */, 4D0AE6B81032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader.cpp */, 4D0AE6B91032395F00764973 /* COLLADASaxFWLLibraryControllersLoader.cpp */, 4D0AE6BA1032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader.cpp */, @@ -1036,6 +1051,7 @@ 4D0AE6D81032395F00764973 /* COLLADASaxFWLColladaParserAutoGen14PrivateValidation.cpp */, 4D0AE6D91032395F00764973 /* COLLADASaxFWLGeometryLoader14.cpp */, 4D0AE6DA1032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader14.cpp */, + 4D0AE6DA1032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader14.cpp */, 4D0AE6DB1032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader14.cpp */, 4D0AE6DC1032395F00764973 /* COLLADASaxFWLLibraryControllersLoader14.cpp */, 4D0AE6DD1032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader14.cpp */, @@ -1065,6 +1081,7 @@ 4D0AE6EF1032395F00764973 /* COLLADASaxFWLColladaParserAutoGen15PrivateValidation.cpp */, 4D0AE6F01032395F00764973 /* COLLADASaxFWLGeometryLoader15.cpp */, 4D0AE6F11032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader15.cpp */, + 4D0AE6F11032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader15.cpp */, 4D0AE6F21032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader15.cpp */, 4D0AE6F31032395F00764973 /* COLLADASaxFWLLibraryControllersLoader15.cpp */, 4D0AE6F41032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader15.cpp */, @@ -1102,6 +1119,7 @@ 4D0AE762103239D000764973 /* COLLADASaxFWLIParserImpl14.h */, 4D0AE763103239D000764973 /* COLLADASaxFWLIParserImpl15.h */, 4D0AE764103239D000764973 /* COLLADASaxFWLLibraryAnimationsLoader.h */, + 4D0AE764103239D000764973 /* COLLADASaxFWLLibraryAnimationClipsLoader.h */, 4D0AE765103239D000764973 /* COLLADASaxFWLLibraryCamerasLoader.h */, 4D0AE766103239D000764973 /* COLLADASaxFWLLibraryControllersLoader.h */, 4D0AE767103239D000764973 /* COLLADASaxFWLLibraryEffectsLoader.h */, @@ -1155,6 +1173,7 @@ 4D0AE78E103239D000764973 /* COLLADASaxFWLColladaParserAutoGen14ValidationData.h */, 4D0AE78F103239D000764973 /* COLLADASaxFWLGeometryLoader14.h */, 4D0AE790103239D000764973 /* COLLADASaxFWLLibraryAnimationsLoader14.h */, + 4D0AE790103239D000764973 /* COLLADASaxFWLLibraryAnimationClipsLoader14.h */, 4D0AE791103239D000764973 /* COLLADASaxFWLLibraryCamerasLoader14.h */, 4D0AE792103239D000764973 /* COLLADASaxFWLLibraryControllersLoader14.h */, 4D0AE793103239D000764973 /* COLLADASaxFWLLibraryEffectsLoader14.h */, @@ -1183,6 +1202,7 @@ 4D0AE7A4103239D000764973 /* COLLADASaxFWLColladaParserAutoGen15ValidationData.h */, 4D0AE7A5103239D000764973 /* COLLADASaxFWLGeometryLoader15.h */, 4D0AE7A6103239D000764973 /* COLLADASaxFWLLibraryAnimationsLoader15.h */, + 4D0AE7A6103239D000764973 /* COLLADASaxFWLLibraryAnimationClipsLoader15.h */, 4D0AE7A7103239D000764973 /* COLLADASaxFWLLibraryCamerasLoader15.h */, 4D0AE7A8103239D000764973 /* COLLADASaxFWLLibraryControllersLoader15.h */, 4D0AE7A9103239D000764973 /* COLLADASaxFWLLibraryEffectsLoader15.h */, @@ -1361,6 +1381,7 @@ 4D0AE90110323FFB00764973 /* COLLADAFWAnimatable.h */, 4D0AE90210323FFB00764973 /* COLLADAFWAnimatableFloat.h */, 4D0AE90310323FFB00764973 /* COLLADAFWAnimation.h */, + 4D0AE90310323FFB00764973 /* COLLADAFWAnimationClip.h */, 4D0AE90410323FFB00764973 /* COLLADAFWAnimationCurve.h */, 4D0AE90510323FFB00764973 /* COLLADAFWAnimationList.h */, 4D0AE90610323FFB00764973 /* COLLADAFWAnnotate.h */, @@ -1638,6 +1659,7 @@ 4D0AE98D10323FFB00764973 /* COLLADAFWAnimatable.h in Headers */, 4D0AE98E10323FFB00764973 /* COLLADAFWAnimatableFloat.h in Headers */, 4D0AE98F10323FFB00764973 /* COLLADAFWAnimation.h in Headers */, + 4D0AE98F10323FFB00764973 /* COLLADAFWAnimationClip.h in Headers */, 4D0AE99010323FFB00764973 /* COLLADAFWAnimationCurve.h in Headers */, 4D0AE99110323FFB00764973 /* COLLADAFWAnimationList.h in Headers */, 4D0AE99210323FFB00764973 /* COLLADAFWAnnotate.h in Headers */, @@ -1764,6 +1786,7 @@ 4D0AE7C3103239D100764973 /* COLLADASaxFWLIParserImpl14.h in Headers */, 4D0AE7C4103239D100764973 /* COLLADASaxFWLIParserImpl15.h in Headers */, 4D0AE7C5103239D100764973 /* COLLADASaxFWLLibraryAnimationsLoader.h in Headers */, + 4D0AE7C5103239D100764973 /* COLLADASaxFWLLibraryAnimationClipsLoader.h in Headers */, 4D0AE7C6103239D100764973 /* COLLADASaxFWLLibraryCamerasLoader.h in Headers */, 4D0AE7C7103239D100764973 /* COLLADASaxFWLLibraryControllersLoader.h in Headers */, 4D0AE7C8103239D100764973 /* COLLADASaxFWLLibraryEffectsLoader.h in Headers */, @@ -1807,6 +1830,7 @@ 4D0AE7EE103239D100764973 /* COLLADASaxFWLColladaParserAutoGen14ValidationData.h in Headers */, 4D0AE7EF103239D100764973 /* COLLADASaxFWLGeometryLoader14.h in Headers */, 4D0AE7F0103239D100764973 /* COLLADASaxFWLLibraryAnimationsLoader14.h in Headers */, + 4D0AE7F0103239D100764973 /* COLLADASaxFWLLibraryAnimationClipsLoader14.h in Headers */, 4D0AE7F1103239D100764973 /* COLLADASaxFWLLibraryCamerasLoader14.h in Headers */, 4D0AE7F2103239D100764973 /* COLLADASaxFWLLibraryControllersLoader14.h in Headers */, 4D0AE7F3103239D100764973 /* COLLADASaxFWLLibraryEffectsLoader14.h in Headers */, @@ -1828,6 +1852,7 @@ 4D0AE803103239D100764973 /* COLLADASaxFWLColladaParserAutoGen15ValidationData.h in Headers */, 4D0AE804103239D100764973 /* COLLADASaxFWLGeometryLoader15.h in Headers */, 4D0AE805103239D100764973 /* COLLADASaxFWLLibraryAnimationsLoader15.h in Headers */, + 4D0AE805103239D100764973 /* COLLADASaxFWLLibraryAnimationClipsLoader15.h in Headers */, 4D0AE806103239D100764973 /* COLLADASaxFWLLibraryCamerasLoader15.h in Headers */, 4D0AE807103239D100764973 /* COLLADASaxFWLLibraryControllersLoader15.h in Headers */, 4D0AE808103239D100764973 /* COLLADASaxFWLLibraryEffectsLoader15.h in Headers */, @@ -2101,6 +2126,7 @@ 4D0AE7081032395F00764973 /* COLLADASaxFWLIParserImpl14.cpp in Sources */, 4D0AE7091032395F00764973 /* COLLADASaxFWLIParserImpl15.cpp in Sources */, 4D0AE70A1032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader.cpp in Sources */, + 4D0AE70A1032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader.cpp in Sources */, 4D0AE70B1032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader.cpp in Sources */, 4D0AE70C1032395F00764973 /* COLLADASaxFWLLibraryControllersLoader.cpp in Sources */, 4D0AE70D1032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader.cpp in Sources */, @@ -2135,6 +2161,7 @@ 4D0AE72A1032395F00764973 /* COLLADASaxFWLColladaParserAutoGen14PrivateValidation.cpp in Sources */, 4D0AE72B1032395F00764973 /* COLLADASaxFWLGeometryLoader14.cpp in Sources */, 4D0AE72C1032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader14.cpp in Sources */, + 4D0AE72C1032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader14.cpp in Sources */, 4D0AE72D1032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader14.cpp in Sources */, 4D0AE72E1032395F00764973 /* COLLADASaxFWLLibraryControllersLoader14.cpp in Sources */, 4D0AE72F1032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader14.cpp in Sources */, @@ -2157,6 +2184,7 @@ 4D0AE7401032395F00764973 /* COLLADASaxFWLColladaParserAutoGen15PrivateValidation.cpp in Sources */, 4D0AE7411032395F00764973 /* COLLADASaxFWLGeometryLoader15.cpp in Sources */, 4D0AE7421032395F00764973 /* COLLADASaxFWLLibraryAnimationsLoader15.cpp in Sources */, + 4D0AE7421032395F00764973 /* COLLADASaxFWLLibraryAnimationClipsLoader15.cpp in Sources */, 4D0AE7431032395F00764973 /* COLLADASaxFWLLibraryCamerasLoader15.cpp in Sources */, 4D0AE7441032395F00764973 /* COLLADASaxFWLLibraryControllersLoader15.cpp in Sources */, 4D0AE7451032395F00764973 /* COLLADASaxFWLLibraryEffectsLoader15.cpp in Sources */, diff --git a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryAnimationClipsLoader.h b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryAnimationClipsLoader.h new file mode 100644 index 0000000000000000000000000000000000000000..e1c0caac931a124e64c5b3814ca8fd5749d8bb12 --- /dev/null +++ b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryAnimationClipsLoader.h @@ -0,0 +1,71 @@ +#ifndef __COLLADASAXFWL_LIBRARYANIMATIONCLIPSLOADER_H__ +#define __COLLADASAXFWL_LIBRARYANIMATIONCLIPSLOADER_H__ + +#include "COLLADASaxFWLPrerequisites.h" +#include "COLLADASaxFWLFilePartLoader.h" +#include "COLLADASaxFWLXmlTypes.h" + +#include "COLLADAFWHashFunctions.h" +#include "COLLADABUhash_map.h" + +namespace COLLADAFW +{ + class AnimationClip; +} + + +namespace COLLADASaxFWL +{ + /** Loads all animation clips in a library animation clips. */ + class LibraryAnimationClipsLoader : public FilePartLoader + { + private: + typedef COLLADABU::hash_set<COLLADAFW::UniqueId> UniqueIdSet; + + /** The instance animation ids for the current animation clip. */ + UniqueIdSet mInstanceAnimationIds; + + /** The current animation clip being parsed. */ + COLLADAFW::AnimationClip* mAnimationClip; + + public: + + /** Constructor. */ + LibraryAnimationClipsLoader( IFilePartLoader* callingFilePartLoader ); + + /** Destructor. */ + virtual ~LibraryAnimationClipsLoader(); + + /** Returns the unique id of the current parsed object. */ + virtual const COLLADAFW::UniqueId& getUniqueId(); + + /** Finishes loading a library animation clips. */ + virtual bool end__library_animation_clips(); + + + /** Creates a new animation clip. */ + virtual bool begin__animation_clip( const animation_clip__AttributeData& attributeData ); + + /** Sends the animation clip to the writer. */ + virtual bool end__animation_clip(); + + + /** Add the referenced animation to the current animation clip. */ + virtual bool begin__instance_animation( const instance_animation__AttributeData& attributeData ); + + /** We don't need to do anything here. */ + virtual bool end__instance_animation(); + + private: + + /** Disable defult copy ctor. */ + LibraryAnimationClipsLoader( const LibraryAnimationClipsLoader& pre ); + + /** Disable default assignment operator. */ + const LibraryAnimationClipsLoader& operator= ( const LibraryAnimationClipsLoader& pre ); + + }; + +} // namespace COLLADASAXFWL + +#endif // __COLLADASAXFWL_LIBRARYANIMATIONCLIPSLOADER_H__ diff --git a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLoader.h b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLoader.h index 3c6ab3fceeac937cc54ca96792ffe3bc830703b0..70020e9cdd161b04baf1c290a1f21b7822007239 100644 --- a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLoader.h +++ b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLoader.h @@ -88,8 +88,9 @@ namespace COLLADASaxFWL CONTROLLER_FLAG = 1<<13, FORMULA_FLAG = 1<<14, KINEMATICS_FLAG = 1<<15, + ANIMATION_CLIP_FLAG = 1<<16, - ALL_OBJECTS_MASK = (1<<16) - 1, + ALL_OBJECTS_MASK = (1<<17) - 1, }; public: diff --git a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser14.h b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser14.h index add68b5e66cd5808a88db863726350e45bc61786..4946472e8777620a3e724925d9ab330dbe2f36c6 100644 --- a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser14.h +++ b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser14.h @@ -71,6 +71,9 @@ namespace COLLADASaxFWL /** Starts loading a library images.*/ virtual bool begin__library_images( const COLLADASaxFWL14::library_images__AttributeData& attributeData ); + /** Starts loading a library animation clips. */ + virtual bool begin__library_animation_clips( const COLLADASaxFWL14::library_animation_clips__AttributeData& attributeData ); + /** Starts loading a library animations.*/ virtual bool begin__library_animations( const COLLADASaxFWL14::library_animations__AttributeData& attributeData ); diff --git a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser15.h b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser15.h index 4544ebdd7138c1dca16e7013cbe3ee93965194f9..894cdccfb1608c1661d1fa33c70ae7e29c57dc0d 100644 --- a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser15.h +++ b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser15.h @@ -71,6 +71,9 @@ namespace COLLADASaxFWL /** Starts loading a library images.*/ virtual bool begin__library_images( const COLLADASaxFWL15::library_images__AttributeData& attributeData ); + /** Starts loading a library animation clips. */ + virtual bool begin__library_animation_clips( const COLLADASaxFWL15::library_animation_clips__AttributeData& attributeData ); + /** Starts loading a library animations.*/ virtual bool begin__library_animations( const COLLADASaxFWL15::library_animations__AttributeData& attributeData ); diff --git a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLXmlTypes.h b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLXmlTypes.h index c1ddba10dfca0c3e58cee23e4f078d222f84859a..70ad89ac598c47ba9823d8f79007f23fb0f3bd40 100644 --- a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLXmlTypes.h +++ b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLXmlTypes.h @@ -381,6 +381,21 @@ namespace COLLADASaxFWL uint64 count; const ParserChar* material; }; + struct animation_clip__AttributeData + { + const ParserChar* id; + const ParserChar* name; + }; + struct instance_animation__AttributeData + { + static const uint32 ATTRIBUTE_URL_PRESENT = 0x1; + + uint32 present_attributes; + + COLLADABU::URI url; + const ParserChar* sid; + const ParserChar* name; + }; struct animation__AttributeData { const ParserChar* id; diff --git a/COLLADASaxFrameworkLoader/include/generated14/COLLADASaxFWLLibraryAnimationClipsLoader14.h b/COLLADASaxFrameworkLoader/include/generated14/COLLADASaxFWLLibraryAnimationClipsLoader14.h new file mode 100644 index 0000000000000000000000000000000000000000..166f2608c472c07b66b2a49724f248e1e6b73402 --- /dev/null +++ b/COLLADASaxFrameworkLoader/include/generated14/COLLADASaxFWLLibraryAnimationClipsLoader14.h @@ -0,0 +1,45 @@ +#ifndef __COLLADASAXFWL_LIBRARYANIMATIONCLIPSLOADER14_H__ +#define __COLLADASAXFWL_LIBRARYANIMATIONCLIPSLOADER14_H__ + +#include "COLLADASaxFWLPrerequisites.h" +#include "COLLADASaxFWLLibraryAnimationClipsLoader.h" +#include "COLLADASaxFWLIParserImpl14.h" + + +namespace COLLADASaxFWL +{ + + +class IFilePartLoader; + + +class LibraryAnimationClipsLoader14 : public IParserImpl14 +{ +private: +LibraryAnimationClipsLoader* mLoader; + +public: +LibraryAnimationClipsLoader14(LibraryAnimationClipsLoader* loader) + : mLoader(loader) +{} + + +virtual bool end__library_animation_clips(); + +virtual bool begin__animation_clip( const COLLADASaxFWL14::animation_clip__AttributeData& attributeData ); + +virtual bool end__animation_clip(); + +virtual bool begin__instance_animation( const COLLADASaxFWL14::instance_animation__AttributeData& attributeData ); + +virtual bool end__instance_animation(); + + +private: +/** Disable default copy ctor. */ +LibraryAnimationClipsLoader14(const LibraryAnimationClipsLoader14&); +/** Disable default assignment operator. */ +const LibraryAnimationClipsLoader14& operator=(const LibraryAnimationClipsLoader14&); +}; +} +#endif // __COLLADASAXFWL_LIBRARYANIMATIONCLIPSLOADER14_H__ diff --git a/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLLibraryAnimationClipsLoader15.h b/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLLibraryAnimationClipsLoader15.h new file mode 100644 index 0000000000000000000000000000000000000000..3f7bced0ffeccb61657b1bb1447af1b48170eb4b --- /dev/null +++ b/COLLADASaxFrameworkLoader/include/generated15/COLLADASaxFWLLibraryAnimationClipsLoader15.h @@ -0,0 +1,45 @@ +#ifndef __COLLADASAXFWL_LIBRARYANIMATIONCLIPSLOADER15_H__ +#define __COLLADASAXFWL_LIBRARYANIMATIONCLIPSLOADER15_H__ + +#include "COLLADASaxFWLPrerequisites.h" +#include "COLLADASaxFWLLibraryAnimationClipsLoader.h" +#include "COLLADASaxFWLIParserImpl15.h" + + +namespace COLLADASaxFWL +{ + + +class IFilePartLoader; + + +class LibraryAnimationClipsLoader15 : public IParserImpl15 +{ +private: +LibraryAnimationClipsLoader* mLoader; + +public: +LibraryAnimationClipsLoader15(LibraryAnimationClipsLoader* loader) + : mLoader(loader) +{} + + +virtual bool end__library_animation_clips(); + +virtual bool begin__animation_clip( const COLLADASaxFWL15::animation_clip__AttributeData& attributeData ); + +virtual bool end__animation_clip(); + +virtual bool begin__instance_animation( const COLLADASaxFWL15::instance_animation__AttributeData& attributeData ); + +virtual bool end__instance_animation(); + + +private: +/** Disable default copy ctor. */ +LibraryAnimationClipsLoader15(const LibraryAnimationClipsLoader15&); +/** Disable default assignment operator. */ +const LibraryAnimationClipsLoader15& operator=(const LibraryAnimationClipsLoader15&); +}; +} +#endif // __COLLADASAXFWL_LIBRARYANIMATIONCLIPSLOADER15_H__ \ No newline at end of file diff --git a/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj b/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj index 7c8ed1ea188a735d113188063e37b3f77483da44..2164d11279623d71c48e36a9b4697b5dc2b0d01e 100644 --- a/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj +++ b/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj @@ -2473,6 +2473,7 @@ <ClCompile Include="..\src\COLLADASaxFWLJointsLoader.cpp" /> <ClCompile Include="..\src\COLLADASaxFWLKinematicsIntermediateData.cpp" /> <ClCompile Include="..\src\COLLADASaxFWLKinematicsSceneCreator.cpp" /> + <ClCompile Include="..\src\COLLADASaxFWLLibraryAnimationClipsLoader.cpp" /> <ClCompile Include="..\src\COLLADASaxFWLLibraryAnimationsLoader.cpp" /> <ClCompile Include="..\src\COLLADASaxFWLLibraryArticulatedSystemsLoader.cpp" /> <ClCompile Include="..\src\COLLADASaxFWLLibraryCamerasLoader.cpp" /> @@ -2617,6 +2618,7 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_LibXML_NoValidation|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\src\generated14\COLLADASaxFWLGeometryLoader14.cpp" /> + <ClCompile Include="..\src\generated14\COLLADASaxFWLLibraryAnimationClipsLoader14.cpp" /> <ClCompile Include="..\src\generated14\COLLADASaxFWLLibraryAnimationsLoader14.cpp" /> <ClCompile Include="..\src\generated14\COLLADASaxFWLLibraryCamerasLoader14.cpp" /> <ClCompile Include="..\src\generated14\COLLADASaxFWLLibraryControllersLoader14.cpp" /> @@ -2676,6 +2678,7 @@ </ClCompile> <ClCompile Include="..\src\generated15\COLLADASaxFWLFormulasLoader15.cpp" /> <ClCompile Include="..\src\generated15\COLLADASaxFWLGeometryLoader15.cpp" /> + <ClCompile Include="..\src\generated15\COLLADASaxFWLLibraryAnimationClipsLoader15.cpp" /> <ClCompile Include="..\src\generated15\COLLADASaxFWLLibraryAnimationsLoader15.cpp" /> <ClCompile Include="..\src\generated15\COLLADASaxFWLLibraryArticulatedSystemsLoader15.cpp" /> <ClCompile Include="..\src\generated15\COLLADASaxFWLLibraryCamerasLoader15.cpp" /> @@ -2727,6 +2730,7 @@ <ClInclude Include="..\include\COLLADASaxFWLJointsLoader.h" /> <ClInclude Include="..\include\COLLADASaxFWLKinematicsIntermediateData.h" /> <ClInclude Include="..\include\COLLADASaxFWLKinematicsSceneCreator.h" /> + <ClInclude Include="..\include\COLLADASaxFWLLibraryAnimationClipsLoader.h" /> <ClInclude Include="..\include\COLLADASaxFWLLibraryAnimationsLoader.h" /> <ClInclude Include="..\include\COLLADASaxFWLLibraryArticulatedSystemsLoader.h" /> <ClInclude Include="..\include\COLLADASaxFWLLibraryCamerasLoader.h" /> @@ -2776,6 +2780,7 @@ <ClInclude Include="..\include\generated14\COLLADASaxFWLColladaParserAutoGen14Private.h" /> <CustomBuild Include="..\include\generated14\COLLADASaxFWLColladaParserAutoGen14ValidationData.h" /> <ClInclude Include="..\include\generated14\COLLADASaxFWLGeometryLoader14.h" /> + <ClInclude Include="..\include\generated14\COLLADASaxFWLLibraryAnimationClipsLoader14.h" /> <ClInclude Include="..\include\generated14\COLLADASaxFWLLibraryAnimationsLoader14.h" /> <ClInclude Include="..\include\generated14\COLLADASaxFWLLibraryCamerasLoader14.h" /> <ClInclude Include="..\include\generated14\COLLADASaxFWLLibraryControllersLoader14.h" /> @@ -2798,6 +2803,7 @@ <CustomBuild Include="..\include\generated15\COLLADASaxFWLColladaParserAutoGen15ValidationData.h" /> <ClInclude Include="..\include\generated15\COLLADASaxFWLFormulasLoader15.h" /> <ClInclude Include="..\include\generated15\COLLADASaxFWLGeometryLoader15.h" /> + <ClInclude Include="..\include\generated15\COLLADASaxFWLLibraryAnimationClipsLoader15.h" /> <ClInclude Include="..\include\generated15\COLLADASaxFWLLibraryAnimationsLoader15.h" /> <ClInclude Include="..\include\generated15\COLLADASaxFWLLibraryArticulatedSystemsLoader15.h" /> <ClInclude Include="..\include\generated15\COLLADASaxFWLLibraryCamerasLoader15.h" /> diff --git a/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj.filters b/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj.filters index 09c27baa21358adbc648d3d41d345064f32f7d77..081657dd2b9c9204bd5785b6f0aa379c6bd1728e 100644 --- a/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj.filters +++ b/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj.filters @@ -92,6 +92,9 @@ <ClCompile Include="..\src\COLLADASaxFWLKinematicsSceneCreator.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\src\COLLADASaxFWLLibraryAnimationClipsLoader.cpp"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\src\COLLADASaxFWLLibraryAnimationsLoader.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -218,6 +221,9 @@ <ClCompile Include="..\src\generated14\COLLADASaxFWLGeometryLoader14.cpp"> <Filter>Source Files\generated 1.4</Filter> </ClCompile> + <ClCompile Include="..\src\generated14\COLLADASaxFWLLibraryAnimationClipsLoader14.cpp"> + <Filter>Source Files\generated 1.4</Filter> + </ClCompile> <ClCompile Include="..\src\generated14\COLLADASaxFWLLibraryAnimationsLoader14.cpp"> <Filter>Source Files\generated 1.4</Filter> </ClCompile> @@ -290,6 +296,9 @@ <ClCompile Include="..\src\generated15\COLLADASaxFWLGeometryLoader15.cpp"> <Filter>Source Files\generated 1.5</Filter> </ClCompile> + <ClCompile Include="..\src\generated15\COLLADASaxFWLLibraryAnimationClipsLoader15.cpp"> + <Filter>Source Files\generated 1.5</Filter> + </ClCompile> <ClCompile Include="..\src\generated15\COLLADASaxFWLLibraryAnimationsLoader15.cpp"> <Filter>Source Files\generated 1.5</Filter> </ClCompile> @@ -439,6 +448,9 @@ <ClInclude Include="..\include\COLLADASaxFWLKinematicsSceneCreator.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\include\COLLADASaxFWLLibraryAnimationClipsLoader.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\include\COLLADASaxFWLLibraryAnimationsLoader.h"> <Filter>Header Files</Filter> </ClInclude> @@ -583,6 +595,9 @@ <ClInclude Include="..\include\generated14\COLLADASaxFWLGeometryLoader14.h"> <Filter>Header Files\generated 1.4</Filter> </ClInclude> + <ClInclude Include="..\include\generated14\COLLADASaxFWLLibraryAnimationClipsLoader14.h"> + <Filter>Header Files\generated 1.4</Filter> + </ClInclude> <ClInclude Include="..\include\generated14\COLLADASaxFWLLibraryAnimationsLoader14.h"> <Filter>Header Files\generated 1.4</Filter> </ClInclude> @@ -646,6 +661,9 @@ <ClInclude Include="..\include\generated15\COLLADASaxFWLGeometryLoader15.h"> <Filter>Header Files\generated 1.5</Filter> </ClInclude> + <ClInclude Include="..\include\generated15\COLLADASaxFWLLibraryAnimationClipsLoader15.h"> + <Filter>Header Files\generated 1.5</Filter> + </ClInclude> <ClInclude Include="..\include\generated15\COLLADASaxFWLLibraryAnimationsLoader15.h"> <Filter>Header Files\generated 1.5</Filter> </ClInclude> diff --git a/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryAnimationClipsLoader.cpp b/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryAnimationClipsLoader.cpp new file mode 100644 index 0000000000000000000000000000000000000000..b3f77e0be49000551e3d3d541363d2122ab91681 --- /dev/null +++ b/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryAnimationClipsLoader.cpp @@ -0,0 +1,95 @@ +#include "COLLADASaxFWLStableHeaders.h" +#include "COLLADASaxFWLLibraryAnimationClipsLoader.h" +#include "COLLADASaxFWLLoader.h" + +#include "COLLADAFWAnimationClip.h" +#include "COLLADAFWIWriter.h" +#include "COLLADAFWUniqueId.h" + +namespace COLLADASaxFWL +{ + //------------------------------ + LibraryAnimationClipsLoader::LibraryAnimationClipsLoader( IFilePartLoader* callingFilePartLoader ) + : FilePartLoader(callingFilePartLoader) + , mAnimationClip(0) + { + + } + + //------------------------------ + LibraryAnimationClipsLoader::~LibraryAnimationClipsLoader() + { + } + + //------------------------------ + const COLLADAFW::UniqueId& LibraryAnimationClipsLoader::getUniqueId() + { + if ( mAnimationClip ) + return mAnimationClip->getUniqueId(); + return COLLADAFW::UniqueId::INVALID; + } + + //------------------------------ + bool LibraryAnimationClipsLoader::end__library_animation_clips() + { + moveUpInSidTree(); + finish(); + return true; + } + + //------------------------------ + bool LibraryAnimationClipsLoader::begin__animation_clip( const animation_clip__AttributeData& attributeData ) + { + mAnimationClip = FW_NEW COLLADAFW::AnimationClip(createUniqueIdFromId(attributeData.id, COLLADAFW::AnimationClip::ID())); + + if ( attributeData.name ) + mAnimationClip->setName ( (const char*)attributeData.name ); + else if ( attributeData.id ) + mAnimationClip->setName ( (const char*)attributeData.id ); + + if ( attributeData.id ) + mAnimationClip->setOriginalId ( (const char*)attributeData.id ); + + return true; + } + + //------------------------------ + bool LibraryAnimationClipsLoader::end__animation_clip() + { + COLLADAFW::UniqueIdArray& instanceAnimationUniqueIds = mAnimationClip->getInstanceAnimationUniqueIds(); + instanceAnimationUniqueIds.allocMemory( mInstanceAnimationIds.size() ); + instanceAnimationUniqueIds.setCount( mInstanceAnimationIds.size() ); + + UniqueIdSet::const_iterator it = mInstanceAnimationIds.begin(); + size_t i = 0; + for ( ; it != mInstanceAnimationIds.end(); ++it, ++i ) + { + instanceAnimationUniqueIds[i] = *it; + } + + mInstanceAnimationIds.clear(); + + bool success = true; + if ( (getObjectFlags() & Loader::ANIMATION_CLIP_FLAG) != 0) + { + success = writer()->writeAnimationClip(mAnimationClip); + } + + FW_DELETE mAnimationClip; + mAnimationClip = 0; + return success; + } + + //------------------------------ + bool LibraryAnimationClipsLoader::begin__instance_animation( const instance_animation__AttributeData& attributeData ) + { + mInstanceAnimationIds.insert(createUniqueIdFromUrl(attributeData.url, COLLADAFW::Animation::ID())); + return true; + } + + //------------------------------ + bool LibraryAnimationClipsLoader::end__instance_animation() + { + return true; + } +} // namespace COLLADASaxFWL \ No newline at end of file diff --git a/COLLADASaxFrameworkLoader/src/COLLADASaxFWLRootParser14.cpp b/COLLADASaxFrameworkLoader/src/COLLADASaxFWLRootParser14.cpp index f6137b3d18ac6698218622b8796e2bd6be7ed9dd..99b21dd9ae17b3ee6601c3954831ea31e6946294 100644 --- a/COLLADASaxFrameworkLoader/src/COLLADASaxFWLRootParser14.cpp +++ b/COLLADASaxFrameworkLoader/src/COLLADASaxFWLRootParser14.cpp @@ -22,6 +22,7 @@ #include "COLLADASaxFWLLibraryImagesLoader14.h" #include "COLLADASaxFWLLibraryCamerasLoader14.h" #include "COLLADASaxFWLLibraryLightsLoader14.h" +#include "COLLADASaxFWLLibraryAnimationClipsLoader14.h" #include "COLLADASaxFWLLibraryAnimationsLoader14.h" #include "COLLADASaxFWLLibraryControllersLoader14.h" #include "COLLADASaxFWLMeshLoader14.h" @@ -159,6 +160,14 @@ namespace COLLADASaxFWL return true; } + //----------------------------- + bool RootParser14::begin__library_animation_clips( const COLLADASaxFWL14::library_animation_clips__AttributeData& attributeData ) + { + SaxVirtualFunctionTest14(begin__library_animation_clips(attributeData)); + beginCommonWithId<LibraryAnimationClipsLoader, LibraryAnimationClipsLoader14>(attributeData.id); + return true; + } + //----------------------------- bool RootParser14::begin__library_animations( const COLLADASaxFWL14::library_animations__AttributeData& attributeData ) { diff --git a/COLLADASaxFrameworkLoader/src/COLLADASaxFWLRootParser15.cpp b/COLLADASaxFrameworkLoader/src/COLLADASaxFWLRootParser15.cpp index 3180beb271023c671620f0e1da034a42175f360a..a188b0db4c978a6e5ac1fa24fdd8fe45fdaed725 100644 --- a/COLLADASaxFrameworkLoader/src/COLLADASaxFWLRootParser15.cpp +++ b/COLLADASaxFrameworkLoader/src/COLLADASaxFWLRootParser15.cpp @@ -22,6 +22,7 @@ #include "COLLADASaxFWLLibraryCamerasLoader15.h" #include "COLLADASaxFWLLibraryLightsLoader15.h" #include "COLLADASaxFWLLibraryImagesLoader15.h" +#include "COLLADASaxFWLLibraryAnimationClipsLoader15.h" #include "COLLADASaxFWLLibraryAnimationsLoader15.h" #include "COLLADASaxFWLLibraryControllersLoader15.h" #include "COLLADASaxFWLMeshLoader15.h" @@ -165,6 +166,14 @@ namespace COLLADASaxFWL return true; } + //----------------------------- + bool RootParser15::begin__library_animation_clips( const COLLADASaxFWL15::library_animation_clips__AttributeData& attributeData ) + { + SaxVirtualFunctionTest15(begin__library_animation_clips(attributeData)); + beginCommonWithId<LibraryAnimationClipsLoader, LibraryAnimationClipsLoader15>(attributeData.id); + return true; + } + //----------------------------- bool RootParser15::begin__library_animations( const COLLADASaxFWL15::library_animations__AttributeData& attributeData ) { diff --git a/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryAnimationClipsLoader14.cpp b/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryAnimationClipsLoader14.cpp new file mode 100644 index 0000000000000000000000000000000000000000..774d70b60d56ecfbaf876930eb31214d6ec96f9e --- /dev/null +++ b/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryAnimationClipsLoader14.cpp @@ -0,0 +1,54 @@ +#include "COLLADASaxFWLStableHeaders.h" +#include "COLLADASaxFWLLibraryAnimationClipsLoader14.h" + + +namespace COLLADASaxFWL +{ + + +bool LibraryAnimationClipsLoader14::end__library_animation_clips() +{ +SaxVirtualFunctionTest14(end__library_animation_clips()); +return mLoader->end__library_animation_clips(); +} + + +bool LibraryAnimationClipsLoader14::begin__animation_clip( const COLLADASaxFWL14::animation_clip__AttributeData& attributeData ) +{ +SaxVirtualFunctionTest14(begin__animation_clip(attributeData)); +COLLADASaxFWL::animation_clip__AttributeData attrData; +attrData.id = attributeData.id; +attrData.name = attributeData.name; +return mLoader->begin__animation_clip(attrData); +} + + +bool LibraryAnimationClipsLoader14::end__animation_clip() +{ +SaxVirtualFunctionTest14(end__animation_clip()); +return mLoader->end__animation_clip(); +} + + +bool LibraryAnimationClipsLoader14::begin__instance_animation( const COLLADASaxFWL14::instance_animation__AttributeData& attributeData ) +{ +SaxVirtualFunctionTest14(begin__instance_animation(attributeData)); +COLLADASaxFWL::instance_animation__AttributeData attrData; +attrData.sid = attributeData.sid; +attrData.name = attributeData.name; +if ( (attributeData.present_attributes & COLLADASaxFWL14::instance_animation__AttributeData::ATTRIBUTE_URL_PRESENT) == COLLADASaxFWL14::instance_animation__AttributeData::ATTRIBUTE_URL_PRESENT ) { + attrData.url = attributeData.url; + attrData.present_attributes |= COLLADASaxFWL::instance_animation__AttributeData::ATTRIBUTE_URL_PRESENT; +} +return mLoader->begin__instance_animation(attrData); +} + + +bool LibraryAnimationClipsLoader14::end__instance_animation() { +SaxVirtualFunctionTest14(end__instance_animation()); +return mLoader->end__instance_animation(); +} + + + +} diff --git a/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryAnimationClipsLoader15.cpp b/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryAnimationClipsLoader15.cpp new file mode 100644 index 0000000000000000000000000000000000000000..3f36b4bd991b85a7eafcd787efde2fee683ad8cd --- /dev/null +++ b/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryAnimationClipsLoader15.cpp @@ -0,0 +1,54 @@ +#include "COLLADASaxFWLStableHeaders.h" +#include "COLLADASaxFWLLibraryAnimationClipsLoader15.h" + + +namespace COLLADASaxFWL +{ + + +bool LibraryAnimationClipsLoader15::end__library_animation_clips() +{ +SaxVirtualFunctionTest15(end__library_animation_clips()); +return mLoader->end__library_animation_clips(); +} + + +bool LibraryAnimationClipsLoader15::begin__animation_clip( const COLLADASaxFWL15::animation_clip__AttributeData& attributeData ) +{ +SaxVirtualFunctionTest15(begin__animation_clip(attributeData)); +COLLADASaxFWL::animation_clip__AttributeData attrData; +attrData.id = attributeData.id; +attrData.name = attributeData.name; +return mLoader->begin__animation_clip(attrData); +} + + +bool LibraryAnimationClipsLoader15::end__animation_clip() +{ +SaxVirtualFunctionTest15(end__animation_clip()); +return mLoader->end__animation_clip(); +} + + +bool LibraryAnimationClipsLoader15::begin__instance_animation( const COLLADASaxFWL15::instance_animation__AttributeData& attributeData ) +{ +SaxVirtualFunctionTest15(begin__instance_animation(attributeData)); +COLLADASaxFWL::instance_animation__AttributeData attrData; +attrData.sid = attributeData.sid; +attrData.name = attributeData.name; +if ( (attributeData.present_attributes & COLLADASaxFWL15::instance_animation__AttributeData::ATTRIBUTE_URL_PRESENT) == COLLADASaxFWL15::instance_animation__AttributeData::ATTRIBUTE_URL_PRESENT ) { + attrData.url = attributeData.url; + attrData.present_attributes |= COLLADASaxFWL::instance_animation__AttributeData::ATTRIBUTE_URL_PRESENT; +} +return mLoader->begin__instance_animation(attrData); +} + + +bool LibraryAnimationClipsLoader15::end__instance_animation() { +SaxVirtualFunctionTest15(end__instance_animation()); +return mLoader->end__instance_animation(); +} + + + +} diff --git a/COLLADAValidator/include/Writer.h b/COLLADAValidator/include/Writer.h index 83994433eda2fdf5a86ef1e16cf6f122c0e0b2f4..caf7dcc9214019514235e080a4d4ce0f9ae3222b 100644 --- a/COLLADAValidator/include/Writer.h +++ b/COLLADAValidator/include/Writer.h @@ -117,6 +117,13 @@ public: return true; } + /** When this method is called, the writer must write the AnimationClip. + @return The writer should return true, of writing succeeded, false otherwise.*/ + virtual bool writeAnimationClip( const COLLADAFW::AnimationClip* animationClip ) + { + return true; + } + /** When this method is called, the writer must write the skin controller data. @return The writer should return true, if writing succeeded, false otherwise.*/ virtual bool writeSkinControllerData( const COLLADAFW::SkinControllerData* skinControllerData ) diff --git a/dae23ds/include/DAE23dsWriter.h b/dae23ds/include/DAE23dsWriter.h index 3ba43ff9c377b724d605c5043fbbfa8ac40ae308..53fee26967f04e62a073d38e5663bd80940cfa63 100644 --- a/dae23ds/include/DAE23dsWriter.h +++ b/dae23ds/include/DAE23dsWriter.h @@ -328,6 +328,10 @@ namespace DAE23ds @return True on succeeded, false otherwise.*/ virtual bool writeAnimationList( const COLLADAFW::AnimationList* animationList ); + /** Writes the animation clip. + @return True on succeeded, flase otherwise.*/ + virtual bool writeAnimationClip( const COLLADAFW::AnimationClip* animationClip ) { return true; } + /** When this method is called, the writer must write the skin controller data. @return The writer should return true, if writing succeeded, false otherwise.*/ virtual bool writeSkinControllerData( const COLLADAFW::SkinControllerData* skinControllerData ){ return true;} diff --git a/dae2ma/include/DAE2MADocumentImporter.h b/dae2ma/include/DAE2MADocumentImporter.h index 4144850c239f440113d7c06a539f6eb703546308..4386ccbdb54678316a9d59a03481f9672b3983d8 100644 --- a/dae2ma/include/DAE2MADocumentImporter.h +++ b/dae2ma/include/DAE2MADocumentImporter.h @@ -408,6 +408,10 @@ namespace DAE2MA @return The writer should return true, if writing succeeded, false otherwise.*/ virtual bool writeAnimationList( const COLLADAFW::AnimationList* animationList ); + /** When this method is called, the writer must write the AnimationClip. + @return The writer should return true, of writing succeeded, false otherwise.*/ + virtual bool writeAnimationClip( const COLLADAFW::AnimationClip* animationClip ) { return true; } + /** When this method is called, the writer must write the skin controller data. @return The writer should return true, if writing succeeded, false otherwise.*/ virtual bool writeSkinControllerData( const COLLADAFW::SkinControllerData* skinControllerData ); diff --git a/dae2ogre/include/DAE2OgreOgreWriter.h b/dae2ogre/include/DAE2OgreOgreWriter.h index 95e598b63c5278064916c7f58d155e2db9ba6aec..de7f57d5a3ba3c6fd084ac3ff99df96ccba3b508 100644 --- a/dae2ogre/include/DAE2OgreOgreWriter.h +++ b/dae2ogre/include/DAE2OgreOgreWriter.h @@ -155,6 +155,10 @@ namespace DAE2Ogre @return True on succeeded, false otherwise.*/ virtual bool writeAnimationList( const COLLADAFW::AnimationList* animationList ); + /** Writes the animation clip. + @return True on succeeded, flase otherwise.*/ + virtual bool writeAnimationClip( const COLLADAFW::AnimationClip* animationClip ) { return true; } + /** Writes the skin controller data. @return True on succeeded, false otherwise.*/ virtual bool writeSkinControllerData( const COLLADAFW::SkinControllerData* skinControllerData );