|
|
@ -319,7 +319,11 @@ public: |
|
|
|
{ |
|
|
|
{ |
|
|
|
camman.reset(new OgreBites::CameraMan(camNode)); |
|
|
|
camman.reset(new OgreBites::CameraMan(camNode)); |
|
|
|
camman->setStyle(OgreBites::CS_ORBIT); |
|
|
|
camman->setStyle(OgreBites::CS_ORBIT); |
|
|
|
camNode->setFixedYawAxis(true, Vector3::NEGATIVE_UNIT_Y); |
|
|
|
#if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 5) |
|
|
|
|
|
|
|
camman->setFixedYaw(false); |
|
|
|
|
|
|
|
#else |
|
|
|
|
|
|
|
camNode->setFixedYawAxis(true, Vector3::NEGATIVE_UNIT_Y); // OpenCV +Y in Ogre CS
|
|
|
|
|
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!app->sceneMgr) |
|
|
|
if (!app->sceneMgr) |
|
|
@ -694,6 +698,10 @@ public: |
|
|
|
|
|
|
|
|
|
|
|
void fixCameraYawAxis(bool useFixed, InputArray _up) CV_OVERRIDE |
|
|
|
void fixCameraYawAxis(bool useFixed, InputArray _up) CV_OVERRIDE |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
#if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 5) |
|
|
|
|
|
|
|
if(camman) camman->setFixedYaw(useFixed); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
Vector3 up = Vector3::NEGATIVE_UNIT_Y; |
|
|
|
Vector3 up = Vector3::NEGATIVE_UNIT_Y; |
|
|
|
if (!_up.empty()) |
|
|
|
if (!_up.empty()) |
|
|
|
{ |
|
|
|
{ |
|
|
|