[simspark-cvs] simspark/spark/oxygen/physicsserver odeobject.cpp, 1.1.2.1.2.1, 1.1.2.1.2.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1915

Modified Files:
      Tag: projectx
	odeobject.cpp 
Log Message:
update from rcssserver3D


Index: odeobject.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/odeobject.cpp,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -C2 -d -r1.1.2.1.2.1 -r1.1.2.1.2.2
*** odeobject.cpp	17 Jun 2007 08:11:00 -0000	1.1.2.1.2.1
--- odeobject.cpp	22 Jun 2007 13:57:35 -0000	1.1.2.1.2.2
***************
*** 145,146 ****
--- 145,162 ----
      matrix[11] = 0;
  }
+ 
+ void ODEObject::ConvertRotationMatrix(const dReal* matrix, salt::Matrix& rot) const
+ {
+     rot.m[0] = matrix[0] ;
+     rot.m[4] = matrix[1] ;
+     rot.m[8] = matrix[2];
+     rot.m[12] = matrix[3];
+     rot.m[1] = matrix[4];
+     rot.m[5] = matrix[5];
+     rot.m[9] = matrix[6];
+     rot.m[13] = matrix[7];
+     rot.m[2] = matrix[8];
+     rot.m[6] = matrix[9];
+     rot.m[10] = matrix[10] ;
+     rot.m[14] = matrix[11];
+ }