@@ -335,11 +335,7 @@ class WindowSceneImpl : public WindowScene
335
335
{
336
336
camman.reset (new OgreBites::CameraMan (camNode));
337
337
camman->setStyle (OgreBites::CS_ORBIT);
338
- #if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 5)
339
338
camman->setFixedYaw (false );
340
- #else
341
- camNode->setFixedYawAxis (true , Vector3::NEGATIVE_UNIT_Y); // OpenCV +Y in Ogre CS
342
- #endif
343
339
}
344
340
345
341
if (!app->sceneMgr )
@@ -579,7 +575,6 @@ class WindowSceneImpl : public WindowScene
579
575
const Scalar& specularColour) CV_OVERRIDE
580
576
{
581
577
Light* light = sceneMgr->createLight (name);
582
- light->setDirection (Vector3::NEGATIVE_UNIT_Z);
583
578
// convert to BGR
584
579
light->setDiffuseColour (ColourValue (diffuseColour[2 ], diffuseColour[1 ], diffuseColour[0 ]));
585
580
light->setSpecularColour (ColourValue (specularColour[2 ], specularColour[1 ], specularColour[0 ]));
@@ -838,9 +833,7 @@ class WindowSceneImpl : public WindowScene
838
833
839
834
void fixCameraYawAxis (bool useFixed, InputArray _up) CV_OVERRIDE
840
835
{
841
- #if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 5)
842
836
if (camman) camman->setFixedYaw (useFixed);
843
- #endif
844
837
845
838
Vector3 up = Vector3::NEGATIVE_UNIT_Y;
846
839
if (!_up.empty ())
@@ -997,11 +990,7 @@ void setMaterialProperty(const String& name, int prop, const Scalar& val)
997
990
rpass->setEmissive (col);
998
991
break ;
999
992
case MATERIAL_LINE_WIDTH:
1000
- #if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 2)
1001
993
rpass->setLineWidth (val[0 ]);
1002
- #else
1003
- CV_Error (Error::StsError, " needs OGRE 1.11.2+ for this" );
1004
- #endif
1005
994
break ;
1006
995
default :
1007
996
CV_Error (Error::StsBadArg, " invalid or non Scalar property" );
0 commit comments