[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55085] trunk/blender/source/blender: Collada: Added option for how rot, loc, trans data is exported ( improves flexibility for support of other 3D tools)
Gaia Clary
gaia.clary at machinimatrix.org
Thu Mar 7 00:21:52 CET 2013
Revision: 55085
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55085
Author: gaiaclary
Date: 2013-03-06 23:21:52 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
Collada: Added option for how rot,loc,trans data is exported (improves flexibility for support of other 3D tools)
Modified Paths:
--------------
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/AnimationExporter.h
trunk/blender/source/blender/collada/DocumentExporter.cpp
trunk/blender/source/blender/collada/ExportSettings.h
trunk/blender/source/blender/collada/SceneExporter.cpp
trunk/blender/source/blender/collada/SceneExporter.h
trunk/blender/source/blender/collada/TransformWriter.cpp
trunk/blender/source/blender/collada/TransformWriter.h
trunk/blender/source/blender/collada/collada.cpp
trunk/blender/source/blender/collada/collada.h
trunk/blender/source/blender/editors/io/io_collada.c
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
Modified: trunk/blender/source/blender/collada/AnimationExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-03-06 22:54:44 UTC (rev 55084)
+++ trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-03-06 23:21:52 UTC (rev 55085)
@@ -36,9 +36,10 @@
}
}
-void AnimationExporter::exportAnimations(Scene *sce)
+bool AnimationExporter::exportAnimations(Scene *sce)
{
- if (hasAnimations(sce)) {
+ bool has_animations = hasAnimations(sce);
+ if (has_animations) {
this->scene = sce;
openLibrary();
@@ -47,6 +48,7 @@
closeLibrary();
}
+ return has_animations;
}
// called for each exported object
Modified: trunk/blender/source/blender/collada/AnimationExporter.h
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.h 2013-03-06 22:54:44 UTC (rev 55084)
+++ trunk/blender/source/blender/collada/AnimationExporter.h 2013-03-06 23:21:52 UTC (rev 55085)
@@ -98,7 +98,7 @@
{ this->sw = sw; }
- void exportAnimations(Scene *sce);
+ bool exportAnimations(Scene *sce);
// called for each exported object
void operator() (Object *ob);
Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp 2013-03-06 22:54:44 UTC (rev 55084)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp 2013-03-06 23:21:52 UTC (rev 55085)
@@ -266,7 +266,7 @@
// <library_animations>
AnimationExporter ae(&sw, this->export_settings);
- ae.exportAnimations(sce);
+ bool has_animations = ae.exportAnimations(sce);
// <library_controllers>
ArmatureExporter arm_exporter(&sw, this->export_settings);
@@ -279,6 +279,19 @@
// <library_visual_scenes>
SceneExporter se(&sw, &arm_exporter, this->export_settings);
+
+ if (has_animations && this->export_settings->export_transformation_type == BC_TRANSFORMATION_TYPE_MATRIX) {
+ // channels adressing <matrix> objects is not (yet) supported
+ // So we force usage of <location>, <translation> and <scale>
+ fprintf(stdout,
+ "For animated Ojects we must use decomposed <matrix> elements,\n" \
+ "Forcing usage of TransLocRot transformation type.");
+ se.setExportTransformationType(BC_TRANSFORMATION_TYPE_TRANSROTLOC);
+ }
+ else {
+ se.setExportTransformationType(this->export_settings->export_transformation_type);
+ }
+
se.exportScene(sce);
// <scene>
Modified: trunk/blender/source/blender/collada/ExportSettings.h
===================================================================
--- trunk/blender/source/blender/collada/ExportSettings.h 2013-03-06 22:54:44 UTC (rev 55084)
+++ trunk/blender/source/blender/collada/ExportSettings.h 2013-03-06 23:21:52 UTC (rev 55085)
@@ -28,6 +28,7 @@
#define __EXPORTSETTINGS_H__
#include "collada.h"
+#include "collada.h"
struct ExportSettings {
public:
@@ -48,6 +49,7 @@
bool triangulate;
bool use_object_instantiation;
bool sort_by_name;
+ BC_export_transformation_type export_transformation_type;
bool second_life;
char *filepath;
Modified: trunk/blender/source/blender/collada/SceneExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/SceneExporter.cpp 2013-03-06 22:54:44 UTC (rev 55084)
+++ trunk/blender/source/blender/collada/SceneExporter.cpp 2013-03-06 23:21:52 UTC (rev 55085)
@@ -36,7 +36,12 @@
: COLLADASW::LibraryVisualScenes(sw), arm_exporter(arm), export_settings(export_settings)
{
}
-
+
+void SceneExporter::setExportTransformationType(BC_export_transformation_type transformation_type)
+{
+ this->transformation_type = transformation_type;
+}
+
void SceneExporter::exportScene(Scene *sce)
{
// <library_visual_scenes> <visual_scene>
@@ -84,6 +89,7 @@
}
}
+
void SceneExporter::writeNodes(Object *ob, Scene *sce)
{
// Add associated armature first if available
@@ -130,8 +136,9 @@
if (ob->type == OB_MESH && armature_exported)
// for skinned mesh we write obmat in <bind_shape_matrix>
TransformWriter::add_node_transform_identity(colladaNode);
- else
- TransformWriter::add_node_transform_ob(colladaNode, ob);
+ else {
+ TransformWriter::add_node_transform_ob(colladaNode, ob, this->transformation_type);
+ }
// <instance_geometry>
if (ob->type == OB_MESH) {
Modified: trunk/blender/source/blender/collada/SceneExporter.h
===================================================================
--- trunk/blender/source/blender/collada/SceneExporter.h 2013-03-06 22:54:44 UTC (rev 55084)
+++ trunk/blender/source/blender/collada/SceneExporter.h 2013-03-06 23:21:52 UTC (rev 55085)
@@ -97,8 +97,10 @@
public:
SceneExporter(COLLADASW::StreamWriter *sw, ArmatureExporter *arm, const ExportSettings *export_settings);
void exportScene(Scene *sce);
+ void setExportTransformationType(BC_export_transformation_type transformation_type);
private:
+ BC_export_transformation_type transformation_type;
// required for writeNodes() for bone-parented objects
friend class ArmatureExporter;
void exportHierarchy(Scene *sce);
Modified: trunk/blender/source/blender/collada/TransformWriter.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformWriter.cpp 2013-03-06 22:54:44 UTC (rev 55084)
+++ trunk/blender/source/blender/collada/TransformWriter.cpp 2013-03-06 23:21:52 UTC (rev 55085)
@@ -51,13 +51,16 @@
converter->mat4_to_dae_double(dmat, local);
TransformBase::decompose(local, loc, rot, NULL, scale);
- //if (node.getType() == COLLADASW::Node::JOINT)
- node.addMatrix("transform", dmat);
- //else
- //add_transform(node, loc, rot, scale);
+
+ if (node.getType() == COLLADASW::Node::JOINT) {
+ // XXX Why are joints handled differently ?
+ node.addMatrix("transform", dmat);
+ }
+ else
+ add_transform(node, loc, rot, scale);
}
-void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob)
+void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, BC_export_transformation_type transformation_type)
{
#if 0
float rot[3], loc[3], scale[3];
@@ -114,8 +117,23 @@
double d_obmat[4][4];
converter.mat4_to_dae_double(d_obmat, ob->obmat);
- node.addMatrix("transform",d_obmat);
- //add_transform(node, ob->loc, ob->rot, ob->size);
+
+ switch (transformation_type) {
+ case BC_TRANSFORMATION_TYPE_MATRIX : {
+ node.addMatrix("transform",d_obmat);
+ break;
+ }
+ case BC_TRANSFORMATION_TYPE_TRANSROTLOC: {
+ add_transform(node, ob->loc, ob->rot, ob->size);
+ break;
+ }
+ case BC_TRANSFORMATION_TYPE_BOTH : {
+ node.addMatrix("transform",d_obmat);
+ add_transform(node, ob->loc, ob->rot, ob->size);
+ break;
+ }
+ }
+
}
void TransformWriter::add_node_transform_identity(COLLADASW::Node& node)
Modified: trunk/blender/source/blender/collada/TransformWriter.h
===================================================================
--- trunk/blender/source/blender/collada/TransformWriter.h 2013-03-06 22:54:44 UTC (rev 55084)
+++ trunk/blender/source/blender/collada/TransformWriter.h 2013-03-06 23:21:52 UTC (rev 55085)
@@ -33,13 +33,14 @@
#include "DNA_object_types.h"
#include "collada_internal.h"
+#include "collada.h"
class TransformWriter : protected TransformBase
{
protected:
void add_node_transform(COLLADASW::Node& node, float mat[4][4], float parent_mat[4][4]);
- void add_node_transform_ob(COLLADASW::Node& node, Object *ob);
+ void add_node_transform_ob(COLLADASW::Node& node, Object *ob, BC_export_transformation_type transformation_type);
void add_node_transform_identity(COLLADASW::Node& node);
Modified: trunk/blender/source/blender/collada/collada.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada.cpp 2013-03-06 22:54:44 UTC (rev 55084)
+++ trunk/blender/source/blender/collada/collada.cpp 2013-03-06 23:21:52 UTC (rev 55085)
@@ -78,6 +78,7 @@
int triangulate,
int use_object_instantiation,
int sort_by_name,
+ BC_export_transformation_type export_transformation_type,
int second_life)
{
ExportSettings export_settings;
@@ -107,10 +108,11 @@
export_settings.include_material_textures= include_material_textures != 0;
export_settings.use_texture_copies = use_texture_copies != 0;
- export_settings.triangulate = triangulate != 0;
- export_settings.use_object_instantiation = use_object_instantiation != 0;
- export_settings.sort_by_name = sort_by_name != 0;
- export_settings.second_life = second_life != 0;
+ export_settings.triangulate = triangulate != 0;
+ export_settings.use_object_instantiation = use_object_instantiation != 0;
+ export_settings.sort_by_name = sort_by_name != 0;
+ export_settings.export_transformation_type = export_transformation_type;
+ export_settings.second_life = second_life != 0;
int includeFilter = OB_REL_NONE;
Modified: trunk/blender/source/blender/collada/collada.h
===================================================================
--- trunk/blender/source/blender/collada/collada.h 2013-03-06 22:54:44 UTC (rev 55084)
+++ trunk/blender/source/blender/collada/collada.h 2013-03-06 23:21:52 UTC (rev 55085)
@@ -41,6 +41,12 @@
BC_MESH_TYPE_RENDER
} BC_export_mesh_type;
+typedef enum BC_export_transformation_type {
+ BC_TRANSFORMATION_TYPE_MATRIX,
+ BC_TRANSFORMATION_TYPE_TRANSROTLOC,
+ BC_TRANSFORMATION_TYPE_BOTH
+} BC_export_transformation_type;
+
struct bContext;
struct Scene;
@@ -70,6 +76,7 @@
int triangulate,
int use_object_instantiation,
int sort_by_name,
+ BC_export_transformation_type export_transformation_type,
int second_life);
Modified: trunk/blender/source/blender/editors/io/io_collada.c
===================================================================
--- trunk/blender/source/blender/editors/io/io_collada.c 2013-03-06 22:54:44 UTC (rev 55084)
+++ trunk/blender/source/blender/editors/io/io_collada.c 2013-03-06 23:21:52 UTC (rev 55085)
@@ -95,6 +95,7 @@
int triangulate;
int use_object_instantiation;
int sort_by_name;
+ int export_transformation_type;
int second_life;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list