ovis: use fix camera yaw axis to -y by default

paroj · paroj · commit e8cdc9708c20 · 2018-03-29T14:06:57.000+02:00
also remove superficial CS conversion in fixCameraYawAxis
diff --git a/modules/ovis/src/ovis.cpp b/modules/ovis/src/ovis.cpp
@@ -287,6 +287,7 @@ class WindowSceneImpl : public WindowScene
         {
             camman.reset(new OgreBites::CameraMan(camNode));
             camman->setStyle(OgreBites::CS_ORBIT);
+            camNode->setFixedYawAxis(true, Vector3::NEGATIVE_UNIT_Y);
         }
 
         if (!app->sceneMgr)
@@ -541,11 +542,10 @@ class WindowSceneImpl : public WindowScene
 
     void fixCameraYawAxis(bool useFixed, InputArray _up)
     {
-        Vector3 up = Vector3::UNIT_Y;
+        Vector3 up = Vector3::NEGATIVE_UNIT_Y;
         if (!_up.empty())
         {
             _up.copyTo(Mat_<Real>(3, 1, up.ptr()));
-            up = toOGRE * up;
         }
 
         camNode->setFixedYawAxis(useFixed, up);

Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,7 @@ class WindowSceneImpl : public WindowScene`
`287`	`287`	`{`
`288`	`288`	`camman.reset(new OgreBites::CameraMan(camNode));`
`289`	`289`	`camman->setStyle(OgreBites::CS_ORBIT);`
	`290`	`+ camNode->setFixedYawAxis(true, Vector3::NEGATIVE_UNIT_Y);`
`290`	`291`	`}`
`291`	`292`
`292`	`293`	`if (!app->sceneMgr)`
`@@ -541,11 +542,10 @@ class WindowSceneImpl : public WindowScene`
`541`	`542`
`542`	`543`	`void fixCameraYawAxis(bool useFixed, InputArray _up)`
`543`	`544`	`{`
`544`		`- Vector3 up = Vector3::UNIT_Y;`
	`545`	`+ Vector3 up = Vector3::NEGATIVE_UNIT_Y;`
`545`	`546`	`if (!_up.empty())`
`546`	`547`	`{`
`547`	`548`	`_up.copyTo(Mat_<Real>(3, 1, up.ptr()));`
`548`		`- up = toOGRE * up;`
`549`	`549`	`}`
`550`	`550`
`551`	`551`	`camNode->setFixedYawAxis(useFixed, up);`