Skip to content

Commit 8a8d609

Browse files
committed
ovis: drop several workarounds for old OGRE versions
not needed since we require OGRE 1.11.5 via CMake
1 parent c9514b8 commit 8a8d609

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

modules/ovis/src/ovis.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -335,11 +335,7 @@ class WindowSceneImpl : public WindowScene
335335
{
336336
camman.reset(new OgreBites::CameraMan(camNode));
337337
camman->setStyle(OgreBites::CS_ORBIT);
338-
#if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 5)
339338
camman->setFixedYaw(false);
340-
#else
341-
camNode->setFixedYawAxis(true, Vector3::NEGATIVE_UNIT_Y); // OpenCV +Y in Ogre CS
342-
#endif
343339
}
344340

345341
if (!app->sceneMgr)
@@ -579,7 +575,6 @@ class WindowSceneImpl : public WindowScene
579575
const Scalar& specularColour) CV_OVERRIDE
580576
{
581577
Light* light = sceneMgr->createLight(name);
582-
light->setDirection(Vector3::NEGATIVE_UNIT_Z);
583578
// convert to BGR
584579
light->setDiffuseColour(ColourValue(diffuseColour[2], diffuseColour[1], diffuseColour[0]));
585580
light->setSpecularColour(ColourValue(specularColour[2], specularColour[1], specularColour[0]));
@@ -838,9 +833,7 @@ class WindowSceneImpl : public WindowScene
838833

839834
void fixCameraYawAxis(bool useFixed, InputArray _up) CV_OVERRIDE
840835
{
841-
#if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 5)
842836
if(camman) camman->setFixedYaw(useFixed);
843-
#endif
844837

845838
Vector3 up = Vector3::NEGATIVE_UNIT_Y;
846839
if (!_up.empty())
@@ -997,11 +990,7 @@ void setMaterialProperty(const String& name, int prop, const Scalar& val)
997990
rpass->setEmissive(col);
998991
break;
999992
case MATERIAL_LINE_WIDTH:
1000-
#if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 2)
1001993
rpass->setLineWidth(val[0]);
1002-
#else
1003-
CV_Error(Error::StsError, "needs OGRE 1.11.2+ for this");
1004-
#endif
1005994
break;
1006995
default:
1007996
CV_Error(Error::StsBadArg, "invalid or non Scalar property");

0 commit comments

Comments
 (0)