[Personalrobots-commit] SF.net SVN: personalrobots:[5926] pkg/trunk

[<jfa...@us...>]

Revision: 5926
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=5926&view=rev
Author:   jfaustwg
Date:     2008-10-29 18:33:53 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
 r11046@lan-dhcp-121:  jfaust | 2008-10-29 10:29:13 -0700
 Fix orbit cam for the case where we have a relative node and yaw axis is changing

Modified Paths:
--------------
    pkg/trunk/visualization/ogre_tools/src/ogre_tools/orbit_camera.cpp

Property Changed:
----------------
    pkg/trunk/


Property changes on: pkg/trunk
___________________________________________________________________
Modified: svk:merge
   - 920d6130-5740-4ec1-bb1a-45963d5fd813:/frameidpr:7015
920d6130-5740-4ec1-bb1a-45963d5fd813:/users/josh-pr:11000
920d6130-5740-4ec1-bb1a-45963d5fd813:/wgpkgtrunk:5865
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/rosbus:261
   + 920d6130-5740-4ec1-bb1a-45963d5fd813:/frameidpr:7015
920d6130-5740-4ec1-bb1a-45963d5fd813:/users/josh-pr:11046
920d6130-5740-4ec1-bb1a-45963d5fd813:/wgpkgtrunk:5865
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/rosbus:261

Modified: pkg/trunk/visualization/ogre_tools/src/ogre_tools/orbit_camera.cpp
===================================================================
--- pkg/trunk/visualization/ogre_tools/src/ogre_tools/orbit_camera.cpp	2008-10-29 18:29:17 UTC (rev 5925)
+++ pkg/trunk/visualization/ogre_tools/src/ogre_tools/orbit_camera.cpp	2008-10-29 18:33:53 UTC (rev 5926)
@@ -104,6 +104,8 @@
   {
     Ogre::Vector3 vec = pos - global_focal_point;
     pos = relative_node_->getOrientation() * vec + global_focal_point;
+
+    camera_->setFixedYawAxis(true, relative_node_->getOrientation() * Ogre::Vector3::UNIT_Y);
   }
 
   camera_->setPosition( pos );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.