Changeset 3790 for OpenSceneGraph/trunk/examples/osgunittests/osgunittests.cpp

Timestamp:

01/27/05 15:39:58 (8 years ago)

Author:

robert

Message:

From Nicolas Brodu, new faster osg::Quat::makeRotate(Vec3d,Vec3d) implmentation.

From Robert Osfield, modes to osg::Quat to keep the original implmentation around
as makeRotate_original(,) and added tests into osgunittest to test the new
methods provide equivilant results to the original implemementation. The
orignal implementation will be removed once the new method is more widely tested.

Files:

• OpenSceneGraph/trunk/examples/osgunittests/osgunittests.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/examples/osgunittests/osgunittests.cpp

@@ -120 +120 @@
 
 
+void testQuatRotate(const osg::Vec3d& from, const osg::Vec3d& to)
+{
+    osg::Quat q_nicolas;
+    q_nicolas.makeRotate(from,to);
+    
+    osg::Quat q_original;
+    q_original.makeRotate_original(from,to);
+    
+    std::cout<<"osg::Quat::makeRotate("<<from<<", "<<to<<")"<<std::endl;
+    std::cout<<"  q_nicolas = "<<q_nicolas<<std::endl;
+    std::cout<<"  q_original = "<<q_original<<std::endl;
+    std::cout<<"  from * M4x4(q_nicolas) = "<<from * osg::Matrixd::rotate(q_nicolas)<<std::endl;
+    std::cout<<"  from * M4x4(q_original) = "<<from * osg::Matrixd::rotate(q_original)<<std::endl;
+}
+
 void testQuat()
 {
@@ -148 +163 @@
     std::cout<<"m2*m1 = "<<qm2_1<<std::endl;
 
+
+    testQuatRotate(osg::Vec3d(1.0,0.0,0.0),osg::Vec3d(0.0,1.0,0.0));
+    testQuatRotate(osg::Vec3d(0.0,1.0,0.0),osg::Vec3d(1.0,0.0,0.0));
+    testQuatRotate(osg::Vec3d(0.0,0.0,1.0),osg::Vec3d(0.0,1.0,0.0));
+    testQuatRotate(osg::Vec3d(1.0,1.0,1.0),osg::Vec3d(1.0,0.0,0.0));
+    testQuatRotate(osg::Vec3d(1.0,0.0,0.0),osg::Vec3d(1.0,0.0,0.0));
+    testQuatRotate(osg::Vec3d(1.0,0.0,0.0),osg::Vec3d(-1.0,0.0,0.0));
+    testQuatRotate(osg::Vec3d(-1.0,0.0,0.0),osg::Vec3d(1.0,0.0,0.0));
+    testQuatRotate(osg::Vec3d(0.0,1.0,0.0),osg::Vec3d(0.0,-1.0,0.0));
+    testQuatRotate(osg::Vec3d(0.0,-1.0,0.0),osg::Vec3d(0.0,1.0,0.0));
+    testQuatRotate(osg::Vec3d(0.0,0.0,1.0),osg::Vec3d(0.0,0.0,-1.0));
+    testQuatRotate(osg::Vec3d(0.0,0.0,-1.0),osg::Vec3d(0.0,0.0,1.0));
     
 }