From 363d1d9d701087cf0e575b92eaa5f19e8c899806 Mon Sep 17 00:00:00 2001
From: Don BURNS <don@andesengineering.com>
Date: Wed, 12 Dec 2001 05:09:33 +0000
Subject: [PATCH] Added translation and scaling to osgconv

---
 src/Demos/osgconv/OrientationConverter.cpp | 35 ++++++++++--
 src/Demos/osgconv/OrientationConverter.h   |  7 ++-
 src/Demos/osgconv/osgconv.cpp              | 64 ++++++++++++++++++++--
 3 files changed, 95 insertions(+), 11 deletions(-)

diff --git a/src/Demos/osgconv/OrientationConverter.cpp b/src/Demos/osgconv/OrientationConverter.cpp
index 4c2bab608..ff443a1f1 100644
--- a/src/Demos/osgconv/OrientationConverter.cpp
+++ b/src/Demos/osgconv/OrientationConverter.cpp
@@ -11,22 +11,45 @@ using namespace osg;
 
 OrientationConverter::OrientationConverter( void )
 {
+   R.makeIdent();
+   T.makeIdent();
+   _trans_set = false;
+   S.makeIdent();
 }
 
-void OrientationConverter::setConversion( const Vec3 &from, const Vec3 &to )
+void OrientationConverter::setRotation( const Vec3 &from, const Vec3 &to )
 {
-    Quat q;
-    Matrix M;
+    R = Matrix::rotate( from, to );
+}
 
-    q.makeRot( from, to );
-    q.get( M );
+void OrientationConverter::setTranslation( const Vec3 &trans )
+{
+    T = Matrix::trans(trans);
+    _trans_set = true;
+}
 
-    _cv.setMatrix( M );
+void OrientationConverter::setScale( const Vec3 &scale )
+{
+    S = Matrix::scale(scale);
 }
 
 
 void OrientationConverter::convert( Node &node )
 {
+    // Order of operations here is :
+    // 1. Translate to world origin (0,0,0)
+    // 2. Rotate to new orientation
+    // 3. Scale in new orientation coordinates
+    // 4. If an absolute translation was specified then
+    //        - translate to absolute translation in world coordinates
+    //    else
+    //        - translate back to model's original origin. 
+    BoundingSphere bs = node.getBound();
+    Matrix C = Matrix::trans( Vec3(0,0,0) - bs.center() );
+    if( _trans_set == false )
+        T = Matrix::trans( bs.center() );
+    _cv.setMatrix( C * R * S * T );
+
     node.accept(_cv);
 }
 
diff --git a/src/Demos/osgconv/OrientationConverter.h b/src/Demos/osgconv/OrientationConverter.h
index 9bed4fb91..7cf5f7405 100644
--- a/src/Demos/osgconv/OrientationConverter.h
+++ b/src/Demos/osgconv/OrientationConverter.h
@@ -9,7 +9,10 @@
 class OrientationConverter {
     public :
     	OrientationConverter(void);
-	void setConversion( const osg::Vec3 &from, const osg::Vec3 &to);
+	void setRotation( const osg::Vec3 &from, 
+	                    const osg::Vec3 &to  );
+	void setTranslation( const osg::Vec3 &trans);
+	void setScale( const osg::Vec3 &trans);
 	void convert( osg::Node &node );
 
     private :
@@ -78,6 +81,8 @@ class OrientationConverter {
 	};
 
 	ConvertVisitor _cv;
+	osg::Matrix R, T, S;
+	bool _trans_set;
 
 };
 #endif
diff --git a/src/Demos/osgconv/osgconv.cpp b/src/Demos/osgconv/osgconv.cpp
index 09fd4972e..ab4917b0f 100644
--- a/src/Demos/osgconv/osgconv.cpp
+++ b/src/Demos/osgconv/osgconv.cpp
@@ -33,7 +33,6 @@ static void usage( const char *prog, const char *msg )
     osg::notify(osg::NOTICE)<<"                         done with -l above, as it automatically expands to the"<<endl;
     osg::notify(osg::NOTICE)<<"                         full library name appropriate for each platform."<<endl;
     osg::notify(osg::NOTICE)<<"    -o orientation     - Convert geometry from input files to output files."<<endl;
-
     osg::notify(osg::NOTICE)<<
                               "                         Format of orientation argument must be the following:\n"
 			      "\n"
@@ -48,6 +47,22 @@ static void usage( const char *prog, const char *msg )
 			      "                             0,1,0-0,0,1"
 			      "\n"
 			      << endl;
+    osg::notify(osg::NOTICE)<<"    -t translation     - Convert spatial position of output files.  Format of\n"
+                              "                         translation argument must be the following :\n"
+			      "\n"
+			      "                             X,Y,Z\n"
+			      "\n"
+			      "                         where X, Y, and Z represent the coordinates of the\n"
+			      "                         absolute position in world space\n"
+			      << endl;
+    osg::notify(osg::NOTICE)<<"    -s scale           - Scale size of model.  Scale argument must be the \n"
+                              "                         following :\n"
+			      "\n"
+			      "                             SX,SY,SZ\n"
+			      "\n"
+			      "                         where SX, SY, and SZ represent the scale factors\n"
+			      "                         Caution: Scaling will be done in destination orientation\n"
+			      << endl;
 }
 
 static bool 
@@ -96,12 +111,13 @@ parse_args( int argc, char **argv, FileNameList &fileNames, OrientationConverter
 			    osg::Vec3 from, to;
 			    if( sscanf( argv[nexti++], "%f,%f,%f-%f,%f,%f",
 			    	&from[0], &from[1], &from[2],
-			    	&to[0], &to[1], &to[2] ) != 6 )
+			    	&to[0], &to[1], &to[2]  )
+				!= 6 )
 			    {
 			        usage( argv[0], "Orientation argument format incorrect." );
 				return false;
 			    }
-			    oc.setConversion( from, to );
+			    oc.setRotation( from, to );
 			    do_convert = true;
 			}
 			else
@@ -111,8 +127,48 @@ parse_args( int argc, char **argv, FileNameList &fileNames, OrientationConverter
 			}
 		        break;
 
+		    case 't' :
+		        if( nexti < argc )
+			{
+			    osg::Vec3 trans(0,0,0);
+			    if( sscanf( argv[nexti++], "%f,%f,%f",
+			    	&trans[0], &trans[1], &trans[2] ) != 3 )
+			    {
+			        usage( argv[0], "Translation argument format incorrect." );
+				return false;
+			    }
+			    oc.setTranslation( trans );
+			    do_convert = true;
+			}
+			else
+			{
+			    usage( argv[0], "Translation conversion option requires an argument." );
+			    return false;
+			}
+		        break;
+
+		    case 's' :
+		        if( nexti < argc )
+			{
+			    osg::Vec3 scale(0,0,0);
+			    if( sscanf( argv[nexti++], "%f,%f,%f",
+			    	&scale[0], &scale[1], &scale[2] ) != 3 )
+			    {
+			        usage( argv[0], "Scale argument format incorrect." );
+				return false;
+			    }
+			    oc.setScale( scale );
+			    do_convert = true;
+			}
+			else
+			{
+			    usage( argv[0], "Scale conversion option requires an argument." );
+			    return false;
+			}
+		        break;
+
 		    default :
-		        std::string a = "Invalide option " ;
+		        std::string a = "Invalid option " ;
 			a += "'"; 
 			a += argv[i][j] ;
 			a += "'.";