Commit: 06862486d4a782d714db1aa42fc51b02fa555226
Author: Gaia Clary
Date: Thu Nov 15 22:09:35 2018 +0100
Branches: collada2.8
https://developer.blender.org/rB06862486d4a782d714db1aa42fc51b02fa555226
cleanup: Collada Importer: better readable report in Blender console
===================================================================
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/TransformReader.cpp
M source/blender/collada/collada.cpp
===================================================================
diff --git a/source/blender/collada/DocumentImporter.cpp
b/source/blender/collada/DocumentImporter.cpp
index 83491829565..658015ab912 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -223,12 +223,14 @@ void DocumentImporter::finish()
}
// Write nodes to scene
+ fprintf(stderr, "+-- Import Scene --------\n");
const COLLADAFW::NodePointerArray& roots =
(*sit)->getRootNodes();
for (unsigned int i = 0; i < roots.getCount(); i++) {
std::vector<Object *> *objects_done =
write_node(roots[i], NULL, sce, NULL, false);
objects_to_scale->insert(objects_to_scale->end(),
objects_done->begin(), objects_done->end());
delete objects_done;
}
+
}
@@ -252,7 +254,7 @@ void DocumentImporter::finish()
if (libnode_ob.size()) {
- fprintf(stderr, "got %d library nodes to free\n",
(int)libnode_ob.size());
+ fprintf(stderr, "| Cleanup: free %d library nodes\n",
(int)libnode_ob.size());
// free all library_nodes
std::vector<Object *>::iterator it;
for (it = libnode_ob.begin(); it != libnode_ob.end(); it++) {
@@ -400,7 +402,7 @@ Object
*DocumentImporter::create_lamp_object(COLLADAFW::InstanceLight *lamp, Sce
Object *DocumentImporter::create_instance_node(Object *source_ob,
COLLADAFW::Node *source_node, COLLADAFW::Node *instance_node, Scene *sce, bool
is_library_node)
{
- fprintf(stderr, "create <instance_node> under node id=%s from node
id=%s\n", instance_node ? instance_node->getOriginalId().c_str() : NULL,
source_node ? source_node->getOriginalId().c_str() : NULL);
+ //fprintf(stderr, "create <instance_node> under node id=%s from node
id=%s\n", instance_node ? instance_node->getOriginalId().c_str() : NULL,
source_node ? source_node->getOriginalId().c_str() : NULL);
Main *bmain = CTX_data_main(mContext);
Object *obn = BKE_object_copy(bmain, source_ob);
@@ -500,9 +502,10 @@ std::vector<Object *>
*DocumentImporter::write_node(COLLADAFW::Node *node, COLLA
std::vector<Object *> *root_objects = new std::vector<Object *>();
fprintf(stderr,
- "Writing node id='%s', name='%s'\n",
- id.c_str(),
- name.c_str());
+ "| %s id='%s', name='%s'\n",
+ is_joint ? "JOINT" : "NODE ",
+ id.c_str(),
+ name.c_str() );
if (is_joint) {
if (parent_node == NULL && !is_library_node) {
@@ -727,12 +730,12 @@ bool DocumentImporter::writeLibraryNodes(const
COLLADAFW::LibraryNodes *libraryN
const COLLADAFW::NodePointerArray& nodes = libraryNodes->getNodes();
+ fprintf(stderr, "+-- Read Library nodes ----------\n");
for (unsigned int i = 0; i < nodes.getCount(); i++) {
std::vector<Object *> *child_objects;
child_objects = write_node(nodes[i], NULL, sce, NULL, true);
delete child_objects;
}
-
return true;
}
@@ -962,7 +965,7 @@ bool DocumentImporter::writeImage(const COLLADAFW::Image
*image)
else {
// Maybe imagepath was already absolute ?
if (!BLI_exists(imagepath.c_str())) {
- fprintf(stderr, "Image not found: %s.\n",
imagepath.c_str() );
+ fprintf(stderr, "|! Image not found: %s\n",
imagepath.c_str() );
return true;
}
workpath = imagepath.c_str();
@@ -970,11 +973,11 @@ bool DocumentImporter::writeImage(const COLLADAFW::Image
*image)
Image *ima = BKE_image_load_exists(CTX_data_main(mContext), workpath);
if (!ima) {
- fprintf(stderr, "Cannot create image: %s\n", workpath);
+ fprintf(stderr, "|! Cannot create image: %s\n", workpath);
return true;
}
this->uid_image_map[image->getUniqueId()] = ima;
-
+ fprintf(stderr, "| import Image: %s\n", workpath);
return true;
}
diff --git a/source/blender/collada/TransformReader.cpp
b/source/blender/collada/TransformReader.cpp
index bf9c34153b7..0c2ea9cb7c4 100644
--- a/source/blender/collada/TransformReader.cpp
+++ b/source/blender/collada/TransformReader.cpp
@@ -80,8 +80,10 @@ void TransformReader::get_node_mat(
dae_scale_to_mat4(tm, cur);
break;
case COLLADAFW::Transformation::LOOKAT:
+ fprintf(stderr, "|! LOOKAT transformations
are not supported yet.\n");
+ break;
case COLLADAFW::Transformation::SKEW:
- fprintf(stderr, "LOOKAT and SKEW
transformations are not supported yet.\n");
+ fprintf(stderr, "|! SKEW transformations
are not supported yet.\n");
break;
}
diff --git a/source/blender/collada/collada.cpp
b/source/blender/collada/collada.cpp
index 98ebec0d560..85771e63626 100644
--- a/source/blender/collada/collada.cpp
+++ b/source/blender/collada/collada.cpp
@@ -45,10 +45,36 @@ extern "C"
#include "BLI_fileops.h"
#include "BLI_linklist.h"
+
+static void print_import_header(ImportSettings &import_settings)
+{
+ fprintf(stderr, "+-- Collada Import parameters------\n");
+ fprintf(stderr, "| input file : %s\n", import_settings.filepath);
+ fprintf(stderr, "| use units : %s\n",
(import_settings.import_units)?"yes":"no");
+ fprintf(stderr, "| autoconnect : %s\n",
(import_settings.auto_connect) ? "yes" : "no");
+ fprintf(stderr, "+-- Armature Import parameters ----\n");
+ fprintf(stderr, "| find bone chains: %s\n",
(import_settings.find_chains) ? "yes" : "no");
+ fprintf(stderr, "| min chain len : %d\n",
import_settings.min_chain_length);
+ fprintf(stderr, "| fix orientation : %s\n",
(import_settings.fix_orientation) ? "yes" : "no");
+ fprintf(stderr, "| keep bind info : %s\n",
(import_settings.keep_bind_info) ? "yes" : "no");
+
+}
+
+static void print_import_footer(int status)
+{
+ fprintf(stderr, "+----------------------------------\n");
+ fprintf(stderr, "| Collada Import : %s\n", (status)? "OK":"FAIL");
+ fprintf(stderr, "+----------------------------------\n");
+}
+
int collada_import(bContext *C, ImportSettings *import_settings)
{
+ print_import_header(*import_settings);
DocumentImporter imp(C, import_settings);
- return (imp.import())? 1:0;
+ int status = imp.import()? 1:0;
+ print_import_footer(status);
+
+ return status;
}
int collada_export(bContext *C,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
