Skip to content

Commit 40cba0a

Browse files
committed
Merge pull request #1828 from paroj:ovis_texup
2 parents 233d80f + a3c8704 commit 40cba0a

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

modules/ovis/include/opencv2/ovis.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ enum SceneSettings
3131
enum MaterialProperty
3232
{
3333
MATERIAL_POINT_SIZE,
34+
MATERIAL_LINE_WIDTH,
3435
MATERIAL_OPACITY,
3536
MATERIAL_EMISSIVE,
3637
MATERIAL_TEXTURE0,

modules/ovis/src/ovis.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,13 @@ void setMaterialProperty(const String& name, int prop, const Scalar& val)
753753
col.saturate();
754754
rpass->setEmissive(col);
755755
break;
756+
case MATERIAL_LINE_WIDTH:
757+
#if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 2)
758+
rpass->setLineWidth(val[0]);
759+
#else
760+
CV_Error(Error::StsError, "needs OGRE 1.11.2+ for this");
761+
#endif
762+
break;
756763
default:
757764
CV_Error(Error::StsBadArg, "invalid or non Scalar property");
758765
break;

0 commit comments

Comments
 (0)