Merge pull request #1828 from paroj:ovis_texup

pull/1832/head^2
Alexander Alekhin 7 years ago
commit 40cba0a280
  1. 1
      modules/ovis/include/opencv2/ovis.hpp
  2. 7
      modules/ovis/src/ovis.cpp

@ -31,6 +31,7 @@ enum SceneSettings
enum MaterialProperty
{
MATERIAL_POINT_SIZE,
MATERIAL_LINE_WIDTH,
MATERIAL_OPACITY,
MATERIAL_EMISSIVE,
MATERIAL_TEXTURE0,

@ -753,6 +753,13 @@ void setMaterialProperty(const String& name, int prop, const Scalar& val)
col.saturate();
rpass->setEmissive(col);
break;
case MATERIAL_LINE_WIDTH:
#if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 2)
rpass->setLineWidth(val[0]);
#else
CV_Error(Error::StsError, "needs OGRE 1.11.2+ for this");
#endif
break;
default:
CV_Error(Error::StsBadArg, "invalid or non Scalar property");
break;

Loading…
Cancel
Save