svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender...
[blender-staging.git] / source / blender / collada / TransformReader.cpp
index d951bfb64744ce733a706327fcb636f2a3a90adc..0fd0c85aa092bd94fdfad290e393524bec4629ae 100644 (file)
@@ -1,5 +1,5 @@
-/**
- * $Id: DocumentImporter.cpp 32235 2010-10-01 19:46:42Z jesterking $
+/*
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file blender/collada/TransformReader.cpp
+ *  \ingroup collada
+ */
+
+/* COLLADABU_ASSERT, may be able to remove later */
+#include "COLLADABUPlatform.h"
+
 #include "TransformReader.h"
 
 TransformReader::TransformReader(UnitConverter* conv) : unit_converter(conv) {}
@@ -30,6 +37,7 @@ void TransformReader::get_node_mat(float mat[][4], COLLADAFW::Node *node, std::m
 {
        float cur[4][4];
        float copy[4][4];
+       float eul[3];
 
        unit_m4(mat);
        
@@ -38,24 +46,24 @@ void TransformReader::get_node_mat(float mat[][4], COLLADAFW::Node *node, std::m
                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);
@@ -122,4 +130,4 @@ void TransformReader::dae_vector3_to_v3(const COLLADABU::Math::Vector3 &v3, floa
        v[0] = v3.x;
        v[1] = v3.y;
        v[2] = v3.z;
-}
\ No newline at end of file
+}