[Jderobot-admin] jderobot-r935 - trunk/src/libs/geometry/collada

[ahcorde en jderobot.org]

Author: ahcorde
Date: 2013-06-18 08:31:44 +0200 (Tue, 18 Jun 2013)
New Revision: 935

Modified:
   trunk/src/libs/geometry/collada/colladaparser.cpp
   trunk/src/libs/geometry/collada/colladaparser.h
Log:
[ahcorde]


Modified: trunk/src/libs/geometry/collada/colladaparser.cpp
===================================================================
--- trunk/src/libs/geometry/collada/colladaparser.cpp	2013-06-17 08:16:14 UTC (rev 934)
+++ trunk/src/libs/geometry/collada/colladaparser.cpp	2013-06-18 06:31:44 UTC (rev 935)
@@ -1,7 +1,7 @@
 #include "colladaparser.h"
 namespace files_3D {
 
-    ColladaParser::ColladaParser(std::string filename)
+    ColladaParser::ColladaParser(std::string filename, int scale)
     {
         TiXmlDocument xmlDoc;
 
@@ -38,7 +38,7 @@
 
         loadScene(mesh);
 
-        mesh->Scale(this->meter*100);
+        mesh->Scale(this->meter*scale);
 
         worldTo2D();
     }

Modified: trunk/src/libs/geometry/collada/colladaparser.h
===================================================================
--- trunk/src/libs/geometry/collada/colladaparser.h	2013-06-17 08:16:14 UTC (rev 934)
+++ trunk/src/libs/geometry/collada/colladaparser.h	2013-06-18 06:31:44 UTC (rev 935)
@@ -29,7 +29,7 @@
     class ColladaParser
     {
     public:
-        ColladaParser(std::string filename);
+        ColladaParser(std::string filename, int scale=1);
 
         void worldTo2D();
         cv::Mat getWorld2D();