2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2010-10-05 00:05:14 +00:00
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
|
* \ingroup collada
|
2011-02-27 20:30:35 +00:00
|
|
|
*/
|
|
|
|
|
|
2011-03-23 09:18:09 +00:00
|
|
|
#include <stddef.h>
|
2011-02-27 20:30:35 +00:00
|
|
|
|
2011-02-12 06:25:04 +00:00
|
|
|
/* COLLADABU_ASSERT, may be able to remove later */
|
|
|
|
|
#include "COLLADABUPlatform.h"
|
|
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
#include "DNA_armature_types.h"
|
|
|
|
|
|
|
|
|
|
#include "ED_keyframing.h"
|
|
|
|
|
|
|
|
|
|
#include "BLI_listbase.h"
|
|
|
|
|
#include "BLI_math.h"
|
|
|
|
|
#include "BLI_string.h"
|
2017-01-16 17:33:34 +01:00
|
|
|
#include "BLI_string_utils.h"
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2015-08-16 17:32:01 +10:00
|
|
|
#include "BLT_translation.h"
|
2013-03-25 08:29:06 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
#include "BKE_action.h"
|
|
|
|
|
#include "BKE_armature.h"
|
|
|
|
|
#include "BKE_fcurve.h"
|
|
|
|
|
#include "BKE_object.h"
|
|
|
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
|
|
#include "collada_utils.h"
|
|
|
|
|
#include "AnimationImporter.h"
|
|
|
|
|
#include "ArmatureImporter.h"
|
2011-07-21 18:31:01 +00:00
|
|
|
#include "MaterialExporter.h"
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
#include <algorithm>
|
|
|
|
|
|
2011-06-20 12:43:10 +00:00
|
|
|
// first try node name, if not available (since is optional), fall back to original id
|
2010-10-05 00:05:14 +00:00
|
|
|
template<class T>
|
|
|
|
|
static const char *bc_get_joint_name(T *node)
|
|
|
|
|
{
|
2011-06-20 12:43:10 +00:00
|
|
|
const std::string& id = node->getName();
|
|
|
|
|
return id.size() ? id.c_str() : node->getOriginalId().c_str();
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
FCurve *AnimationImporter::create_fcurve(int array_index, const char *rna_path)
|
|
|
|
|
{
|
2012-06-12 22:05:33 +00:00
|
|
|
FCurve *fcu = (FCurve *)MEM_callocN(sizeof(FCurve), "FCurve");
|
|
|
|
|
fcu->flag = (FCURVE_VISIBLE | FCURVE_AUTO_HANDLES | FCURVE_SELECTED);
|
2010-10-05 00:05:14 +00:00
|
|
|
fcu->rna_path = BLI_strdupn(rna_path, strlen(rna_path));
|
|
|
|
|
fcu->array_index = array_index;
|
|
|
|
|
return fcu;
|
|
|
|
|
}
|
2018-03-11 12:44:02 +01:00
|
|
|
|
|
|
|
|
void AnimationImporter::add_bezt(FCurve *fcu, float frame, float value, eBezTriple_Interpolation ipo)
|
2010-10-05 00:05:14 +00:00
|
|
|
{
|
2018-03-11 12:44:02 +01:00
|
|
|
//float fps = (float)FPS;
|
2010-10-05 00:05:14 +00:00
|
|
|
BezTriple bez;
|
|
|
|
|
memset(&bez, 0, sizeof(BezTriple));
|
|
|
|
|
bez.vec[1][0] = frame;
|
2018-03-11 12:44:02 +01:00
|
|
|
bez.vec[1][1] = value;
|
|
|
|
|
bez.ipo = ipo; /* use default interpolation mode here... */
|
2010-10-05 00:05:14 +00:00
|
|
|
bez.f1 = bez.f2 = bez.f3 = SELECT;
|
|
|
|
|
bez.h1 = bez.h2 = HD_AUTO;
|
2018-04-18 18:21:27 +02:00
|
|
|
insert_bezt_fcurve(fcu, &bez, INSERTKEY_NOFLAGS);
|
2010-10-05 00:05:14 +00:00
|
|
|
calchandles_fcurve(fcu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// create one or several fcurves depending on the number of parameters being animated
|
|
|
|
|
void AnimationImporter::animation_to_fcurves(COLLADAFW::AnimationCurve *curve)
|
|
|
|
|
{
|
|
|
|
|
COLLADAFW::FloatOrDoubleArray& input = curve->getInputValues();
|
|
|
|
|
COLLADAFW::FloatOrDoubleArray& output = curve->getOutputValues();
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
float fps = (float)FPS;
|
|
|
|
|
size_t dim = curve->getOutDimension();
|
|
|
|
|
unsigned int i;
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *>& fcurves = curve_map[curve->getUniqueId()];
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
switch (dim) {
|
2012-06-12 22:05:33 +00:00
|
|
|
case 1: // X, Y, Z or angle
|
|
|
|
|
case 3: // XYZ
|
|
|
|
|
case 4:
|
|
|
|
|
case 16: // matrix
|
2010-10-05 00:05:14 +00:00
|
|
|
{
|
2012-06-12 22:05:33 +00:00
|
|
|
for (i = 0; i < dim; i++) {
|
|
|
|
|
FCurve *fcu = (FCurve *)MEM_callocN(sizeof(FCurve), "FCurve");
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
fcu->flag = (FCURVE_VISIBLE | FCURVE_AUTO_HANDLES | FCURVE_SELECTED);
|
2010-10-05 00:05:14 +00:00
|
|
|
fcu->array_index = 0;
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
fcu->auto_smoothing = FCURVE_SMOOTH_CONT_ACCEL;
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
for (unsigned int j = 0; j < curve->getKeyCount(); j++) {
|
|
|
|
|
BezTriple bez;
|
|
|
|
|
memset(&bez, 0, sizeof(BezTriple));
|
|
|
|
|
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
// input, output
|
2018-06-08 08:07:48 +02:00
|
|
|
bez.vec[1][0] = bc_get_float_value(input, j) * fps;
|
2010-10-05 00:05:14 +00:00
|
|
|
bez.vec[1][1] = bc_get_float_value(output, j * dim + i);
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
bez.h1 = bez.h2 = HD_AUTO;
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
if (curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER ||
|
|
|
|
|
curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_STEP)
|
2011-06-14 20:42:01 +00:00
|
|
|
{
|
|
|
|
|
COLLADAFW::FloatOrDoubleArray& intan = curve->getInTangentValues();
|
2011-09-04 00:15:59 +00:00
|
|
|
COLLADAFW::FloatOrDoubleArray& outtan = curve->getOutTangentValues();
|
2011-06-14 20:42:01 +00:00
|
|
|
|
|
|
|
|
// intangent
|
2012-06-12 22:05:33 +00:00
|
|
|
bez.vec[0][0] = bc_get_float_value(intan, (j * 2 * dim) + (2 * i)) * fps;
|
|
|
|
|
bez.vec[0][1] = bc_get_float_value(intan, (j * 2 * dim) + (2 * i) + 1);
|
2011-06-14 20:42:01 +00:00
|
|
|
|
2011-09-04 00:15:59 +00:00
|
|
|
// outtangent
|
2012-06-12 22:05:33 +00:00
|
|
|
bez.vec[2][0] = bc_get_float_value(outtan, (j * 2 * dim) + (2 * i)) * fps;
|
|
|
|
|
bez.vec[2][1] = bc_get_float_value(outtan, (j * 2 * dim) + (2 * i) + 1);
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
if (curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER) {
|
2011-08-14 16:14:32 +00:00
|
|
|
bez.ipo = BEZT_IPO_BEZ;
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
bez.h1 = bez.h2 = HD_AUTO_ANIM;
|
|
|
|
|
}
|
|
|
|
|
else {
|
2011-09-04 00:15:59 +00:00
|
|
|
bez.ipo = BEZT_IPO_CONST;
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
}
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
2012-04-28 06:31:57 +00:00
|
|
|
else {
|
2011-06-14 20:42:01 +00:00
|
|
|
bez.ipo = BEZT_IPO_LIN;
|
|
|
|
|
}
|
|
|
|
|
// bez.ipo = U.ipo_new; /* use default interpolation mode here... */
|
2010-10-05 00:05:14 +00:00
|
|
|
bez.f1 = bez.f2 = bez.f3 = SELECT;
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2018-04-18 18:21:27 +02:00
|
|
|
insert_bezt_fcurve(fcu, &bez, INSERTKEY_NOFLAGS);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
calchandles_fcurve(fcu);
|
|
|
|
|
|
|
|
|
|
fcurves.push_back(fcu);
|
2015-09-11 18:41:35 +10:00
|
|
|
unused_curves.push_back(fcu);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
2012-06-12 22:05:33 +00:00
|
|
|
default:
|
|
|
|
|
fprintf(stderr, "Output dimension of %d is not yet supported (animation id = %s)\n", (int)dim, curve->getOriginalId().c_str());
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
void AnimationImporter::fcurve_deg_to_rad(FCurve *cu)
|
|
|
|
|
{
|
|
|
|
|
for (unsigned int i = 0; i < cu->totvert; i++) {
|
|
|
|
|
// TODO convert handles too
|
2011-09-17 09:43:51 +00:00
|
|
|
cu->bezt[i].vec[1][1] *= DEG2RADF(1.0f);
|
|
|
|
|
cu->bezt[i].vec[0][1] *= DEG2RADF(1.0f);
|
|
|
|
|
cu->bezt[i].vec[2][1] *= DEG2RADF(1.0f);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-09-11 18:41:35 +10:00
|
|
|
void AnimationImporter::fcurve_is_used(FCurve *fcu)
|
|
|
|
|
{
|
|
|
|
|
unused_curves.erase(std::remove(unused_curves.begin(), unused_curves.end(), fcu), unused_curves.end());
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-17 18:29:01 +00:00
|
|
|
|
2018-06-07 12:47:00 +02:00
|
|
|
void AnimationImporter::add_fcurves_to_object(Main *bmain, Object *ob, std::vector<FCurve *>& curves, char *rna_path, int array_index, Animation *animated)
|
2010-10-05 00:05:14 +00:00
|
|
|
{
|
|
|
|
|
bAction *act;
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2018-06-07 12:47:00 +02:00
|
|
|
if (!ob->adt || !ob->adt->action) act = verify_adt_action(bmain, (ID *)&ob->id, 1);
|
2010-10-05 00:05:14 +00:00
|
|
|
else act = ob->adt->action;
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *>::iterator it;
|
2010-10-05 00:05:14 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
char *p = strstr(rna_path, "rotation_euler");
|
|
|
|
|
bool is_rotation = p && *(p + strlen("rotation_euler")) == '\0';
|
|
|
|
|
|
|
|
|
|
// convert degrees to radians for rotation
|
|
|
|
|
if (is_rotation)
|
|
|
|
|
fcurve_deg_to_rad(fcu);
|
|
|
|
|
#endif
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
for (it = curves.begin(), i = 0; it != curves.end(); it++, i++) {
|
|
|
|
|
FCurve *fcu = *it;
|
|
|
|
|
fcu->rna_path = BLI_strdupn(rna_path, strlen(rna_path));
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
if (array_index == -1) fcu->array_index = i;
|
|
|
|
|
else fcu->array_index = array_index;
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
if (ob->type == OB_ARMATURE) {
|
|
|
|
|
bActionGroup *grp = NULL;
|
|
|
|
|
const char *bone_name = bc_get_joint_name(animated->node);
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
if (bone_name) {
|
|
|
|
|
/* try to find group */
|
2012-05-05 16:03:57 +00:00
|
|
|
grp = BKE_action_group_find_name(act, bone_name);
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
/* no matching groups, so add one */
|
|
|
|
|
if (grp == NULL) {
|
|
|
|
|
/* Add a new group, and make it active */
|
2012-06-12 22:05:33 +00:00
|
|
|
grp = (bActionGroup *)MEM_callocN(sizeof(bActionGroup), "bActionGroup");
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
grp->flag = AGRP_SELECTED;
|
|
|
|
|
BLI_strncpy(grp->name, bone_name, sizeof(grp->name));
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
BLI_addtail(&act->groups, grp);
|
2015-08-16 17:32:01 +10:00
|
|
|
BLI_uniquename(&act->groups, grp, CTX_DATA_(BLT_I18NCONTEXT_ID_ACTION, "Group"), '.',
|
2013-03-25 08:29:06 +00:00
|
|
|
offsetof(bActionGroup, name), 64);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
/* add F-Curve to group */
|
|
|
|
|
action_groups_add_channel(act, grp, fcu);
|
2015-09-11 18:41:35 +10:00
|
|
|
fcurve_is_used(fcu);
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
#if 0
|
|
|
|
|
if (is_rotation) {
|
|
|
|
|
fcurves_actionGroup_map[grp].push_back(fcu);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
BLI_addtail(&act->curves, fcu);
|
2015-09-11 18:41:35 +10:00
|
|
|
fcurve_is_used(fcu);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AnimationImporter::~AnimationImporter()
|
|
|
|
|
{
|
|
|
|
|
// free unused FCurves
|
2012-06-12 22:05:33 +00:00
|
|
|
for (std::vector<FCurve *>::iterator it = unused_curves.begin(); it != unused_curves.end(); it++)
|
2010-10-05 00:05:14 +00:00
|
|
|
free_fcurve(*it);
|
|
|
|
|
|
|
|
|
|
if (unused_curves.size())
|
2010-11-03 22:44:39 +00:00
|
|
|
fprintf(stderr, "removed %d unused curves\n", (int)unused_curves.size());
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
bool AnimationImporter::write_animation(const COLLADAFW::Animation *anim)
|
2010-10-05 00:05:14 +00:00
|
|
|
{
|
|
|
|
|
if (anim->getAnimationType() == COLLADAFW::Animation::ANIMATION_CURVE) {
|
2012-06-12 22:05:33 +00:00
|
|
|
COLLADAFW::AnimationCurve *curve = (COLLADAFW::AnimationCurve *)anim;
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
// XXX Don't know if it's necessary
|
|
|
|
|
// Should we check outPhysicalDimension?
|
|
|
|
|
if (curve->getInPhysicalDimension() != COLLADAFW::PHYSICAL_DIMENSION_TIME) {
|
2012-03-31 00:59:17 +00:00
|
|
|
fprintf(stderr, "Inputs physical dimension is not time.\n");
|
2010-10-05 00:05:14 +00:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// a curve can have mixed interpolation type,
|
|
|
|
|
// in this case curve->getInterpolationTypes returns a list of interpolation types per key
|
|
|
|
|
COLLADAFW::AnimationCurve::InterpolationType interp = curve->getInterpolationType();
|
|
|
|
|
|
|
|
|
|
if (interp != COLLADAFW::AnimationCurve::INTERPOLATION_MIXED) {
|
|
|
|
|
switch (interp) {
|
2012-06-12 22:05:33 +00:00
|
|
|
case COLLADAFW::AnimationCurve::INTERPOLATION_LINEAR:
|
|
|
|
|
case COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER:
|
|
|
|
|
case COLLADAFW::AnimationCurve::INTERPOLATION_STEP:
|
|
|
|
|
animation_to_fcurves(curve);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
// TODO there're also CARDINAL, HERMITE, BSPLINE and STEP types
|
|
|
|
|
fprintf(stderr, "CARDINAL, HERMITE and BSPLINE anim interpolation types not supported yet.\n");
|
|
|
|
|
break;
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
// not supported yet
|
|
|
|
|
fprintf(stderr, "MIXED anim interpolation type is not supported yet.\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
fprintf(stderr, "FORMULA animation type is not supported yet.\n");
|
|
|
|
|
}
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
return true;
|
|
|
|
|
}
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
// called on post-process stage after writeVisualScenes
|
2012-06-12 22:05:33 +00:00
|
|
|
bool AnimationImporter::write_animation_list(const COLLADAFW::AnimationList *animlist)
|
2010-10-05 00:05:14 +00:00
|
|
|
{
|
|
|
|
|
const COLLADAFW::UniqueId& animlist_id = animlist->getUniqueId();
|
|
|
|
|
animlist_map[animlist_id] = animlist;
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
#if 0
|
2011-06-14 20:42:01 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
// should not happen
|
|
|
|
|
if (uid_animated_map.find(animlist_id) == uid_animated_map.end()) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// for bones rna_path is like: pose.bones["bone-name"].rotation
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
#endif
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2011-03-09 14:16:21 +00:00
|
|
|
// \todo refactor read_node_transform to not automatically apply anything,
|
|
|
|
|
// but rather return the transform matrix, so caller can do with it what is
|
|
|
|
|
// necessary. Same for \ref get_node_mat
|
2010-10-05 00:05:14 +00:00
|
|
|
void AnimationImporter::read_node_transform(COLLADAFW::Node *node, Object *ob)
|
|
|
|
|
{
|
|
|
|
|
float mat[4][4];
|
|
|
|
|
TransformReader::get_node_mat(mat, node, &uid_animated_map, ob);
|
|
|
|
|
if (ob) {
|
|
|
|
|
copy_m4_m4(ob->obmat, mat);
|
2012-05-05 14:03:12 +00:00
|
|
|
BKE_object_apply_mat4(ob, ob->obmat, 0, 0);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
virtual void AnimationImporter::change_eul_to_quat(Object *ob, bAction *act)
|
|
|
|
|
{
|
|
|
|
|
bActionGroup *grp;
|
|
|
|
|
int i;
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
for (grp = (bActionGroup *)act->groups.first; grp; grp = grp->next) {
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
FCurve *eulcu[3] = {NULL, NULL, NULL};
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
if (fcurves_actionGroup_map.find(grp) == fcurves_actionGroup_map.end())
|
|
|
|
|
continue;
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *> &rot_fcurves = fcurves_actionGroup_map[grp];
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
if (rot_fcurves.size() > 3) continue;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < rot_fcurves.size(); i++)
|
|
|
|
|
eulcu[rot_fcurves[i]->array_index] = rot_fcurves[i];
|
|
|
|
|
|
|
|
|
|
char joint_path[100];
|
|
|
|
|
char rna_path[100];
|
|
|
|
|
|
|
|
|
|
BLI_snprintf(joint_path, sizeof(joint_path), "pose.bones[\"%s\"]", grp->name);
|
|
|
|
|
BLI_snprintf(rna_path, sizeof(rna_path), "%s.rotation_quaternion", joint_path);
|
|
|
|
|
|
|
|
|
|
FCurve *quatcu[4] = {
|
|
|
|
|
create_fcurve(0, rna_path),
|
|
|
|
|
create_fcurve(1, rna_path),
|
|
|
|
|
create_fcurve(2, rna_path),
|
|
|
|
|
create_fcurve(3, rna_path)
|
|
|
|
|
};
|
|
|
|
|
|
2012-05-05 16:03:57 +00:00
|
|
|
bPoseChannel *chan = BKE_pose_channel_find_name(ob->pose, grp->name);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
float m4[4][4], irest[3][3];
|
|
|
|
|
invert_m4_m4(m4, chan->bone->arm_mat);
|
|
|
|
|
copy_m3_m4(irest, m4);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 3; i++) {
|
|
|
|
|
|
|
|
|
|
FCurve *cu = eulcu[i];
|
|
|
|
|
|
|
|
|
|
if (!cu) continue;
|
|
|
|
|
|
|
|
|
|
for (int j = 0; j < cu->totvert; j++) {
|
|
|
|
|
float frame = cu->bezt[j].vec[1][0];
|
|
|
|
|
|
|
|
|
|
float eul[3] = {
|
|
|
|
|
eulcu[0] ? evaluate_fcurve(eulcu[0], frame) : 0.0f,
|
|
|
|
|
eulcu[1] ? evaluate_fcurve(eulcu[1], frame) : 0.0f,
|
|
|
|
|
eulcu[2] ? evaluate_fcurve(eulcu[2], frame) : 0.0f
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// make eul relative to bone rest pose
|
|
|
|
|
float rot[3][3], rel[3][3], quat[4];
|
|
|
|
|
|
|
|
|
|
/*eul_to_mat3(rot, eul);
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
mul_m3_m3m3(rel, irest, rot);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
mat3_to_quat(quat, rel);
|
|
|
|
|
*/
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
eul_to_quat(quat, eul);
|
|
|
|
|
|
|
|
|
|
for (int k = 0; k < 4; k++)
|
2018-03-11 12:44:02 +01:00
|
|
|
create_bezt(quatcu[k], frame, quat[k], U.ipo_new);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// now replace old Euler curves
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 3; i++) {
|
|
|
|
|
if (!eulcu[i]) continue;
|
|
|
|
|
|
|
|
|
|
action_groups_remove_channel(act, eulcu[i]);
|
|
|
|
|
free_fcurve(eulcu[i]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
chan->rotmode = ROT_MODE_QUAT;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
|
action_groups_add_channel(act, grp, quatcu[i]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bPoseChannel *pchan;
|
2012-06-12 22:05:33 +00:00
|
|
|
for (pchan = (bPoseChannel *)ob->pose->chanbase.first; pchan; pchan = pchan->next) {
|
2010-10-05 00:05:14 +00:00
|
|
|
pchan->rotmode = ROT_MODE_QUAT;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
|
|
|
|
|
//sets the rna_path and array index to curve
|
2012-06-12 22:05:33 +00:00
|
|
|
void AnimationImporter::modify_fcurve(std::vector<FCurve *> *curves, const char *rna_path, int array_index)
|
2011-09-04 00:15:59 +00:00
|
|
|
{
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *>::iterator it;
|
2011-06-14 20:42:01 +00:00
|
|
|
int i;
|
|
|
|
|
for (it = curves->begin(), i = 0; it != curves->end(); it++, i++) {
|
|
|
|
|
FCurve *fcu = *it;
|
2011-08-26 15:16:27 +00:00
|
|
|
fcu->rna_path = BLI_strdup(rna_path);
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
if (array_index == -1) fcu->array_index = i;
|
|
|
|
|
else fcu->array_index = array_index;
|
|
|
|
|
|
2015-09-11 18:41:35 +10:00
|
|
|
fcurve_is_used(fcu);
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
void AnimationImporter::unused_fcurve(std::vector<FCurve *> *curves)
|
2012-05-02 18:11:09 +00:00
|
|
|
{
|
|
|
|
|
// when an error happens and we can't actually use curve remove it from unused_curves
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *>::iterator it;
|
2012-05-02 18:11:09 +00:00
|
|
|
for (it = curves->begin(); it != curves->end(); it++) {
|
|
|
|
|
FCurve *fcu = *it;
|
2015-09-11 18:41:35 +10:00
|
|
|
fcurve_is_used(fcu);
|
2012-05-02 18:11:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
void AnimationImporter::find_frames(std::vector<float> *frames, std::vector<FCurve *> *curves)
|
2010-10-05 00:05:14 +00:00
|
|
|
{
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *>::iterator iter;
|
2011-09-04 00:15:59 +00:00
|
|
|
for (iter = curves->begin(); iter != curves->end(); iter++) {
|
|
|
|
|
FCurve *fcu = *iter;
|
|
|
|
|
|
|
|
|
|
for (unsigned int k = 0; k < fcu->totvert; k++) {
|
|
|
|
|
//get frame value from bezTriple
|
|
|
|
|
float fra = fcu->bezt[k].vec[1][0];
|
|
|
|
|
//if frame already not added add frame to frames
|
|
|
|
|
if (std::find(frames->begin(), frames->end(), fra) == frames->end())
|
|
|
|
|
frames->push_back(fra);
|
|
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
2011-09-04 00:15:59 +00:00
|
|
|
}
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//creates the rna_paths and array indices of fcurves from animations using transformation and bound animation class of each animation.
|
2012-06-12 22:05:33 +00:00
|
|
|
void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation *transform,
|
|
|
|
|
const COLLADAFW::AnimationList::AnimationBinding *binding,
|
|
|
|
|
std::vector<FCurve *> *curves, bool is_joint, char *joint_path)
|
2011-06-14 20:42:01 +00:00
|
|
|
{
|
|
|
|
|
COLLADAFW::Transformation::TransformationType tm_type = transform->getTransformationType();
|
2010-10-05 00:05:14 +00:00
|
|
|
bool is_matrix = tm_type == COLLADAFW::Transformation::MATRIX;
|
2012-06-23 23:22:19 +00:00
|
|
|
bool is_rotation = tm_type == COLLADAFW::Transformation::ROTATE;
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
//to check if the no of curves are valid
|
2012-06-23 23:22:19 +00:00
|
|
|
bool xyz = ((tm_type == COLLADAFW::Transformation::TRANSLATE || tm_type == COLLADAFW::Transformation::SCALE) && binding->animationClass == COLLADAFW::AnimationList::POSITION_XYZ);
|
2011-09-04 00:15:59 +00:00
|
|
|
|
|
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
if (!((!xyz && curves->size() == 1) || (xyz && curves->size() == 3) || is_matrix)) {
|
|
|
|
|
fprintf(stderr, "expected %d curves, got %d\n", xyz ? 3 : 1, (int)curves->size());
|
|
|
|
|
return;
|
|
|
|
|
}
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-07-03 17:26:02 +00:00
|
|
|
char rna_path[100];
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
switch (tm_type) {
|
|
|
|
|
case COLLADAFW::Transformation::TRANSLATE:
|
|
|
|
|
case COLLADAFW::Transformation::SCALE:
|
2012-06-12 22:05:33 +00:00
|
|
|
{
|
|
|
|
|
bool loc = tm_type == COLLADAFW::Transformation::TRANSLATE;
|
|
|
|
|
if (is_joint)
|
|
|
|
|
BLI_snprintf(rna_path, sizeof(rna_path), "%s.%s", joint_path, loc ? "location" : "scale");
|
|
|
|
|
else
|
|
|
|
|
BLI_strncpy(rna_path, loc ? "location" : "scale", sizeof(rna_path));
|
2011-06-14 20:42:01 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
switch (binding->animationClass) {
|
|
|
|
|
case COLLADAFW::AnimationList::POSITION_X:
|
|
|
|
|
modify_fcurve(curves, rna_path, 0);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::AnimationList::POSITION_Y:
|
|
|
|
|
modify_fcurve(curves, rna_path, 1);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::AnimationList::POSITION_Z:
|
|
|
|
|
modify_fcurve(curves, rna_path, 2);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::AnimationList::POSITION_XYZ:
|
|
|
|
|
modify_fcurve(curves, rna_path, -1);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
unused_fcurve(curves);
|
|
|
|
|
fprintf(stderr, "AnimationClass %d is not supported for %s.\n",
|
|
|
|
|
binding->animationClass, loc ? "TRANSLATE" : "SCALE");
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
2012-06-12 22:05:33 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2011-09-04 00:15:59 +00:00
|
|
|
|
|
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
case COLLADAFW::Transformation::ROTATE:
|
2012-06-12 22:05:33 +00:00
|
|
|
{
|
|
|
|
|
if (is_joint)
|
|
|
|
|
BLI_snprintf(rna_path, sizeof(rna_path), "%s.rotation_euler", joint_path);
|
|
|
|
|
else
|
|
|
|
|
BLI_strncpy(rna_path, "rotation_euler", sizeof(rna_path));
|
|
|
|
|
std::vector<FCurve *>::iterator iter;
|
|
|
|
|
for (iter = curves->begin(); iter != curves->end(); iter++) {
|
|
|
|
|
FCurve *fcu = *iter;
|
|
|
|
|
|
|
|
|
|
//if transform is rotation the fcurves values must be turned in to radian.
|
|
|
|
|
if (is_rotation)
|
|
|
|
|
fcurve_deg_to_rad(fcu);
|
2011-09-04 00:15:59 +00:00
|
|
|
}
|
2012-06-12 22:05:33 +00:00
|
|
|
COLLADAFW::Rotate *rot = (COLLADAFW::Rotate *)transform;
|
|
|
|
|
COLLADABU::Math::Vector3& axis = rot->getRotationAxis();
|
|
|
|
|
|
|
|
|
|
switch (binding->animationClass) {
|
|
|
|
|
case COLLADAFW::AnimationList::ANGLE:
|
|
|
|
|
if (COLLADABU::Math::Vector3::UNIT_X == axis) {
|
|
|
|
|
modify_fcurve(curves, rna_path, 0);
|
|
|
|
|
}
|
|
|
|
|
else if (COLLADABU::Math::Vector3::UNIT_Y == axis) {
|
|
|
|
|
modify_fcurve(curves, rna_path, 1);
|
|
|
|
|
}
|
|
|
|
|
else if (COLLADABU::Math::Vector3::UNIT_Z == axis) {
|
|
|
|
|
modify_fcurve(curves, rna_path, 2);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
unused_fcurve(curves);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::AnimationList::AXISANGLE:
|
|
|
|
|
// TODO convert axis-angle to quat? or XYZ?
|
|
|
|
|
default:
|
|
|
|
|
unused_fcurve(curves);
|
|
|
|
|
fprintf(stderr, "AnimationClass %d is not supported for ROTATE transformation.\n",
|
|
|
|
|
binding->animationClass);
|
2011-09-04 00:15:59 +00:00
|
|
|
}
|
2011-06-14 20:42:01 +00:00
|
|
|
break;
|
2012-06-12 22:05:33 +00:00
|
|
|
}
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
case COLLADAFW::Transformation::MATRIX:
|
2018-04-16 17:08:27 +02:00
|
|
|
#if 0
|
|
|
|
|
{
|
|
|
|
|
COLLADAFW::Matrix *mat = (COLLADAFW::Matrix*)transform;
|
|
|
|
|
COLLADABU::Math::Matrix4 mat4 = mat->getMatrix();
|
|
|
|
|
switch (binding->animationClass) {
|
|
|
|
|
case COLLADAFW::AnimationList::TRANSFORM:
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2012-05-02 18:11:09 +00:00
|
|
|
unused_fcurve(curves);
|
2011-08-17 18:29:01 +00:00
|
|
|
break;
|
2011-06-14 20:42:01 +00:00
|
|
|
case COLLADAFW::Transformation::SKEW:
|
|
|
|
|
case COLLADAFW::Transformation::LOOKAT:
|
2012-05-02 18:11:09 +00:00
|
|
|
unused_fcurve(curves);
|
2011-08-17 18:29:01 +00:00
|
|
|
fprintf(stderr, "Animation of SKEW and LOOKAT transformations is not supported yet.\n");
|
2011-06-14 20:42:01 +00:00
|
|
|
break;
|
2011-09-04 00:15:59 +00:00
|
|
|
}
|
|
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
|
|
|
|
|
2011-08-17 18:29:01 +00:00
|
|
|
//creates the rna_paths and array indices of fcurves from animations using color and bound animation class of each animation.
|
2012-06-12 22:05:33 +00:00
|
|
|
void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId& listid, ListBase *AnimCurves, const char *anim_type)
|
2011-07-03 17:26:02 +00:00
|
|
|
{
|
|
|
|
|
char rna_path[100];
|
2012-04-29 15:47:02 +00:00
|
|
|
BLI_strncpy(rna_path, anim_type, sizeof(rna_path));
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-07-27 17:43:32 +00:00
|
|
|
const COLLADAFW::AnimationList *animlist = animlist_map[listid];
|
2018-04-06 13:06:46 +02:00
|
|
|
if (animlist == NULL)
|
2018-04-06 12:42:38 +02:00
|
|
|
{
|
|
|
|
|
fprintf(stderr, "Collada: No animlist found for ID: %s of type %s\n", listid.toAscii().c_str(), anim_type);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2011-07-27 17:43:32 +00:00
|
|
|
const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
|
2011-09-04 00:15:59 +00:00
|
|
|
//all the curves belonging to the current binding
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *> animcurves;
|
2011-07-27 17:43:32 +00:00
|
|
|
for (unsigned int j = 0; j < bindings.getCount(); j++) {
|
2011-09-04 00:15:59 +00:00
|
|
|
animcurves = curve_map[bindings[j].animation];
|
|
|
|
|
|
|
|
|
|
switch (bindings[j].animationClass) {
|
2012-06-12 22:05:33 +00:00
|
|
|
case COLLADAFW::AnimationList::COLOR_R:
|
|
|
|
|
modify_fcurve(&animcurves, rna_path, 0);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::AnimationList::COLOR_G:
|
|
|
|
|
modify_fcurve(&animcurves, rna_path, 1);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::AnimationList::COLOR_B:
|
|
|
|
|
modify_fcurve(&animcurves, rna_path, 2);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::AnimationList::COLOR_RGB:
|
|
|
|
|
case COLLADAFW::AnimationList::COLOR_RGBA: // to do-> set intensity
|
|
|
|
|
modify_fcurve(&animcurves, rna_path, -1);
|
|
|
|
|
break;
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
default:
|
|
|
|
|
unused_fcurve(&animcurves);
|
|
|
|
|
fprintf(stderr, "AnimationClass %d is not supported for %s.\n",
|
|
|
|
|
bindings[j].animationClass, "COLOR");
|
2011-07-03 17:26:02 +00:00
|
|
|
}
|
2011-07-27 17:43:32 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *>::iterator iter;
|
2011-07-27 17:43:32 +00:00
|
|
|
//Add the curves of the current animation to the object
|
|
|
|
|
for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
|
2012-06-12 22:05:33 +00:00
|
|
|
FCurve *fcu = *iter;
|
2012-10-21 05:46:41 +00:00
|
|
|
BLI_addtail(AnimCurves, fcu);
|
2015-09-11 18:41:35 +10:00
|
|
|
fcurve_is_used(fcu);
|
2011-09-25 12:31:21 +00:00
|
|
|
}
|
2011-07-27 17:43:32 +00:00
|
|
|
}
|
2011-07-03 17:26:02 +00:00
|
|
|
}
|
2011-07-04 19:30:58 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId& listid, ListBase *AnimCurves, const char *anim_type)
|
2011-07-04 19:30:58 +00:00
|
|
|
{
|
|
|
|
|
char rna_path[100];
|
2012-02-27 10:35:39 +00:00
|
|
|
if (animlist_map.find(listid) == animlist_map.end()) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else {
|
2011-08-17 18:29:01 +00:00
|
|
|
//anim_type has animations
|
2011-07-05 18:02:08 +00:00
|
|
|
const COLLADAFW::AnimationList *animlist = animlist_map[listid];
|
|
|
|
|
const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
|
|
|
|
|
//all the curves belonging to the current binding
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *> animcurves;
|
2011-07-05 18:02:08 +00:00
|
|
|
for (unsigned int j = 0; j < bindings.getCount(); j++) {
|
2011-09-25 12:31:21 +00:00
|
|
|
animcurves = curve_map[bindings[j].animation];
|
|
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
BLI_strncpy(rna_path, anim_type, sizeof(rna_path));
|
2012-06-12 22:05:33 +00:00
|
|
|
modify_fcurve(&animcurves, rna_path, 0);
|
|
|
|
|
std::vector<FCurve *>::iterator iter;
|
2011-09-25 12:31:21 +00:00
|
|
|
//Add the curves of the current animation to the object
|
|
|
|
|
for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
|
2012-06-12 22:05:33 +00:00
|
|
|
FCurve *fcu = *iter;
|
2014-02-03 13:04:51 +01:00
|
|
|
/* All anim_types whose values are to be converted from Degree to Radians can be ORed here */
|
2015-01-26 16:03:11 +01:00
|
|
|
if (STREQ("spot_size", anim_type)) {
|
2014-02-03 13:04:51 +01:00
|
|
|
/* NOTE: Do NOT convert if imported file was made by blender <= 2.69.10
|
|
|
|
|
* Reason: old blender versions stored spot_size in radians (was a bug)
|
|
|
|
|
*/
|
|
|
|
|
if (this->import_from_version == "" || BLI_natstrcmp(this->import_from_version.c_str(), "2.69.10") != -1) {
|
2014-01-31 09:35:00 +01:00
|
|
|
fcurve_deg_to_rad(fcu);
|
2014-02-03 13:04:51 +01:00
|
|
|
}
|
2014-01-31 09:35:00 +01:00
|
|
|
}
|
2014-02-03 13:04:51 +01:00
|
|
|
/** XXX What About animtype "rotation" ? */
|
|
|
|
|
|
2011-09-25 12:31:21 +00:00
|
|
|
BLI_addtail(AnimCurves, fcu);
|
2015-09-11 18:41:35 +10:00
|
|
|
fcurve_is_used(fcu);
|
2011-09-25 12:31:21 +00:00
|
|
|
}
|
2011-07-05 18:02:08 +00:00
|
|
|
}
|
|
|
|
|
}
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2011-07-04 19:30:58 +00:00
|
|
|
}
|
|
|
|
|
|
2018-03-28 17:56:09 +02:00
|
|
|
float AnimationImporter::convert_to_focal_length(float in_xfov, int fov_type, float aspect, float sensorx)
|
|
|
|
|
{
|
|
|
|
|
// NOTE: Needs more testing (As we curretnly have no official test data for this)
|
|
|
|
|
float xfov = (fov_type == CAMERA_YFOV) ? (2.0f * atanf(aspect * tanf(DEG2RADF(in_xfov) * 0.5f))) : DEG2RADF(in_xfov);
|
|
|
|
|
return fov_to_focallength(xfov, sensorx);
|
|
|
|
|
}
|
|
|
|
|
|
2012-08-05 21:35:09 +00:00
|
|
|
/*
|
|
|
|
|
* Lens animations must be stored in COLLADA by using FOV,
|
|
|
|
|
* while blender internally uses focal length.
|
|
|
|
|
* The imported animation curves must be converted appropriately.
|
|
|
|
|
*/
|
|
|
|
|
void AnimationImporter::Assign_lens_animations(const COLLADAFW::UniqueId& listid, ListBase *AnimCurves, const double aspect, Camera *cam, const char *anim_type, int fov_type)
|
|
|
|
|
{
|
|
|
|
|
char rna_path[100];
|
|
|
|
|
if (animlist_map.find(listid) == animlist_map.end()) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
//anim_type has animations
|
|
|
|
|
const COLLADAFW::AnimationList *animlist = animlist_map[listid];
|
|
|
|
|
const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
|
|
|
|
|
//all the curves belonging to the current binding
|
|
|
|
|
std::vector<FCurve *> animcurves;
|
|
|
|
|
for (unsigned int j = 0; j < bindings.getCount(); j++) {
|
|
|
|
|
animcurves = curve_map[bindings[j].animation];
|
|
|
|
|
|
|
|
|
|
BLI_strncpy(rna_path, anim_type, sizeof(rna_path));
|
|
|
|
|
|
|
|
|
|
modify_fcurve(&animcurves, rna_path, 0);
|
|
|
|
|
std::vector<FCurve *>::iterator iter;
|
|
|
|
|
//Add the curves of the current animation to the object
|
|
|
|
|
for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
|
|
|
|
|
FCurve *fcu = *iter;
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2012-08-05 21:35:09 +00:00
|
|
|
for (unsigned int i = 0; i < fcu->totvert; i++) {
|
2018-03-28 17:56:09 +02:00
|
|
|
fcu->bezt[i].vec[0][1] = convert_to_focal_length(fcu->bezt[i].vec[0][1], fov_type, aspect, cam->sensor_x);
|
|
|
|
|
fcu->bezt[i].vec[1][1] = convert_to_focal_length(fcu->bezt[i].vec[1][1], fov_type, aspect, cam->sensor_x);
|
|
|
|
|
fcu->bezt[i].vec[2][1] = convert_to_focal_length(fcu->bezt[i].vec[2][1], fov_type, aspect, cam->sensor_x);
|
2012-08-05 21:35:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BLI_addtail(AnimCurves, fcu);
|
2015-09-11 18:41:35 +10:00
|
|
|
fcurve_is_used(fcu);
|
2012-08-05 21:35:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& animcurves, COLLADAFW::Node *root, COLLADAFW::Node *node,
|
2012-06-12 22:05:33 +00:00
|
|
|
COLLADAFW::Transformation *tm)
|
2011-08-10 19:43:40 +00:00
|
|
|
{
|
2011-08-14 16:14:32 +00:00
|
|
|
bool is_joint = node->getType() == COLLADAFW::Node::JOINT;
|
|
|
|
|
const char *bone_name = is_joint ? bc_get_joint_name(node) : NULL;
|
|
|
|
|
char joint_path[200];
|
2012-06-12 22:05:33 +00:00
|
|
|
if (is_joint)
|
2011-08-14 16:14:32 +00:00
|
|
|
armature_importer->get_rna_path_for_joint(node, joint_path, sizeof(joint_path));
|
|
|
|
|
|
2011-08-10 19:43:40 +00:00
|
|
|
std::vector<float> frames;
|
|
|
|
|
find_frames(&frames, &animcurves);
|
|
|
|
|
|
|
|
|
|
float irest_dae[4][4];
|
|
|
|
|
float rest[4][4], irest[4][4];
|
|
|
|
|
|
|
|
|
|
if (is_joint) {
|
|
|
|
|
get_joint_rest_mat(irest_dae, root, node);
|
|
|
|
|
invert_m4(irest_dae);
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
Bone *bone = BKE_armature_find_bone_name((bArmature *)ob->data, bone_name);
|
2011-08-10 19:43:40 +00:00
|
|
|
if (!bone) {
|
|
|
|
|
fprintf(stderr, "cannot find bone \"%s\"\n", bone_name);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unit_m4(rest);
|
|
|
|
|
copy_m4_m4(rest, bone->arm_mat);
|
|
|
|
|
invert_m4_m4(irest, rest);
|
|
|
|
|
}
|
2011-09-04 00:15:59 +00:00
|
|
|
// new curves to assign matrix transform animation
|
2011-08-10 19:43:40 +00:00
|
|
|
FCurve *newcu[10]; // if tm_type is matrix, then create 10 curves: 4 rot, 3 loc, 3 scale
|
2012-02-27 10:35:39 +00:00
|
|
|
unsigned int totcu = 10;
|
2011-09-04 00:15:59 +00:00
|
|
|
const char *tm_str = NULL;
|
2011-08-10 19:43:40 +00:00
|
|
|
char rna_path[200];
|
|
|
|
|
for (int i = 0; i < totcu; i++) {
|
|
|
|
|
|
|
|
|
|
int axis = i;
|
|
|
|
|
|
2011-09-04 00:15:59 +00:00
|
|
|
if (i < 4) {
|
|
|
|
|
tm_str = "rotation_quaternion";
|
|
|
|
|
axis = i;
|
|
|
|
|
}
|
|
|
|
|
else if (i < 7) {
|
|
|
|
|
tm_str = "location";
|
|
|
|
|
axis = i - 4;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
tm_str = "scale";
|
|
|
|
|
axis = i - 7;
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-10 19:43:40 +00:00
|
|
|
if (is_joint)
|
|
|
|
|
BLI_snprintf(rna_path, sizeof(rna_path), "%s.%s", joint_path, tm_str);
|
|
|
|
|
else
|
2011-10-19 23:10:54 +00:00
|
|
|
BLI_strncpy(rna_path, tm_str, sizeof(rna_path));
|
2011-08-10 19:43:40 +00:00
|
|
|
newcu[i] = create_fcurve(axis, rna_path);
|
2011-08-12 20:38:29 +00:00
|
|
|
newcu[i]->totvert = frames.size();
|
2011-08-10 19:43:40 +00:00
|
|
|
}
|
|
|
|
|
|
2011-09-04 00:15:59 +00:00
|
|
|
if (frames.size() == 0)
|
2011-08-10 19:43:40 +00:00
|
|
|
return;
|
|
|
|
|
|
2011-09-04 00:15:59 +00:00
|
|
|
std::sort(frames.begin(), frames.end());
|
|
|
|
|
|
2011-08-10 19:43:40 +00:00
|
|
|
std::vector<float>::iterator it;
|
|
|
|
|
|
2018-02-27 17:02:37 +01:00
|
|
|
//float qref[4];
|
|
|
|
|
//unit_qt(qref);
|
2018-02-16 12:37:36 +01:00
|
|
|
|
2011-08-10 19:43:40 +00:00
|
|
|
// sample values at each frame
|
|
|
|
|
for (it = frames.begin(); it != frames.end(); it++) {
|
|
|
|
|
float fra = *it;
|
|
|
|
|
|
|
|
|
|
float mat[4][4];
|
|
|
|
|
float matfra[4][4];
|
|
|
|
|
|
|
|
|
|
unit_m4(matfra);
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-08-12 20:38:29 +00:00
|
|
|
// calc object-space mat
|
|
|
|
|
evaluate_transform_at_frame(matfra, node, fra);
|
2011-08-10 19:43:40 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
// for joints, we need a special matrix
|
|
|
|
|
if (is_joint) {
|
|
|
|
|
// special matrix: iR * M * iR_dae * R
|
|
|
|
|
// where R, iR are bone rest and inverse rest mats in world space (Blender bones),
|
|
|
|
|
// iR_dae is joint inverse rest matrix (DAE) and M is an evaluated joint world-space matrix (DAE)
|
|
|
|
|
float temp[4][4], par[4][4];
|
|
|
|
|
|
|
|
|
|
// calc M
|
|
|
|
|
calc_joint_parent_mat_rest(par, NULL, root, node);
|
2013-05-26 18:36:25 +00:00
|
|
|
mul_m4_m4m4(temp, par, matfra);
|
2011-08-10 19:43:40 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
// evaluate_joint_world_transform_at_frame(temp, NULL, node, fra);
|
2011-08-10 19:43:40 +00:00
|
|
|
|
|
|
|
|
// calc special matrix
|
2014-07-21 18:55:12 +10:00
|
|
|
mul_m4_series(mat, irest, temp, irest_dae, rest);
|
2011-08-10 19:43:40 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
copy_m4_m4(mat, matfra);
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
float rot[4], loc[3], scale[3];
|
2018-02-27 17:02:37 +01:00
|
|
|
mat4_decompose(loc, rot, scale, mat);
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-08-10 19:43:40 +00:00
|
|
|
// add keys
|
|
|
|
|
for (int i = 0; i < totcu; i++) {
|
2011-09-04 00:15:59 +00:00
|
|
|
if (i < 4)
|
|
|
|
|
add_bezt(newcu[i], fra, rot[i]);
|
|
|
|
|
else if (i < 7)
|
|
|
|
|
add_bezt(newcu[i], fra, loc[i - 4]);
|
|
|
|
|
else
|
|
|
|
|
add_bezt(newcu[i], fra, scale[i - 7]);
|
2011-08-10 19:43:40 +00:00
|
|
|
}
|
|
|
|
|
}
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
Main *bmain = CTX_data_main(mContext);
|
2018-06-07 12:47:00 +02:00
|
|
|
verify_adt_action(bmain, (ID *)&ob->id, 1);
|
2011-08-10 19:43:40 +00:00
|
|
|
|
|
|
|
|
ListBase *curves = &ob->adt->action->curves;
|
|
|
|
|
|
|
|
|
|
// add curves
|
2012-06-12 22:05:33 +00:00
|
|
|
for (int i = 0; i < totcu; i++) {
|
2011-08-10 19:43:40 +00:00
|
|
|
if (is_joint)
|
|
|
|
|
add_bone_fcurve(ob, node, newcu[i]);
|
|
|
|
|
else
|
|
|
|
|
BLI_addtail(curves, newcu[i]);
|
2015-09-11 18:41:35 +10:00
|
|
|
// fcurve_is_used(newcu[i]); // never added to unused
|
2011-08-10 19:43:40 +00:00
|
|
|
}
|
|
|
|
|
|
2015-09-11 18:41:35 +10:00
|
|
|
|
2011-09-04 00:15:59 +00:00
|
|
|
if (is_joint) {
|
2012-05-05 16:03:57 +00:00
|
|
|
bPoseChannel *chan = BKE_pose_channel_find_name(ob->pose, bone_name);
|
2011-09-04 00:15:59 +00:00
|
|
|
chan->rotmode = ROT_MODE_QUAT;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
ob->rotmode = ROT_MODE_QUAT;
|
|
|
|
|
}
|
2011-08-10 19:43:40 +00:00
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2012-08-05 21:35:09 +00:00
|
|
|
/*
|
|
|
|
|
* This function returns the aspet ration from the Collada camera.
|
|
|
|
|
*
|
2018-06-01 18:19:39 +02:00
|
|
|
* Note:COLLADA allows to specify either XFov, or YFov alone.
|
2012-11-12 07:33:01 +00:00
|
|
|
* In that case the aspect ratio can be determined from
|
2012-08-05 21:35:09 +00:00
|
|
|
* the viewport aspect ratio (which is 1:1 ?)
|
|
|
|
|
* XXX: check this: its probably wrong!
|
|
|
|
|
* If both values are specified, then the aspect ration is simply xfov/yfov
|
|
|
|
|
* and if aspect ratio is efined, then .. well then its that one.
|
|
|
|
|
*/
|
|
|
|
|
static const double get_aspect_ratio(const COLLADAFW::Camera *camera)
|
|
|
|
|
{
|
|
|
|
|
double aspect = camera->getAspectRatio().getValue();
|
|
|
|
|
|
2012-10-21 07:58:38 +00:00
|
|
|
if (aspect == 0) {
|
2012-08-05 21:35:09 +00:00
|
|
|
const double yfov = camera->getYFov().getValue();
|
|
|
|
|
|
2012-10-21 07:58:38 +00:00
|
|
|
if (yfov == 0) {
|
|
|
|
|
aspect = 1; // assume yfov and xfov are equal
|
|
|
|
|
}
|
|
|
|
|
else {
|
2012-08-05 21:35:09 +00:00
|
|
|
const double xfov = camera->getXFov().getValue();
|
|
|
|
|
if (xfov==0)
|
|
|
|
|
aspect = 1;
|
|
|
|
|
else
|
|
|
|
|
aspect = xfov / yfov;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return aspect;
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-07 12:47:00 +02:00
|
|
|
static ListBase &get_animation_curves(Main *bmain, Material *ma)
|
2018-04-06 12:42:38 +02:00
|
|
|
{
|
|
|
|
|
bAction *act;
|
|
|
|
|
if (!ma->adt || !ma->adt->action)
|
2018-06-07 12:47:00 +02:00
|
|
|
act = verify_adt_action(bmain, (ID *)&ma->id, 1);
|
2018-04-06 12:42:38 +02:00
|
|
|
else
|
|
|
|
|
act = ma->adt->action;
|
|
|
|
|
|
|
|
|
|
return act->curves;
|
|
|
|
|
}
|
2012-08-05 21:35:09 +00:00
|
|
|
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
void AnimationImporter::translate_Animations(COLLADAFW::Node *node,
|
2012-06-12 22:05:33 +00:00
|
|
|
std::map<COLLADAFW::UniqueId, COLLADAFW::Node *>& root_map,
|
|
|
|
|
std::multimap<COLLADAFW::UniqueId, Object *>& object_map,
|
2018-04-06 12:42:38 +02:00
|
|
|
std::map<COLLADAFW::UniqueId, const COLLADAFW::Object *> FW_object_map,
|
|
|
|
|
std::map<COLLADAFW::UniqueId, Material*> uid_material_map)
|
2011-06-14 20:42:01 +00:00
|
|
|
{
|
|
|
|
|
bool is_joint = node->getType() == COLLADAFW::Node::JOINT;
|
2012-08-05 10:23:34 +00:00
|
|
|
COLLADAFW::UniqueId uid = node->getUniqueId();
|
|
|
|
|
COLLADAFW::Node *root = root_map.find(uid) == root_map.end() ? node : root_map[uid];
|
|
|
|
|
|
|
|
|
|
Object *ob;
|
2012-10-21 07:58:38 +00:00
|
|
|
if (is_joint)
|
2012-08-05 10:23:34 +00:00
|
|
|
ob = armature_importer->get_armature_for_joint(root);
|
|
|
|
|
else
|
|
|
|
|
ob = object_map.find(uid) == object_map.end() ? NULL : object_map.find(uid)->second;
|
|
|
|
|
|
2012-04-28 06:31:57 +00:00
|
|
|
if (!ob) {
|
2011-07-03 17:26:02 +00:00
|
|
|
fprintf(stderr, "cannot find Object for Node with id=\"%s\"\n", node->getOriginalId().c_str());
|
|
|
|
|
return;
|
|
|
|
|
}
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2015-09-11 19:12:25 +10:00
|
|
|
|
|
|
|
|
AnimationImporter::AnimMix *animType = get_animation_type(node, FW_object_map);
|
2012-06-12 22:05:33 +00:00
|
|
|
bAction *act;
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
Main *bmain = CTX_data_main(mContext);
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
if ( (animType->transform) != 0) {
|
2012-04-28 06:31:57 +00:00
|
|
|
/* const char *bone_name = is_joint ? bc_get_joint_name(node) : NULL; */ /* UNUSED */
|
2011-09-04 00:15:59 +00:00
|
|
|
char joint_path[200];
|
2011-07-03 17:26:02 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
if (is_joint)
|
2011-09-04 00:15:59 +00:00
|
|
|
armature_importer->get_rna_path_for_joint(node, joint_path, sizeof(joint_path));
|
|
|
|
|
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
if (!ob->adt || !ob->adt->action)
|
|
|
|
|
act = verify_adt_action(bmain, (ID *)&ob->id, 1);
|
2011-09-04 00:15:59 +00:00
|
|
|
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
else
|
|
|
|
|
act = ob->adt->action;
|
2011-09-04 00:15:59 +00:00
|
|
|
|
|
|
|
|
//Get the list of animation curves of the object
|
|
|
|
|
ListBase *AnimCurves = &(act->curves);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2011-07-03 17:26:02 +00:00
|
|
|
const COLLADAFW::TransformationPointerArray& nodeTransforms = node->getTransformations();
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2018-06-08 08:07:48 +02:00
|
|
|
//for each transformation in node
|
2011-07-03 17:26:02 +00:00
|
|
|
for (unsigned int i = 0; i < nodeTransforms.getCount(); i++) {
|
|
|
|
|
COLLADAFW::Transformation *transform = nodeTransforms[i];
|
|
|
|
|
COLLADAFW::Transformation::TransformationType tm_type = transform->getTransformationType();
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2011-07-03 17:26:02 +00:00
|
|
|
bool is_rotation = tm_type == COLLADAFW::Transformation::ROTATE;
|
|
|
|
|
bool is_matrix = tm_type == COLLADAFW::Transformation::MATRIX;
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-07-03 17:26:02 +00:00
|
|
|
const COLLADAFW::UniqueId& listid = transform->getAnimationList();
|
2011-09-04 00:15:59 +00:00
|
|
|
|
|
|
|
|
//check if transformation has animations
|
2012-02-27 10:35:39 +00:00
|
|
|
if (animlist_map.find(listid) == animlist_map.end()) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else {
|
2011-06-14 20:42:01 +00:00
|
|
|
//transformation has animations
|
|
|
|
|
const COLLADAFW::AnimationList *animlist = animlist_map[listid];
|
|
|
|
|
const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
|
2011-07-03 17:26:02 +00:00
|
|
|
//all the curves belonging to the current binding
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *> animcurves;
|
2011-06-14 20:42:01 +00:00
|
|
|
for (unsigned int j = 0; j < bindings.getCount(); j++) {
|
2011-09-04 00:15:59 +00:00
|
|
|
animcurves = curve_map[bindings[j].animation];
|
2012-06-12 22:05:33 +00:00
|
|
|
if (is_matrix) {
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
apply_matrix_curves(ob, animcurves, root, node, transform);
|
2012-02-18 06:22:20 +00:00
|
|
|
}
|
2018-06-07 12:47:00 +02:00
|
|
|
else {
|
2012-02-18 06:22:20 +00:00
|
|
|
if (is_joint) {
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
add_bone_animation_sampled(ob, animcurves, root, node, transform);
|
2012-02-18 06:22:20 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
//calculate rnapaths and array index of fcurves according to transformation and animation class
|
2012-06-12 22:05:33 +00:00
|
|
|
Assign_transform_animations(transform, &bindings[j], &animcurves, is_joint, joint_path);
|
2012-02-18 06:22:20 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *>::iterator iter;
|
2012-02-18 06:22:20 +00:00
|
|
|
//Add the curves of the current animation to the object
|
|
|
|
|
for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
|
2012-06-12 22:05:33 +00:00
|
|
|
FCurve *fcu = *iter;
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2012-02-18 06:22:20 +00:00
|
|
|
BLI_addtail(AnimCurves, fcu);
|
2015-09-11 18:41:35 +10:00
|
|
|
fcurve_is_used(fcu);
|
2012-02-18 06:22:20 +00:00
|
|
|
}
|
2011-08-14 16:14:32 +00:00
|
|
|
}
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2011-09-04 00:15:59 +00:00
|
|
|
}
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
|
|
|
|
}
|
2012-02-18 06:22:20 +00:00
|
|
|
if (is_rotation && !is_joint) {
|
|
|
|
|
ob->rotmode = ROT_MODE_EUL;
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
2011-07-03 17:26:02 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-04-28 06:31:57 +00:00
|
|
|
if ((animType->light) != 0) {
|
2019-02-27 10:46:48 +11:00
|
|
|
Light *lamp = (Light *) ob->data;
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
if (!lamp->adt || !lamp->adt->action)
|
|
|
|
|
act = verify_adt_action(bmain, (ID *)&lamp->id, 1);
|
|
|
|
|
else
|
|
|
|
|
act = lamp->adt->action;
|
2011-07-03 17:26:02 +00:00
|
|
|
|
|
|
|
|
ListBase *AnimCurves = &(act->curves);
|
|
|
|
|
const COLLADAFW::InstanceLightPointerArray& nodeLights = node->getInstanceLights();
|
|
|
|
|
|
|
|
|
|
for (unsigned int i = 0; i < nodeLights.getCount(); i++) {
|
|
|
|
|
const COLLADAFW::Light *light = (COLLADAFW::Light *) FW_object_map[nodeLights[i]->getInstanciatedObjectId()];
|
2011-07-05 18:02:08 +00:00
|
|
|
|
2012-04-28 06:31:57 +00:00
|
|
|
if ((animType->light & LIGHT_COLOR) != 0) {
|
2011-07-04 19:30:58 +00:00
|
|
|
const COLLADAFW::Color *col = &(light->getColor());
|
|
|
|
|
const COLLADAFW::UniqueId& listid = col->getAnimationList();
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2018-06-08 08:07:48 +02:00
|
|
|
Assign_color_animations(listid, AnimCurves, "color");
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
2012-06-12 22:05:33 +00:00
|
|
|
if ((animType->light & LIGHT_FOA) != 0) {
|
2011-07-04 19:30:58 +00:00
|
|
|
const COLLADAFW::AnimatableFloat *foa = &(light->getFallOffAngle());
|
|
|
|
|
const COLLADAFW::UniqueId& listid = foa->getAnimationList();
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
Assign_float_animations(listid, AnimCurves, "spot_size");
|
2011-07-05 18:02:08 +00:00
|
|
|
}
|
2012-06-12 22:05:33 +00:00
|
|
|
if ( (animType->light & LIGHT_FOE) != 0) {
|
2011-07-05 18:02:08 +00:00
|
|
|
const COLLADAFW::AnimatableFloat *foe = &(light->getFallOffExponent());
|
|
|
|
|
const COLLADAFW::UniqueId& listid = foe->getAnimationList();
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
Assign_float_animations(listid, AnimCurves, "spot_blend");
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-07-05 18:02:08 +00:00
|
|
|
}
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
|
|
|
|
}
|
2011-07-06 18:34:01 +00:00
|
|
|
|
2012-07-21 22:58:08 +00:00
|
|
|
if (animType->camera != 0) {
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
|
2012-08-05 21:35:09 +00:00
|
|
|
Camera *cam = (Camera *) ob->data;
|
|
|
|
|
if (!cam->adt || !cam->adt->action)
|
2018-06-07 12:47:00 +02:00
|
|
|
act = verify_adt_action(bmain, (ID *)&cam->id, 1);
|
2012-08-05 21:35:09 +00:00
|
|
|
else
|
|
|
|
|
act = cam->adt->action;
|
2011-07-06 18:34:01 +00:00
|
|
|
|
|
|
|
|
ListBase *AnimCurves = &(act->curves);
|
2012-06-12 22:05:33 +00:00
|
|
|
const COLLADAFW::InstanceCameraPointerArray& nodeCameras = node->getInstanceCameras();
|
2011-07-06 18:34:01 +00:00
|
|
|
|
|
|
|
|
for (unsigned int i = 0; i < nodeCameras.getCount(); i++) {
|
|
|
|
|
const COLLADAFW::Camera *camera = (COLLADAFW::Camera *) FW_object_map[nodeCameras[i]->getInstanciatedObjectId()];
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
if ((animType->camera & CAMERA_XFOV) != 0) {
|
2011-07-06 18:34:01 +00:00
|
|
|
const COLLADAFW::AnimatableFloat *xfov = &(camera->getXFov());
|
|
|
|
|
const COLLADAFW::UniqueId& listid = xfov->getAnimationList();
|
2018-06-08 08:07:48 +02:00
|
|
|
double aspect = get_aspect_ratio(camera);
|
2012-08-05 21:35:09 +00:00
|
|
|
Assign_lens_animations(listid, AnimCurves, aspect, cam, "lens", CAMERA_XFOV);
|
2011-07-06 18:34:01 +00:00
|
|
|
}
|
2011-07-07 16:56:56 +00:00
|
|
|
|
2012-08-04 21:25:19 +00:00
|
|
|
else if ((animType->camera & CAMERA_YFOV) != 0) {
|
|
|
|
|
const COLLADAFW::AnimatableFloat *yfov = &(camera->getYFov());
|
|
|
|
|
const COLLADAFW::UniqueId& listid = yfov->getAnimationList();
|
2018-06-08 08:07:48 +02:00
|
|
|
double aspect = get_aspect_ratio(camera);
|
2012-08-05 21:35:09 +00:00
|
|
|
Assign_lens_animations(listid, AnimCurves, aspect, cam, "lens", CAMERA_YFOV);
|
2012-08-04 21:25:19 +00:00
|
|
|
}
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
else if ((animType->camera & CAMERA_XMAG) != 0) {
|
2011-07-07 16:56:56 +00:00
|
|
|
const COLLADAFW::AnimatableFloat *xmag = &(camera->getXMag());
|
|
|
|
|
const COLLADAFW::UniqueId& listid = xmag->getAnimationList();
|
2012-06-12 22:05:33 +00:00
|
|
|
Assign_float_animations(listid, AnimCurves, "ortho_scale");
|
2011-07-07 16:56:56 +00:00
|
|
|
}
|
2011-07-13 16:53:36 +00:00
|
|
|
|
2012-08-04 21:25:19 +00:00
|
|
|
else if ((animType->camera & CAMERA_YMAG) != 0) {
|
|
|
|
|
const COLLADAFW::AnimatableFloat *ymag = &(camera->getYMag());
|
|
|
|
|
const COLLADAFW::UniqueId& listid = ymag->getAnimationList();
|
|
|
|
|
Assign_float_animations(listid, AnimCurves, "ortho_scale");
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
if ((animType->camera & CAMERA_ZFAR) != 0) {
|
2011-07-13 16:53:36 +00:00
|
|
|
const COLLADAFW::AnimatableFloat *zfar = &(camera->getFarClippingPlane());
|
|
|
|
|
const COLLADAFW::UniqueId& listid = zfar->getAnimationList();
|
2012-06-12 22:05:33 +00:00
|
|
|
Assign_float_animations(listid, AnimCurves, "clip_end");
|
2011-07-13 16:53:36 +00:00
|
|
|
}
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
if ((animType->camera & CAMERA_ZNEAR) != 0) {
|
2011-07-13 16:53:36 +00:00
|
|
|
const COLLADAFW::AnimatableFloat *znear = &(camera->getNearClippingPlane());
|
|
|
|
|
const COLLADAFW::UniqueId& listid = znear->getAnimationList();
|
2012-06-12 22:05:33 +00:00
|
|
|
Assign_float_animations(listid, AnimCurves, "clip_start");
|
2011-07-13 16:53:36 +00:00
|
|
|
}
|
|
|
|
|
|
2011-07-06 18:34:01 +00:00
|
|
|
}
|
|
|
|
|
}
|
2012-06-12 22:05:33 +00:00
|
|
|
if (animType->material != 0) {
|
2011-09-04 00:15:59 +00:00
|
|
|
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
Material *ma = give_current_material(ob, 1);
|
|
|
|
|
if (!ma->adt || !ma->adt->action)
|
|
|
|
|
act = verify_adt_action(bmain, (ID *)&ma->id, 1);
|
|
|
|
|
else
|
|
|
|
|
act = ma->adt->action;
|
|
|
|
|
|
2011-07-23 20:49:26 +00:00
|
|
|
const COLLADAFW::InstanceGeometryPointerArray& nodeGeoms = node->getInstanceGeometries();
|
|
|
|
|
for (unsigned int i = 0; i < nodeGeoms.getCount(); i++) {
|
|
|
|
|
const COLLADAFW::MaterialBindingArray& matBinds = nodeGeoms[i]->getMaterialBindings();
|
|
|
|
|
for (unsigned int j = 0; j < matBinds.getCount(); j++) {
|
|
|
|
|
const COLLADAFW::UniqueId & matuid = matBinds[j].getReferencedMaterial();
|
|
|
|
|
const COLLADAFW::Effect *ef = (COLLADAFW::Effect *) (FW_object_map[matuid]);
|
2011-10-14 02:31:04 +00:00
|
|
|
if (ef != NULL) { /* can be NULL [#28909] */
|
2018-04-06 12:42:38 +02:00
|
|
|
Material *ma = uid_material_map[matuid];
|
|
|
|
|
if (!ma) {
|
|
|
|
|
fprintf(stderr, "Collada: Node %s refers to undefined material\n", node->getName().c_str());
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2018-06-07 12:47:00 +02:00
|
|
|
ListBase &AnimCurves = get_animation_curves(bmain, ma);
|
2018-04-06 12:42:38 +02:00
|
|
|
const COLLADAFW::CommonEffectPointerArray& commonEffects = ef->getCommonEffects();
|
2011-10-14 02:31:04 +00:00
|
|
|
COLLADAFW::EffectCommon *efc = commonEffects[0];
|
2012-03-28 05:03:24 +00:00
|
|
|
if ((animType->material & MATERIAL_SHININESS) != 0) {
|
2011-10-14 02:31:04 +00:00
|
|
|
const COLLADAFW::FloatOrParam *shin = &(efc->getShininess());
|
2018-04-06 12:42:38 +02:00
|
|
|
const COLLADAFW::UniqueId& listid = shin->getAnimationList();
|
|
|
|
|
Assign_float_animations(listid, &AnimCurves, "specular_hardness");
|
2011-10-14 02:31:04 +00:00
|
|
|
}
|
2011-07-27 17:43:32 +00:00
|
|
|
|
2012-03-28 05:03:24 +00:00
|
|
|
if ((animType->material & MATERIAL_IOR) != 0) {
|
2011-10-14 02:31:04 +00:00
|
|
|
const COLLADAFW::FloatOrParam *ior = &(efc->getIndexOfRefraction());
|
2018-04-06 12:42:38 +02:00
|
|
|
const COLLADAFW::UniqueId& listid = ior->getAnimationList();
|
|
|
|
|
Assign_float_animations(listid, &AnimCurves, "raytrace_transparency.ior");
|
2011-10-14 02:31:04 +00:00
|
|
|
}
|
2011-08-07 18:15:40 +00:00
|
|
|
|
2012-03-28 05:03:24 +00:00
|
|
|
if ((animType->material & MATERIAL_SPEC_COLOR) != 0) {
|
2011-10-14 02:31:04 +00:00
|
|
|
const COLLADAFW::ColorOrTexture *cot = &(efc->getSpecular());
|
2018-04-06 12:42:38 +02:00
|
|
|
const COLLADAFW::UniqueId& listid = cot->getColor().getAnimationList();
|
|
|
|
|
Assign_color_animations(listid, &AnimCurves, "specular_color");
|
2011-10-14 02:31:04 +00:00
|
|
|
}
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2012-03-28 05:03:24 +00:00
|
|
|
if ((animType->material & MATERIAL_DIFF_COLOR) != 0) {
|
2011-10-14 02:31:04 +00:00
|
|
|
const COLLADAFW::ColorOrTexture *cot = &(efc->getDiffuse());
|
2018-04-06 12:42:38 +02:00
|
|
|
const COLLADAFW::UniqueId& listid = cot->getColor().getAnimationList();
|
|
|
|
|
Assign_color_animations(listid, &AnimCurves, "diffuse_color");
|
2011-10-14 02:31:04 +00:00
|
|
|
}
|
2011-07-27 19:08:18 +00:00
|
|
|
}
|
2011-07-23 20:49:26 +00:00
|
|
|
}
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2011-07-23 20:49:26 +00:00
|
|
|
}
|
2015-09-11 19:12:25 +10:00
|
|
|
|
|
|
|
|
delete animType;
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
|
|
|
|
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
void AnimationImporter::add_bone_animation_sampled(Object *ob, std::vector<FCurve *>& animcurves, COLLADAFW::Node *root, COLLADAFW::Node *node, COLLADAFW::Transformation *tm)
|
2012-02-18 06:22:20 +00:00
|
|
|
{
|
|
|
|
|
const char *bone_name = bc_get_joint_name(node);
|
|
|
|
|
char joint_path[200];
|
|
|
|
|
armature_importer->get_rna_path_for_joint(node, joint_path, sizeof(joint_path));
|
|
|
|
|
|
|
|
|
|
std::vector<float> frames;
|
|
|
|
|
find_frames(&frames, &animcurves);
|
|
|
|
|
|
|
|
|
|
// convert degrees to radians
|
|
|
|
|
if (tm->getTransformationType() == COLLADAFW::Transformation::ROTATE) {
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *>::iterator iter;
|
2012-02-18 06:22:20 +00:00
|
|
|
for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
|
2012-06-12 22:05:33 +00:00
|
|
|
FCurve *fcu = *iter;
|
2012-02-18 06:22:20 +00:00
|
|
|
|
2012-10-21 05:46:41 +00:00
|
|
|
fcurve_deg_to_rad(fcu);
|
|
|
|
|
}
|
2012-02-18 06:22:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
float irest_dae[4][4];
|
|
|
|
|
float rest[4][4], irest[4][4];
|
|
|
|
|
|
|
|
|
|
get_joint_rest_mat(irest_dae, root, node);
|
|
|
|
|
invert_m4(irest_dae);
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
Bone *bone = BKE_armature_find_bone_name((bArmature *)ob->data, bone_name);
|
2012-02-18 06:22:20 +00:00
|
|
|
if (!bone) {
|
|
|
|
|
fprintf(stderr, "cannot find bone \"%s\"\n", bone_name);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unit_m4(rest);
|
|
|
|
|
copy_m4_m4(rest, bone->arm_mat);
|
|
|
|
|
invert_m4_m4(irest, rest);
|
|
|
|
|
|
|
|
|
|
// new curves to assign matrix transform animation
|
|
|
|
|
FCurve *newcu[10]; // if tm_type is matrix, then create 10 curves: 4 rot, 3 loc, 3 scale
|
2012-02-27 10:35:39 +00:00
|
|
|
unsigned int totcu = 10;
|
2012-02-18 06:22:20 +00:00
|
|
|
const char *tm_str = NULL;
|
|
|
|
|
char rna_path[200];
|
|
|
|
|
for (int i = 0; i < totcu; i++) {
|
|
|
|
|
|
|
|
|
|
int axis = i;
|
|
|
|
|
|
|
|
|
|
if (i < 4) {
|
|
|
|
|
tm_str = "rotation_quaternion";
|
|
|
|
|
axis = i;
|
|
|
|
|
}
|
|
|
|
|
else if (i < 7) {
|
|
|
|
|
tm_str = "location";
|
|
|
|
|
axis = i - 4;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
tm_str = "scale";
|
|
|
|
|
axis = i - 7;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BLI_snprintf(rna_path, sizeof(rna_path), "%s.%s", joint_path, tm_str);
|
|
|
|
|
|
|
|
|
|
newcu[i] = create_fcurve(axis, rna_path);
|
|
|
|
|
newcu[i]->totvert = frames.size();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (frames.size() == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
std::sort(frames.begin(), frames.end());
|
|
|
|
|
|
2018-02-16 12:37:36 +01:00
|
|
|
float qref[4];
|
|
|
|
|
unit_qt(qref);
|
|
|
|
|
|
2012-02-18 06:22:20 +00:00
|
|
|
std::vector<float>::iterator it;
|
|
|
|
|
|
|
|
|
|
// sample values at each frame
|
|
|
|
|
for (it = frames.begin(); it != frames.end(); it++) {
|
|
|
|
|
float fra = *it;
|
|
|
|
|
|
|
|
|
|
float mat[4][4];
|
|
|
|
|
float matfra[4][4];
|
|
|
|
|
|
|
|
|
|
unit_m4(matfra);
|
|
|
|
|
|
|
|
|
|
// calc object-space mat
|
|
|
|
|
evaluate_transform_at_frame(matfra, node, fra);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// for joints, we need a special matrix
|
|
|
|
|
// special matrix: iR * M * iR_dae * R
|
|
|
|
|
// where R, iR are bone rest and inverse rest mats in world space (Blender bones),
|
|
|
|
|
// iR_dae is joint inverse rest matrix (DAE) and M is an evaluated joint world-space matrix (DAE)
|
|
|
|
|
float temp[4][4], par[4][4];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// calc M
|
|
|
|
|
calc_joint_parent_mat_rest(par, NULL, root, node);
|
2013-05-26 18:36:25 +00:00
|
|
|
mul_m4_m4m4(temp, par, matfra);
|
2012-02-18 06:22:20 +00:00
|
|
|
|
2012-12-29 01:54:58 +00:00
|
|
|
// evaluate_joint_world_transform_at_frame(temp, NULL, node, fra);
|
2012-02-18 06:22:20 +00:00
|
|
|
|
|
|
|
|
// calc special matrix
|
2014-07-21 18:55:12 +10:00
|
|
|
mul_m4_series(mat, irest, temp, irest_dae, rest);
|
2012-02-18 06:22:20 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
float rot[4], loc[3], scale[3];
|
2012-02-18 06:22:20 +00:00
|
|
|
|
2018-02-16 12:37:36 +01:00
|
|
|
bc_rotate_from_reference_quat(rot, qref, mat);
|
|
|
|
|
copy_qt_qt(qref, rot);
|
|
|
|
|
|
2012-02-18 06:22:20 +00:00
|
|
|
copy_v3_v3(loc, mat[3]);
|
|
|
|
|
mat4_to_size(scale, mat);
|
|
|
|
|
|
|
|
|
|
// add keys
|
|
|
|
|
for (int i = 0; i < totcu; i++) {
|
|
|
|
|
if (i < 4)
|
|
|
|
|
add_bezt(newcu[i], fra, rot[i]);
|
|
|
|
|
else if (i < 7)
|
|
|
|
|
add_bezt(newcu[i], fra, loc[i - 4]);
|
|
|
|
|
else
|
|
|
|
|
add_bezt(newcu[i], fra, scale[i - 7]);
|
|
|
|
|
}
|
|
|
|
|
}
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
Main *bmain = CTX_data_main(mContext);
|
2018-06-07 12:47:00 +02:00
|
|
|
verify_adt_action(bmain, (ID *)&ob->id, 1);
|
2012-02-18 06:22:20 +00:00
|
|
|
|
|
|
|
|
// add curves
|
2012-06-12 22:05:33 +00:00
|
|
|
for (int i = 0; i < totcu; i++) {
|
2012-02-18 06:22:20 +00:00
|
|
|
add_bone_fcurve(ob, node, newcu[i]);
|
2015-09-11 18:41:35 +10:00
|
|
|
// fcurve_is_used(newcu[i]); // never added to unused
|
2012-02-18 06:22:20 +00:00
|
|
|
}
|
|
|
|
|
|
2012-05-05 16:03:57 +00:00
|
|
|
bPoseChannel *chan = BKE_pose_channel_find_name(ob->pose, bone_name);
|
2012-02-18 06:22:20 +00:00
|
|
|
chan->rotmode = ROT_MODE_QUAT;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2011-07-21 18:31:01 +00:00
|
|
|
|
2011-06-16 19:25:21 +00:00
|
|
|
//Check if object is animated by checking if animlist_map holds the animlist_id of node transforms
|
2012-06-12 22:05:33 +00:00
|
|
|
AnimationImporter::AnimMix *AnimationImporter::get_animation_type(const COLLADAFW::Node *node,
|
|
|
|
|
std::map<COLLADAFW::UniqueId, const COLLADAFW::Object *> FW_object_map)
|
2011-06-14 20:42:01 +00:00
|
|
|
{
|
2011-07-10 06:21:39 +00:00
|
|
|
AnimMix *types = new AnimMix();
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
const COLLADAFW::TransformationPointerArray& nodeTransforms = node->getTransformations();
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2018-06-08 08:07:48 +02:00
|
|
|
//for each transformation in node
|
2011-06-14 20:42:01 +00:00
|
|
|
for (unsigned int i = 0; i < nodeTransforms.getCount(); i++) {
|
|
|
|
|
COLLADAFW::Transformation *transform = nodeTransforms[i];
|
|
|
|
|
const COLLADAFW::UniqueId& listid = transform->getAnimationList();
|
2011-09-04 00:15:59 +00:00
|
|
|
|
|
|
|
|
//check if transformation has animations
|
2012-02-27 10:35:39 +00:00
|
|
|
if (animlist_map.find(listid) == animlist_map.end()) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else {
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
types->transform = types->transform | BC_NODE_TRANSFORM;
|
2011-06-14 20:42:01 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-07-03 11:07:34 +00:00
|
|
|
const COLLADAFW::InstanceLightPointerArray& nodeLights = node->getInstanceLights();
|
|
|
|
|
|
|
|
|
|
for (unsigned int i = 0; i < nodeLights.getCount(); i++) {
|
|
|
|
|
const COLLADAFW::Light *light = (COLLADAFW::Light *) FW_object_map[nodeLights[i]->getInstanciatedObjectId()];
|
2012-04-29 15:47:02 +00:00
|
|
|
types->light = setAnimType(&(light->getColor()), (types->light), LIGHT_COLOR);
|
|
|
|
|
types->light = setAnimType(&(light->getFallOffAngle()), (types->light), LIGHT_FOA);
|
|
|
|
|
types->light = setAnimType(&(light->getFallOffExponent()), (types->light), LIGHT_FOE);
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
if (types->light != 0) break;
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-07-03 11:07:34 +00:00
|
|
|
}
|
2011-07-06 18:09:36 +00:00
|
|
|
|
|
|
|
|
const COLLADAFW::InstanceCameraPointerArray& nodeCameras = node->getInstanceCameras();
|
|
|
|
|
for (unsigned int i = 0; i < nodeCameras.getCount(); i++) {
|
2012-08-04 21:25:19 +00:00
|
|
|
const COLLADAFW::Camera *camera = (COLLADAFW::Camera *) FW_object_map[nodeCameras[i]->getInstanciatedObjectId()];
|
2012-08-05 10:23:34 +00:00
|
|
|
if ( camera == NULL ) {
|
|
|
|
|
// Can happen if the node refers to an unknown camera.
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2012-08-04 21:25:19 +00:00
|
|
|
const bool is_perspective_type = camera->getCameraType() == COLLADAFW::Camera::PERSPECTIVE;
|
|
|
|
|
|
|
|
|
|
int addition;
|
|
|
|
|
const COLLADAFW::Animatable *mag;
|
|
|
|
|
const COLLADAFW::UniqueId listid = camera->getYMag().getAnimationList();
|
|
|
|
|
if (animlist_map.find(listid) != animlist_map.end()) {
|
|
|
|
|
mag = &(camera->getYMag());
|
|
|
|
|
addition = (is_perspective_type) ? CAMERA_YFOV: CAMERA_YMAG;
|
2011-07-07 16:56:56 +00:00
|
|
|
}
|
2012-04-28 06:31:57 +00:00
|
|
|
else {
|
2012-08-04 21:25:19 +00:00
|
|
|
mag = &(camera->getXMag());
|
|
|
|
|
addition = (is_perspective_type) ? CAMERA_XFOV: CAMERA_XMAG;
|
2011-07-09 19:33:02 +00:00
|
|
|
}
|
2012-08-04 21:25:19 +00:00
|
|
|
types->camera = setAnimType(mag, (types->camera), addition);
|
|
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
types->camera = setAnimType(&(camera->getFarClippingPlane()), (types->camera), CAMERA_ZFAR);
|
|
|
|
|
types->camera = setAnimType(&(camera->getNearClippingPlane()), (types->camera), CAMERA_ZNEAR);
|
2011-07-09 19:33:02 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
if (types->camera != 0) break;
|
2011-07-06 18:09:36 +00:00
|
|
|
|
2011-07-18 19:32:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const COLLADAFW::InstanceGeometryPointerArray& nodeGeoms = node->getInstanceGeometries();
|
|
|
|
|
for (unsigned int i = 0; i < nodeGeoms.getCount(); i++) {
|
|
|
|
|
const COLLADAFW::MaterialBindingArray& matBinds = nodeGeoms[i]->getMaterialBindings();
|
2011-07-21 18:31:01 +00:00
|
|
|
for (unsigned int j = 0; j < matBinds.getCount(); j++) {
|
2011-07-23 20:49:26 +00:00
|
|
|
const COLLADAFW::UniqueId & matuid = matBinds[j].getReferencedMaterial();
|
|
|
|
|
const COLLADAFW::Effect *ef = (COLLADAFW::Effect *) (FW_object_map[matuid]);
|
2011-10-14 02:31:04 +00:00
|
|
|
if (ef != NULL) { /* can be NULL [#28909] */
|
|
|
|
|
const COLLADAFW::CommonEffectPointerArray& commonEffects = ef->getCommonEffects();
|
2012-03-24 07:52:14 +00:00
|
|
|
if (!commonEffects.empty()) {
|
2011-10-14 02:31:04 +00:00
|
|
|
COLLADAFW::EffectCommon *efc = commonEffects[0];
|
2012-04-29 15:47:02 +00:00
|
|
|
types->material = setAnimType(&(efc->getShininess()), (types->material), MATERIAL_SHININESS);
|
|
|
|
|
types->material = setAnimType(&(efc->getSpecular().getColor()), (types->material), MATERIAL_SPEC_COLOR);
|
|
|
|
|
types->material = setAnimType(&(efc->getDiffuse().getColor()), (types->material), MATERIAL_DIFF_COLOR);
|
|
|
|
|
// types->material = setAnimType(&(efc->get()), (types->material), MATERIAL_TRANSPARENCY);
|
|
|
|
|
types->material = setAnimType(&(efc->getIndexOfRefraction()), (types->material), MATERIAL_IOR);
|
2011-10-14 02:31:04 +00:00
|
|
|
}
|
2011-09-04 02:12:03 +00:00
|
|
|
}
|
2011-07-18 19:32:51 +00:00
|
|
|
}
|
2011-07-06 18:09:36 +00:00
|
|
|
}
|
2011-07-09 15:15:17 +00:00
|
|
|
return types;
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
2011-06-16 19:25:21 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
int AnimationImporter::setAnimType(const COLLADAFW::Animatable *prop, int types, int addition)
|
2011-07-09 19:33:02 +00:00
|
|
|
{
|
2012-08-04 21:25:19 +00:00
|
|
|
int anim_type;
|
|
|
|
|
const COLLADAFW::UniqueId& listid = prop->getAnimationList();
|
2011-10-14 02:31:04 +00:00
|
|
|
if (animlist_map.find(listid) != animlist_map.end())
|
2012-08-04 21:25:19 +00:00
|
|
|
anim_type = types | addition;
|
|
|
|
|
else
|
|
|
|
|
anim_type = types;
|
|
|
|
|
|
|
|
|
|
return anim_type;
|
2018-06-08 08:07:48 +02:00
|
|
|
}
|
2011-07-09 19:33:02 +00:00
|
|
|
|
2011-08-17 18:29:01 +00:00
|
|
|
// Is not used anymore.
|
2012-06-12 22:05:33 +00:00
|
|
|
void AnimationImporter::find_frames_old(std::vector<float> *frames, COLLADAFW::Node *node, COLLADAFW::Transformation::TransformationType tm_type)
|
2011-06-14 20:42:01 +00:00
|
|
|
{
|
|
|
|
|
bool is_matrix = tm_type == COLLADAFW::Transformation::MATRIX;
|
|
|
|
|
bool is_rotation = tm_type == COLLADAFW::Transformation::ROTATE;
|
2010-10-05 00:05:14 +00:00
|
|
|
// for each <rotate>, <translate>, etc. there is a separate Transformation
|
2011-06-14 20:42:01 +00:00
|
|
|
const COLLADAFW::TransformationPointerArray& nodeTransforms = node->getTransformations();
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
unsigned int i;
|
|
|
|
|
// find frames at which to sample plus convert all rotation keys to radians
|
2011-06-14 20:42:01 +00:00
|
|
|
for (i = 0; i < nodeTransforms.getCount(); i++) {
|
|
|
|
|
COLLADAFW::Transformation *transform = nodeTransforms[i];
|
|
|
|
|
COLLADAFW::Transformation::TransformationType nodeTmType = transform->getTransformationType();
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
if (nodeTmType == tm_type) {
|
|
|
|
|
//get animation bindings for the current transformation
|
|
|
|
|
const COLLADAFW::UniqueId& listid = transform->getAnimationList();
|
|
|
|
|
//if transform is animated its animlist must exist.
|
2010-10-05 00:05:14 +00:00
|
|
|
if (animlist_map.find(listid) != animlist_map.end()) {
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
const COLLADAFW::AnimationList *animlist = animlist_map[listid];
|
|
|
|
|
const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
if (bindings.getCount()) {
|
2011-06-14 20:42:01 +00:00
|
|
|
//for each AnimationBinding get the fcurves which animate the transform
|
2010-10-05 00:05:14 +00:00
|
|
|
for (unsigned int j = 0; j < bindings.getCount(); j++) {
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *>& curves = curve_map[bindings[j].animation];
|
2011-06-14 20:42:01 +00:00
|
|
|
bool xyz = ((nodeTmType == COLLADAFW::Transformation::TRANSLATE || nodeTmType == COLLADAFW::Transformation::SCALE) && bindings[j].animationClass == COLLADAFW::AnimationList::POSITION_XYZ);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
if ((!xyz && curves.size() == 1) || (xyz && curves.size() == 3) || is_matrix) {
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *>::iterator iter;
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
for (iter = curves.begin(); iter != curves.end(); iter++) {
|
|
|
|
|
FCurve *fcu = *iter;
|
2011-09-04 00:15:59 +00:00
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
//if transform is rotation the fcurves values must be turned in to radian.
|
2010-10-05 00:05:14 +00:00
|
|
|
if (is_rotation)
|
|
|
|
|
fcurve_deg_to_rad(fcu);
|
|
|
|
|
|
|
|
|
|
for (unsigned int k = 0; k < fcu->totvert; k++) {
|
2011-06-14 20:42:01 +00:00
|
|
|
//get frame value from bezTriple
|
2010-10-05 00:05:14 +00:00
|
|
|
float fra = fcu->bezt[k].vec[1][0];
|
2011-06-14 20:42:01 +00:00
|
|
|
//if frame already not added add frame to frames
|
|
|
|
|
if (std::find(frames->begin(), frames->end(), fra) == frames->end())
|
|
|
|
|
frames->push_back(fra);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
2010-11-03 22:44:39 +00:00
|
|
|
fprintf(stderr, "expected %d curves, got %d\n", xyz ? 3 : 1, (int)curves.size());
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-06-14 20:42:01 +00:00
|
|
|
}
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
|
2011-08-17 18:29:01 +00:00
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
// prerequisites:
|
|
|
|
|
// animlist_map - map animlist id -> animlist
|
|
|
|
|
// curve_map - map anim id -> curve(s)
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node,
|
2012-06-12 22:05:33 +00:00
|
|
|
std::map<COLLADAFW::UniqueId, Object *>& object_map,
|
|
|
|
|
std::map<COLLADAFW::UniqueId, COLLADAFW::Node *>& root_map,
|
|
|
|
|
COLLADAFW::Transformation::TransformationType tm_type,
|
|
|
|
|
Object *par_job)
|
2011-06-14 20:42:01 +00:00
|
|
|
{
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
bool is_rotation = tm_type == COLLADAFW::Transformation::ROTATE;
|
|
|
|
|
bool is_matrix = tm_type == COLLADAFW::Transformation::MATRIX;
|
|
|
|
|
bool is_joint = node->getType() == COLLADAFW::Node::JOINT;
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
COLLADAFW::Node *root = root_map.find(node->getUniqueId()) == root_map.end() ? node : root_map[node->getUniqueId()];
|
|
|
|
|
Object *ob = is_joint ? armature_importer->get_armature_for_joint(node) : object_map[node->getUniqueId()];
|
|
|
|
|
const char *bone_name = is_joint ? bc_get_joint_name(node) : NULL;
|
|
|
|
|
if (!ob) {
|
|
|
|
|
fprintf(stderr, "cannot find Object for Node with id=\"%s\"\n", node->getOriginalId().c_str());
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// frames at which to sample
|
|
|
|
|
std::vector<float> frames;
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
find_frames_old(&frames, node, tm_type);
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2011-06-14 20:42:01 +00:00
|
|
|
unsigned int i;
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
float irest_dae[4][4];
|
|
|
|
|
float rest[4][4], irest[4][4];
|
|
|
|
|
|
|
|
|
|
if (is_joint) {
|
|
|
|
|
get_joint_rest_mat(irest_dae, root, node);
|
|
|
|
|
invert_m4(irest_dae);
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
Bone *bone = BKE_armature_find_bone_name((bArmature *)ob->data, bone_name);
|
2010-10-05 00:05:14 +00:00
|
|
|
if (!bone) {
|
|
|
|
|
fprintf(stderr, "cannot find bone \"%s\"\n", bone_name);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unit_m4(rest);
|
|
|
|
|
copy_m4_m4(rest, bone->arm_mat);
|
|
|
|
|
invert_m4_m4(irest, rest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Object *job = NULL;
|
|
|
|
|
|
|
|
|
|
#ifdef ARMATURE_TEST
|
|
|
|
|
FCurve *job_curves[10];
|
|
|
|
|
job = get_joint_object(root, node, par_job);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (frames.size() == 0)
|
|
|
|
|
return job;
|
|
|
|
|
|
|
|
|
|
std::sort(frames.begin(), frames.end());
|
|
|
|
|
|
|
|
|
|
const char *tm_str = NULL;
|
|
|
|
|
switch (tm_type) {
|
2012-06-12 22:05:33 +00:00
|
|
|
case COLLADAFW::Transformation::ROTATE:
|
|
|
|
|
tm_str = "rotation_quaternion";
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::SCALE:
|
|
|
|
|
tm_str = "scale";
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::TRANSLATE:
|
|
|
|
|
tm_str = "location";
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::MATRIX:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return job;
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char rna_path[200];
|
|
|
|
|
char joint_path[200];
|
|
|
|
|
|
|
|
|
|
if (is_joint)
|
|
|
|
|
armature_importer->get_rna_path_for_joint(node, joint_path, sizeof(joint_path));
|
|
|
|
|
|
|
|
|
|
// new curves
|
|
|
|
|
FCurve *newcu[10]; // if tm_type is matrix, then create 10 curves: 4 rot, 3 loc, 3 scale
|
|
|
|
|
unsigned int totcu = is_matrix ? 10 : (is_rotation ? 4 : 3);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < totcu; i++) {
|
|
|
|
|
|
|
|
|
|
int axis = i;
|
|
|
|
|
|
|
|
|
|
if (is_matrix) {
|
|
|
|
|
if (i < 4) {
|
|
|
|
|
tm_str = "rotation_quaternion";
|
|
|
|
|
axis = i;
|
|
|
|
|
}
|
|
|
|
|
else if (i < 7) {
|
|
|
|
|
tm_str = "location";
|
|
|
|
|
axis = i - 4;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
tm_str = "scale";
|
|
|
|
|
axis = i - 7;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_joint)
|
|
|
|
|
BLI_snprintf(rna_path, sizeof(rna_path), "%s.%s", joint_path, tm_str);
|
|
|
|
|
else
|
2011-10-19 23:10:54 +00:00
|
|
|
BLI_strncpy(rna_path, tm_str, sizeof(rna_path));
|
2010-10-05 00:05:14 +00:00
|
|
|
newcu[i] = create_fcurve(axis, rna_path);
|
|
|
|
|
|
|
|
|
|
#ifdef ARMATURE_TEST
|
|
|
|
|
if (is_joint)
|
|
|
|
|
job_curves[i] = create_fcurve(axis, tm_str);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::vector<float>::iterator it;
|
|
|
|
|
|
|
|
|
|
// sample values at each frame
|
|
|
|
|
for (it = frames.begin(); it != frames.end(); it++) {
|
|
|
|
|
float fra = *it;
|
|
|
|
|
|
|
|
|
|
float mat[4][4];
|
|
|
|
|
float matfra[4][4];
|
|
|
|
|
|
|
|
|
|
unit_m4(matfra);
|
|
|
|
|
|
|
|
|
|
// calc object-space mat
|
|
|
|
|
evaluate_transform_at_frame(matfra, node, fra);
|
|
|
|
|
|
|
|
|
|
// for joints, we need a special matrix
|
|
|
|
|
if (is_joint) {
|
|
|
|
|
// special matrix: iR * M * iR_dae * R
|
|
|
|
|
// where R, iR are bone rest and inverse rest mats in world space (Blender bones),
|
|
|
|
|
// iR_dae is joint inverse rest matrix (DAE) and M is an evaluated joint world-space matrix (DAE)
|
|
|
|
|
float temp[4][4], par[4][4];
|
|
|
|
|
|
|
|
|
|
// calc M
|
|
|
|
|
calc_joint_parent_mat_rest(par, NULL, root, node);
|
2013-05-26 18:36:25 +00:00
|
|
|
mul_m4_m4m4(temp, par, matfra);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2012-12-29 01:54:58 +00:00
|
|
|
// evaluate_joint_world_transform_at_frame(temp, NULL, node, fra);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
// calc special matrix
|
2014-07-21 18:55:12 +10:00
|
|
|
mul_m4_series(mat, irest, temp, irest_dae, rest);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
copy_m4_m4(mat, matfra);
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-11 19:51:16 +01:00
|
|
|
float val[4] = {};
|
|
|
|
|
float rot[4], loc[3], scale[3];
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
switch (tm_type) {
|
2012-06-12 22:05:33 +00:00
|
|
|
case COLLADAFW::Transformation::ROTATE:
|
|
|
|
|
mat4_to_quat(val, mat);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::SCALE:
|
|
|
|
|
mat4_to_size(val, mat);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::TRANSLATE:
|
|
|
|
|
copy_v3_v3(val, mat[3]);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::MATRIX:
|
|
|
|
|
mat4_to_quat(rot, mat);
|
|
|
|
|
copy_v3_v3(loc, mat[3]);
|
|
|
|
|
mat4_to_size(scale, mat);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// add keys
|
|
|
|
|
for (i = 0; i < totcu; i++) {
|
|
|
|
|
if (is_matrix) {
|
|
|
|
|
if (i < 4)
|
|
|
|
|
add_bezt(newcu[i], fra, rot[i]);
|
|
|
|
|
else if (i < 7)
|
|
|
|
|
add_bezt(newcu[i], fra, loc[i - 4]);
|
|
|
|
|
else
|
|
|
|
|
add_bezt(newcu[i], fra, scale[i - 7]);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
add_bezt(newcu[i], fra, val[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef ARMATURE_TEST
|
|
|
|
|
if (is_joint) {
|
|
|
|
|
switch (tm_type) {
|
2012-06-12 22:05:33 +00:00
|
|
|
case COLLADAFW::Transformation::ROTATE:
|
|
|
|
|
mat4_to_quat(val, matfra);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::SCALE:
|
|
|
|
|
mat4_to_size(val, matfra);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::TRANSLATE:
|
|
|
|
|
copy_v3_v3(val, matfra[3]);
|
|
|
|
|
break;
|
|
|
|
|
case MATRIX:
|
|
|
|
|
mat4_to_quat(rot, matfra);
|
|
|
|
|
copy_v3_v3(loc, matfra[3]);
|
|
|
|
|
mat4_to_size(scale, matfra);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < totcu; i++) {
|
|
|
|
|
if (is_matrix) {
|
|
|
|
|
if (i < 4)
|
|
|
|
|
add_bezt(job_curves[i], fra, rot[i]);
|
|
|
|
|
else if (i < 7)
|
|
|
|
|
add_bezt(job_curves[i], fra, loc[i - 4]);
|
|
|
|
|
else
|
|
|
|
|
add_bezt(job_curves[i], fra, scale[i - 7]);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
add_bezt(job_curves[i], fra, val[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
Main *bmain = CTX_data_main(mContext);
|
2018-06-07 12:47:00 +02:00
|
|
|
verify_adt_action(bmain, (ID *)&ob->id, 1);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
ListBase *curves = &ob->adt->action->curves;
|
|
|
|
|
|
|
|
|
|
// add curves
|
|
|
|
|
for (i = 0; i < totcu; i++) {
|
|
|
|
|
if (is_joint)
|
|
|
|
|
add_bone_fcurve(ob, node, newcu[i]);
|
|
|
|
|
else
|
|
|
|
|
BLI_addtail(curves, newcu[i]);
|
|
|
|
|
|
|
|
|
|
#ifdef ARMATURE_TEST
|
|
|
|
|
if (is_joint)
|
|
|
|
|
BLI_addtail(&job->adt->action->curves, job_curves[i]);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_rotation || is_matrix) {
|
|
|
|
|
if (is_joint) {
|
2012-05-05 16:03:57 +00:00
|
|
|
bPoseChannel *chan = BKE_pose_channel_find_name(ob->pose, bone_name);
|
2010-10-05 00:05:14 +00:00
|
|
|
chan->rotmode = ROT_MODE_QUAT;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
ob->rotmode = ROT_MODE_QUAT;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return job;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// internal, better make it private
|
2011-08-17 18:29:01 +00:00
|
|
|
// warning: evaluates only rotation and only assigns matrix transforms now
|
2010-10-05 00:05:14 +00:00
|
|
|
// prerequisites: animlist_map, curve_map
|
|
|
|
|
void AnimationImporter::evaluate_transform_at_frame(float mat[4][4], COLLADAFW::Node *node, float fra)
|
|
|
|
|
{
|
|
|
|
|
const COLLADAFW::TransformationPointerArray& tms = node->getTransformations();
|
|
|
|
|
|
|
|
|
|
unit_m4(mat);
|
|
|
|
|
|
|
|
|
|
for (unsigned int i = 0; i < tms.getCount(); i++) {
|
|
|
|
|
COLLADAFW::Transformation *tm = tms[i];
|
|
|
|
|
COLLADAFW::Transformation::TransformationType type = tm->getTransformationType();
|
|
|
|
|
float m[4][4];
|
|
|
|
|
|
|
|
|
|
unit_m4(m);
|
|
|
|
|
|
2011-06-20 12:43:10 +00:00
|
|
|
std::string nodename = node->getName().size() ? node->getName() : node->getOriginalId();
|
|
|
|
|
if (!evaluate_animation(tm, m, fra, nodename.c_str())) {
|
2012-02-18 06:22:20 +00:00
|
|
|
switch (type) {
|
2012-06-12 22:05:33 +00:00
|
|
|
case COLLADAFW::Transformation::ROTATE:
|
|
|
|
|
dae_rotate_to_mat4(tm, m);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::TRANSLATE:
|
|
|
|
|
dae_translate_to_mat4(tm, m);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::SCALE:
|
|
|
|
|
dae_scale_to_mat4(tm, m);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::MATRIX:
|
|
|
|
|
dae_matrix_to_mat4(tm, m);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
fprintf(stderr, "unsupported transformation type %d\n", type);
|
2012-02-18 06:22:20 +00:00
|
|
|
}
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
float temp[4][4];
|
|
|
|
|
copy_m4_m4(temp, mat);
|
|
|
|
|
|
2013-05-26 18:36:25 +00:00
|
|
|
mul_m4_m4m4(mat, temp, m);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-08 08:07:48 +02:00
|
|
|
static void report_class_type_unsupported(const char *path,
|
2013-07-15 10:50:04 +00:00
|
|
|
const COLLADAFW::AnimationList::AnimationClass animclass,
|
2018-06-08 08:07:48 +02:00
|
|
|
const COLLADAFW::Transformation::TransformationType type)
|
2013-07-15 10:50:04 +00:00
|
|
|
{
|
|
|
|
|
if (animclass == COLLADAFW::AnimationList::UNKNOWN_CLASS) {
|
|
|
|
|
fprintf(stderr, "%s: UNKNOWN animation class\n", path);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
fprintf(stderr, "%s: animation class %d is not supported yet for transformation type %d\n", path, animclass, type);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
// return true to indicate that mat contains a sane value
|
|
|
|
|
bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float mat[4][4], float fra, const char *node_id)
|
|
|
|
|
{
|
|
|
|
|
const COLLADAFW::UniqueId& listid = tm->getAnimationList();
|
|
|
|
|
COLLADAFW::Transformation::TransformationType type = tm->getTransformationType();
|
|
|
|
|
|
|
|
|
|
if (type != COLLADAFW::Transformation::ROTATE &&
|
2012-06-12 22:05:33 +00:00
|
|
|
type != COLLADAFW::Transformation::SCALE &&
|
|
|
|
|
type != COLLADAFW::Transformation::TRANSLATE &&
|
2018-04-16 18:13:48 +02:00
|
|
|
type != COLLADAFW::Transformation::MATRIX)
|
|
|
|
|
{
|
2010-10-05 00:05:14 +00:00
|
|
|
fprintf(stderr, "animation of transformation %d is not supported yet\n", type);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (animlist_map.find(listid) == animlist_map.end())
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
const COLLADAFW::AnimationList *animlist = animlist_map[listid];
|
|
|
|
|
const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
|
|
|
|
|
|
|
|
|
|
if (bindings.getCount()) {
|
|
|
|
|
float vec[3];
|
|
|
|
|
|
|
|
|
|
bool is_scale = (type == COLLADAFW::Transformation::SCALE);
|
|
|
|
|
bool is_translate = (type == COLLADAFW::Transformation::TRANSLATE);
|
|
|
|
|
|
2011-08-12 20:38:29 +00:00
|
|
|
if (is_scale)
|
2010-10-05 00:05:14 +00:00
|
|
|
dae_scale_to_v3(tm, vec);
|
2011-08-12 20:38:29 +00:00
|
|
|
else if (is_translate)
|
2010-10-05 00:05:14 +00:00
|
|
|
dae_translate_to_v3(tm, vec);
|
|
|
|
|
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
for (unsigned int index = 0; index < bindings.getCount(); index++) {
|
|
|
|
|
const COLLADAFW::AnimationList::AnimationBinding& binding = bindings[index];
|
2012-06-12 22:05:33 +00:00
|
|
|
std::vector<FCurve *>& curves = curve_map[binding.animation];
|
2010-10-05 00:05:14 +00:00
|
|
|
COLLADAFW::AnimationList::AnimationClass animclass = binding.animationClass;
|
|
|
|
|
char path[100];
|
|
|
|
|
|
|
|
|
|
switch (type) {
|
2012-06-12 22:05:33 +00:00
|
|
|
case COLLADAFW::Transformation::ROTATE:
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
BLI_snprintf(path, sizeof(path), "%s.rotate (binding %u)", node_id, index);
|
2012-06-12 22:05:33 +00:00
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::SCALE:
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
BLI_snprintf(path, sizeof(path), "%s.scale (binding %u)", node_id, index);
|
2012-06-12 22:05:33 +00:00
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::TRANSLATE:
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
BLI_snprintf(path, sizeof(path), "%s.translate (binding %u)", node_id, index);
|
2012-06-12 22:05:33 +00:00
|
|
|
break;
|
|
|
|
|
case COLLADAFW::Transformation::MATRIX:
|
Partial rewrite of the Collada Module for Blender 2.8
Most important changes are in the Animation exporter and Animation Importer.
There is still some cleaning up to be done. But the Exporter/Importer basically
work within Blender 2.8
Some details:
User Interface:
The interface has been reorganized to look more like the FBX interface.
New options in user interface:
* keep_keyframes:
When sampling the distance between 2 keyframes is defined by
the sampling rate. Furthermore the keyframes defined in the
FCurves are not exported. However when this option is enabled
then also the defined keyframes will be added to the exported fcurves
* keep_smooth_curves:
When sampling we do not use FCurves. So we also have no Curve handles
for smooth exporting. However when this option is enabled, Blender
does its best to recreate the handles for export. This is a very
experimental feature and it is know to break when:
- the exported animated objects have parent inverse matrices
different from the unit matrix
- The exported objects have negative scaling
There may be many other situations when this feature breaks.
This needs to be further tested. It may be removed later or replaced
by something less wonky.
BlenderContext:
is a new class that contains the bridge to Blender. It contains
pointers to the current export/import context plus derived values
of Depsgraph, Scene, Main
Reporting:
I reorganized the output on the Blender Console to become more
informative and more readable
Preservation of Item names:
name attributes are now encoded with XML entities. This makes
sure that i can export/import names exactly defined in the tool.
This affects material names, bone names and object names.
Hierarchy export:
* Object and Bone Hierarchies are now exported correctly
by taking the Blender parent/child hierarchy into account
* Export also not selected intermediate objects
Problem:
When we export an Object Hierarchy, then we must export
all elements of the hierarchy to maintain the transforms. This
is especially important when exporting animated objects, because the
animation curves are exported as relative curves based on the
parent-child hierarchy. If an intermediate animated object is missing
then the exported animation breaks.
Solution:
If the "Selected" Optioon is enabled, then take care
to also export all objects which are not selected and hidden,
but which are parents of selected objects.
Node Based Material Importer (wip):
Added basic support for Materials with diffuse color and
diffuse textures. More properties (opacity, emission) need
changes in the used shader.
Note: Materials are all constructed by using the principled BSDF shader.
Animation Exporter:
* Massive optimization of the Animation Bake tool (Animation Sampler).
Instead of sampling each fcurve separately, i now sample all
exported fcurves simultaneously. So i avoid many (many!)
scene updates during animation export.
* Add support for Continuous Acceleration (Fcurve handles)
This allows us to create smoother FCurves during importing Collada
Animation curves. Possibly this should become an option ionstead of
a fixed import feature.
* Add support for sampling curves (to bake animations)
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
Known issues:
* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)
* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth (probably it can not be solved).
* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
* Support for Animation Clip export
Added one extra level to the exported animations
such that now all scene animations are enclosed:
<Animation name="id_name(ob)_Action">
<Animation>...</Animation>
...
</Animation>
Animation Importer:
* Import of animations for objects with multiple materials
When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.
Error handling (wip):
The Importer was a bit confused as it sometimes ignored fatal
parsing errors and continued to import. I did my best to
unconfuse it, but i believe that this needs to be tested more.
Refactoring:
update : move generation of effect id names into own function
update : adjust importer/exporter for no longer supported HEMI lights
cleanup: Removed no lopnger existing attribute from the exporter presets
cleanup: Removed not needed Context attribute from DocumentExporter
fix : Avoid duplicate deletion of temporary items
cleanup: fixed indentation and white space issues
update : Make BCAnimation class more self contained
cleanup: Renamed classes, updated comments for better reading
cleanup: Moved static class functions to collada_utils
cleanup: Moved typedefs to more intuitive locations
cleanup: indentation and class method declarations
cleanup: Removed no longer needed methods
update : Moved Classes into separate files
cleanup: Added comments
cleanup: take care of name conventions
... : many more small changes, not helpful to list them all
2018-11-23 15:57:45 +01:00
|
|
|
BLI_snprintf(path, sizeof(path), "%s.matrix (binding %u)", node_id, index);
|
2012-06-12 22:05:33 +00:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (type == COLLADAFW::Transformation::ROTATE) {
|
|
|
|
|
if (curves.size() != 1) {
|
2010-11-03 22:44:39 +00:00
|
|
|
fprintf(stderr, "expected 1 curve, got %d\n", (int)curves.size());
|
2010-10-05 00:05:14 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO support other animclasses
|
|
|
|
|
if (animclass != COLLADAFW::AnimationList::ANGLE) {
|
2013-07-15 10:50:04 +00:00
|
|
|
report_class_type_unsupported(path, animclass, type);
|
2010-10-05 00:05:14 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
COLLADABU::Math::Vector3& axis = ((COLLADAFW::Rotate *)tm)->getRotationAxis();
|
2012-02-18 06:22:20 +00:00
|
|
|
|
2012-04-28 06:31:57 +00:00
|
|
|
float ax[3] = {(float)axis[0], (float)axis[1], (float)axis[2]};
|
2010-10-05 00:05:14 +00:00
|
|
|
float angle = evaluate_fcurve(curves[0], fra);
|
|
|
|
|
axis_angle_to_mat4(mat, ax, angle);
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
else if (is_scale || is_translate) {
|
|
|
|
|
bool is_xyz = animclass == COLLADAFW::AnimationList::POSITION_XYZ;
|
|
|
|
|
|
|
|
|
|
if ((!is_xyz && curves.size() != 1) || (is_xyz && curves.size() != 3)) {
|
|
|
|
|
if (is_xyz)
|
2010-11-03 22:44:39 +00:00
|
|
|
fprintf(stderr, "%s: expected 3 curves, got %d\n", path, (int)curves.size());
|
2010-10-05 00:05:14 +00:00
|
|
|
else
|
2010-11-03 22:44:39 +00:00
|
|
|
fprintf(stderr, "%s: expected 1 curve, got %d\n", path, (int)curves.size());
|
2010-10-05 00:05:14 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
switch (animclass) {
|
2012-06-12 22:05:33 +00:00
|
|
|
case COLLADAFW::AnimationList::POSITION_X:
|
|
|
|
|
vec[0] = evaluate_fcurve(curves[0], fra);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::AnimationList::POSITION_Y:
|
|
|
|
|
vec[1] = evaluate_fcurve(curves[0], fra);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::AnimationList::POSITION_Z:
|
|
|
|
|
vec[2] = evaluate_fcurve(curves[0], fra);
|
|
|
|
|
break;
|
|
|
|
|
case COLLADAFW::AnimationList::POSITION_XYZ:
|
|
|
|
|
vec[0] = evaluate_fcurve(curves[0], fra);
|
|
|
|
|
vec[1] = evaluate_fcurve(curves[1], fra);
|
|
|
|
|
vec[2] = evaluate_fcurve(curves[2], fra);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2013-07-15 10:50:04 +00:00
|
|
|
report_class_type_unsupported(path, animclass, type);
|
2012-06-12 22:05:33 +00:00
|
|
|
break;
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (type == COLLADAFW::Transformation::MATRIX) {
|
|
|
|
|
// for now, of matrix animation, support only the case when all values are packed into one animation
|
|
|
|
|
if (curves.size() != 16) {
|
2010-11-03 22:44:39 +00:00
|
|
|
fprintf(stderr, "%s: expected 16 curves, got %d\n", path, (int)curves.size());
|
2010-10-05 00:05:14 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
COLLADABU::Math::Matrix4 matrix;
|
2018-03-11 19:57:40 +01:00
|
|
|
int mi = 0, mj = 0;
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
for (std::vector<FCurve *>::iterator it = curves.begin(); it != curves.end(); it++) {
|
2018-03-11 19:57:40 +01:00
|
|
|
matrix.setElement(mi, mj, evaluate_fcurve(*it, fra));
|
|
|
|
|
mj++;
|
|
|
|
|
if (mj == 4) {
|
|
|
|
|
mi++;
|
|
|
|
|
mj = 0;
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
2015-09-11 18:41:35 +10:00
|
|
|
fcurve_is_used(*it);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
2018-02-27 17:02:37 +01:00
|
|
|
unit_converter->dae_matrix_to_mat4_(mat, matrix);
|
2010-10-05 00:05:14 +00:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_scale)
|
|
|
|
|
size_to_mat4(mat, vec);
|
|
|
|
|
else
|
|
|
|
|
copy_v3_v3(mat[3], vec);
|
|
|
|
|
|
|
|
|
|
return is_scale || is_translate;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// gives a world-space mat of joint at rest position
|
|
|
|
|
void AnimationImporter::get_joint_rest_mat(float mat[4][4], COLLADAFW::Node *root, COLLADAFW::Node *node)
|
|
|
|
|
{
|
|
|
|
|
// if bind mat is not available,
|
|
|
|
|
// use "current" node transform, i.e. all those tms listed inside <node>
|
|
|
|
|
if (!armature_importer->get_joint_bind_mat(mat, node)) {
|
|
|
|
|
float par[4][4], m[4][4];
|
|
|
|
|
|
|
|
|
|
calc_joint_parent_mat_rest(par, NULL, root, node);
|
|
|
|
|
get_node_mat(m, node, NULL, NULL);
|
2013-05-26 18:36:25 +00:00
|
|
|
mul_m4_m4m4(mat, par, m);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// gives a world-space mat, end's mat not included
|
|
|
|
|
bool AnimationImporter::calc_joint_parent_mat_rest(float mat[4][4], float par[4][4], COLLADAFW::Node *node, COLLADAFW::Node *end)
|
|
|
|
|
{
|
|
|
|
|
float m[4][4];
|
|
|
|
|
|
|
|
|
|
if (node == end) {
|
|
|
|
|
par ? copy_m4_m4(mat, par) : unit_m4(mat);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// use bind matrix if available or calc "current" world mat
|
|
|
|
|
if (!armature_importer->get_joint_bind_mat(m, node)) {
|
|
|
|
|
if (par) {
|
|
|
|
|
float temp[4][4];
|
|
|
|
|
get_node_mat(temp, node, NULL, NULL);
|
2013-05-26 18:36:25 +00:00
|
|
|
mul_m4_m4m4(m, par, temp);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
get_node_mat(m, node, NULL, NULL);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
COLLADAFW::NodePointerArray& children = node->getChildNodes();
|
|
|
|
|
for (unsigned int i = 0; i < children.getCount(); i++) {
|
|
|
|
|
if (calc_joint_parent_mat_rest(mat, m, children[i], end))
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef ARMATURE_TEST
|
|
|
|
|
Object *AnimationImporter::get_joint_object(COLLADAFW::Node *root, COLLADAFW::Node *node, Object *par_job)
|
|
|
|
|
{
|
|
|
|
|
if (joint_objects.find(node->getUniqueId()) == joint_objects.end()) {
|
2012-06-12 22:05:33 +00:00
|
|
|
Object *job = bc_add_object(scene, OB_EMPTY, (char *)get_joint_name(node));
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2012-05-05 14:33:36 +00:00
|
|
|
job->lay = BKE_scene_base_find(scene, job)->lay = 2;
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2019-02-18 15:43:06 +11:00
|
|
|
mul_v3_fl(job->scale, 0.5f);
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&job->id, ID_RECALC_TRANSFORM);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
verify_adt_action((ID *)&job->id, 1);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
job->rotmode = ROT_MODE_QUAT;
|
|
|
|
|
|
|
|
|
|
float mat[4][4];
|
|
|
|
|
get_joint_rest_mat(mat, root, node);
|
|
|
|
|
|
|
|
|
|
if (par_job) {
|
|
|
|
|
float temp[4][4], ipar[4][4];
|
|
|
|
|
invert_m4_m4(ipar, par_job->obmat);
|
|
|
|
|
copy_m4_m4(temp, mat);
|
2013-05-26 18:36:25 +00:00
|
|
|
mul_m4_m4m4(mat, ipar, temp);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
|
2019-02-18 15:43:06 +11:00
|
|
|
bc_decompose(mat, job->loc, NULL, job->quat, job->scale);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
if (par_job) {
|
|
|
|
|
job->parent = par_job;
|
|
|
|
|
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&par_job->id, ID_RECALC_TRANSFORM);
|
2010-10-05 00:05:14 +00:00
|
|
|
job->parsubstr[0] = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-05 14:03:12 +00:00
|
|
|
BKE_object_where_is_calc(scene, job);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
// after parenting and layer change
|
2017-06-08 10:14:53 +02:00
|
|
|
DEG_relations_tag_update(CTX_data_main(C));
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
joint_objects[node->getUniqueId()] = job;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return joint_objects[node->getUniqueId()];
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
// recursively evaluates joint tree until end is found, mat then is world-space matrix of end
|
|
|
|
|
// mat must be identity on enter, node must be root
|
|
|
|
|
bool AnimationImporter::evaluate_joint_world_transform_at_frame(float mat[4][4], float par[4][4], COLLADAFW::Node *node, COLLADAFW::Node *end, float fra)
|
|
|
|
|
{
|
|
|
|
|
float m[4][4];
|
|
|
|
|
if (par) {
|
|
|
|
|
float temp[4][4];
|
|
|
|
|
evaluate_transform_at_frame(temp, node, node == end ? fra : 0.0f);
|
2013-05-26 18:36:25 +00:00
|
|
|
mul_m4_m4m4(m, par, temp);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
evaluate_transform_at_frame(m, node, node == end ? fra : 0.0f);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (node == end) {
|
|
|
|
|
copy_m4_m4(mat, m);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
COLLADAFW::NodePointerArray& children = node->getChildNodes();
|
|
|
|
|
for (int i = 0; i < children.getCount(); i++) {
|
|
|
|
|
if (evaluate_joint_world_transform_at_frame(mat, m, children[i], end, fra))
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
void AnimationImporter::add_bone_fcurve(Object *ob, COLLADAFW::Node *node, FCurve *fcu)
|
|
|
|
|
{
|
|
|
|
|
const char *bone_name = bc_get_joint_name(node);
|
|
|
|
|
bAction *act = ob->adt->action;
|
2018-06-08 08:07:48 +02:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
/* try to find group */
|
2012-05-05 16:03:57 +00:00
|
|
|
bActionGroup *grp = BKE_action_group_find_name(act, bone_name);
|
2010-10-05 00:05:14 +00:00
|
|
|
|
|
|
|
|
/* no matching groups, so add one */
|
|
|
|
|
if (grp == NULL) {
|
|
|
|
|
/* Add a new group, and make it active */
|
2012-06-12 22:05:33 +00:00
|
|
|
grp = (bActionGroup *)MEM_callocN(sizeof(bActionGroup), "bActionGroup");
|
2013-03-25 08:29:06 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
grp->flag = AGRP_SELECTED;
|
|
|
|
|
BLI_strncpy(grp->name, bone_name, sizeof(grp->name));
|
2013-03-25 08:29:06 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
BLI_addtail(&act->groups, grp);
|
2015-08-16 17:32:01 +10:00
|
|
|
BLI_uniquename(&act->groups, grp, CTX_DATA_(BLT_I18NCONTEXT_ID_ACTION, "Group"), '.',
|
2013-03-25 08:29:06 +00:00
|
|
|
offsetof(bActionGroup, name), 64);
|
2010-10-05 00:05:14 +00:00
|
|
|
}
|
2013-03-25 08:29:06 +00:00
|
|
|
|
2010-10-05 00:05:14 +00:00
|
|
|
/* add F-Curve to group */
|
|
|
|
|
action_groups_add_channel(act, grp, fcu);
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-14 16:14:32 +00:00
|
|
|
|
2014-02-03 13:04:51 +01:00
|
|
|
void AnimationImporter::set_import_from_version(std::string import_from_version)
|
|
|
|
|
{
|
|
|
|
|
this->import_from_version = import_from_version;
|
|
|
|
|
}
|
