[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37807] branches/soc-2011-pepper/source/ blender/collada: Fixed issues with unit conversion and animation channels.

[Sukhitha Jayathilake]

Revision: 37807
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37807
Author:   phabtar
Date:     2011-06-25 07:23:23 +0000 (Sat, 25 Jun 2011)
Log Message:
-----------
Fixed issues with unit conversion and animation channels.

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp
    branches/soc-2011-pepper/source/blender/collada/TransformReader.cpp
    branches/soc-2011-pepper/source/blender/collada/TransformWriter.cpp

Modified: branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp	2011-06-25 06:54:11 UTC (rev 37806)
+++ branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp	2011-06-25 07:23:23 UTC (rev 37807)
@@ -132,7 +132,7 @@
 		boneName = strtok(NULL,"\"");
 		
 		if( boneName != NULL )
-			return id_name(ob) + "_" + std::string(boneName);
+			return /*id_name(ob) + "_" +*/ std::string(boneName);
 		else		
 			return id_name(ob);
 	}

Modified: branches/soc-2011-pepper/source/blender/collada/TransformReader.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/TransformReader.cpp	2011-06-25 06:54:11 UTC (rev 37806)
+++ branches/soc-2011-pepper/source/blender/collada/TransformReader.cpp	2011-06-25 07:23:23 UTC (rev 37807)
@@ -45,24 +45,24 @@
 		COLLADAFW::Transformation *tm = node->getTransformations()[i];
 		COLLADAFW::Transformation::TransformationType type = tm->getTransformationType();
 
-		switch(type) {
-		case COLLADAFW::Transformation::TRANSLATE:
-			dae_translate_to_mat4(tm, cur);
-			break;
-		case COLLADAFW::Transformation::ROTATE:
-			dae_rotate_to_mat4(tm, cur);
-			break;
-		case COLLADAFW::Transformation::SCALE:
-			dae_scale_to_mat4(tm, cur);
-			break;
-		case COLLADAFW::Transformation::MATRIX:
-			dae_matrix_to_mat4(tm, cur);
-			break;
-		case COLLADAFW::Transformation::LOOKAT:
-		case COLLADAFW::Transformation::SKEW:
-			fprintf(stderr, "LOOKAT and SKEW transformations are not supported yet.\n");
-			break;
-		}
+			switch(type) {
+			case COLLADAFW::Transformation::TRANSLATE:
+				dae_translate_to_mat4(tm, cur);
+				break;
+			case COLLADAFW::Transformation::ROTATE:
+				dae_rotate_to_mat4(tm, cur);
+				break;
+			case COLLADAFW::Transformation::SCALE:
+				dae_scale_to_mat4(tm, cur);
+				break;
+			case COLLADAFW::Transformation::MATRIX:
+				dae_matrix_to_mat4(tm, cur);
+				break;
+			case COLLADAFW::Transformation::LOOKAT:
+			case COLLADAFW::Transformation::SKEW:
+				fprintf(stderr, "LOOKAT and SKEW transformations are not supported yet.\n");
+				break;
+			}
 
 		copy_m4_m4(copy, mat);
 		mul_m4_m4m4(mat, cur, copy);

Modified: branches/soc-2011-pepper/source/blender/collada/TransformWriter.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/TransformWriter.cpp	2011-06-25 06:54:11 UTC (rev 37806)
+++ branches/soc-2011-pepper/source/blender/collada/TransformWriter.cpp	2011-06-25 07:23:23 UTC (rev 37807)
@@ -98,8 +98,12 @@
 void TransformWriter::add_transform(COLLADASW::Node& node, float loc[3], float rot[3], float scale[3])
 {
 	node.addTranslate("location", loc[0], loc[1], loc[2]);
-	node.addRotateZ("rotationZ", COLLADABU::Math::Utils::radToDegF(rot[2]));
+	/*node.addRotateZ("rotationZ", COLLADABU::Math::Utils::radToDegF(rot[2]));
 	node.addRotateY("rotationY", COLLADABU::Math::Utils::radToDegF(rot[1]));
-	node.addRotateX("rotationX", COLLADABU::Math::Utils::radToDegF(rot[0]));
+	node.addRotateX("rotationX", COLLADABU::Math::Utils::radToDegF(rot[0]));*/
+	node.addRotateZ("rotationZ", rot[2] * 180.0f/M_PI);
+	node.addRotateY("rotationY", (rot[1]* 180.0f/M_PI));
+	node.addRotateX("rotationX", (rot[0]* 180.0f/M_PI));
+
 	node.addScale("scale", scale[0], scale[1], scale[2]);
 }