Add support for opencollada >= 1.6.65 #58568

New Issue

Shane Ambler · 2018-12-03T00:57:46+01:00

Shane Ambler commented

2018-12-03 00:57:46 +01:00

The 1.6.65 release (12 Oct) of opencollada includes a new method writeAnimationClip. As this is a pure virtual method, Blender fails to build with recent opencollada libs.

While the following patch fixes the build, a TODO should be made to implement the import and export of relevant data.

diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h
index 17e61326032..1c204f3e799 100644
--- a/source/blender/collada/DocumentImporter.h
+++ b/source/blender/collada/DocumentImporter.h
@@ -107,6 +107,8 @@ public:
        bool writeAnimation(const COLLADAFW::Animation*);
 
        bool writeAnimationList(const COLLADAFW::AnimationList*);
+       
+       bool writeAnimationClip(const COLLADAFW::AnimationClip*);
 
        bool writeGeometry(const COLLADAFW::Geometry*);
 
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 67fd9d648c7..d68b5ceaf80 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -1349,6 +1349,13 @@ bool DocumentImporter::writeAnimationList(const COLLADAFW::AnimationList *animat
        return anim_importer.write_animation_list(animationList);
 }
 
+/** When this method is called, the writer must write the AnimationClip.
+ * /return The writer should return true, if writing succeeded, false otherwise.*/
+bool DocumentImporter::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.*/
 bool DocumentImporter::writeSkinControllerData(const COLLADAFW::SkinControllerData *skin)

The 1.6.65 release (12 Oct) of opencollada includes a new method `writeAnimationClip`. As this is a pure virtual method, Blender fails to build with recent opencollada libs. While the following patch fixes the build, a TODO should be made to implement the import and export of relevant data. ``` diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h index 17e61326032..1c204f3e799 100644 --- a/source/blender/collada/DocumentImporter.h +++ b/source/blender/collada/DocumentImporter.h @@ -107,6 +107,8 @@ public: bool writeAnimation(const COLLADAFW::Animation*); bool writeAnimationList(const COLLADAFW::AnimationList*); + + bool writeAnimationClip(const COLLADAFW::AnimationClip*); bool writeGeometry(const COLLADAFW::Geometry*); diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 67fd9d648c7..d68b5ceaf80 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -1349,6 +1349,13 @@ bool DocumentImporter::writeAnimationList(const COLLADAFW::AnimationList *animat return anim_importer.write_animation_list(animationList); } +/** When this method is called, the writer must write the AnimationClip. + * /return The writer should return true, if writing succeeded, false otherwise.*/ +bool DocumentImporter::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.*/ bool DocumentImporter::writeSkinControllerData(const COLLADAFW::SkinControllerData *skin) ```

Shane Ambler commented

2018-12-03 00:57:46 +01:00

Added subscriber: @sambler

Gaia Clary was assigned by Brecht Van Lommel

2018-12-03 01:01:57 +01:00

Gaia Clary commented

2018-12-03 11:26:19 +01:00

Hi, Shane

The support for action clips has already been prepared in the Blender Collada module since march 2018, but discarded because actually i was waiting for https://github.com/KhronosGroup/OpenCOLLADA/issues/565

You can expect to see this becoming live in Blender 2.8. I will prepare a request for updating the Collada libraries in the next days.

cheers,
Gaia

Hi, Shane The support for action clips has already been prepared in the Blender Collada module since march 2018, but discarded because actually i was waiting for https://github.com/KhronosGroup/OpenCOLLADA/issues/565 You can expect to see this becoming live in Blender 2.8. I will prepare a request for updating the Collada libraries in the next days. cheers, Gaia

Brecht Van Lommel commented

2018-12-03 11:29:48 +01:00

Added subscriber: @brecht

Brecht Van Lommel commented

2018-12-03 11:29:48 +01:00

If this patch is required to build with new opencollada libraries, it should be committed to master & blender2.8 before the libraries are upgraded.

Gaia Clary commented

2018-12-03 13:45:54 +01:00

I could not find an easy way to get the library version number. So i asked in the opencollada project:

https://github.com/KhronosGroup/OpenCOLLADA/issues/604

waiting for response.

I could not find an easy way to get the library version number. So i asked in the opencollada project: https://github.com/KhronosGroup/OpenCOLLADA/issues/604 waiting for response.

Brecht Van Lommel commented

2018-12-03 14:11:16 +01:00

In the worst case we can check for the existence of a COLLADAFWAnimationClip.h file in CMake, but would be nice if OpenCollada had version defines.

In the worst case we can check for the existence of a `COLLADAFWAnimationClip.h` file in CMake, but would be nice if OpenCollada had version defines.

blender-admin commented

2018-12-04 19:11:33 +01:00

This issue was referenced by 10c50d7dbf

This issue was referenced by 10c50d7dbf7578b35b3bf19a1948f556f9eb203b

Gaia Clary commented

2018-12-04 19:12:33 +01:00

Changed status from 'Open' to: 'Resolved'

Gaia Clary closed this issue

2018-12-04 19:12:33 +01:00

Gaia Clary commented

2018-12-04 20:03:42 +01:00

Hi, @sambler

While adding the fix, i found that the related definition files are available only since Collada 1.6.68 So this fix will only work for Collada 1.6.68 or newer.

If the problem also appears on the versions 1.6.65/66/67 then i am not sure how to fix that.

Hi, @sambler While adding the fix, i found that the related definition files are available only since Collada 1.6.68 So this fix will only work for Collada 1.6.68 or newer. If the problem also appears on the versions 1.6.65/66/67 then i am not sure how to fix that.

blender-admin commented

2018-12-04 20:28:20 +01:00

This issue was referenced by 22bba02bc8

This issue was referenced by 22bba02bc8109f392fce50a24a4825390bca1bda

Shane Ambler commented

2018-12-05 09:21:02 +01:00

@GaiaClary Seeing that the collada releases from 1.6.64 to 1.6.68 were all tagged in less than two months I would just make 1.6.68 the required version. If anyone is updating from 1.6.63 there is really no reason to build any version before 1.6.68.

Sign in to join this conversation.

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Add support for opencollada >= 1.6.65 #58568