|
From: <jfa...@us...> - 2008-10-29 18:28:34
|
Revision: 5924
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=5924&view=rev
Author: jfaustwg
Date: 2008-10-29 18:28:31 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
r10971@lan-dhcp-121: jfaust | 2008-10-28 14:17:39 -0700
Fix orbit camera movement
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:10969
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:10971
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:28:23 UTC (rev 5923)
+++ pkg/trunk/visualization/ogre_tools/src/ogre_tools/orbit_camera.cpp 2008-10-29 18:28:31 UTC (rev 5924)
@@ -218,9 +218,10 @@
void OrbitCamera::move( float x, float y, float z )
{
Ogre::Quaternion orientation = camera_->getOrientation();
+
if ( relative_node_ )
{
- orientation = relative_node_->getOrientation() * orientation;
+ orientation = relative_node_->getOrientation().Inverse() * orientation;
}
focal_point_ += orientation * Ogre::Vector3( x, y, z );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|