Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv_contrib
Commits
40cba0a2
Commit
40cba0a2
authored
Oct 10, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1828 from paroj:ovis_texup
parents
233d80f3
a3c8704d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
ovis.hpp
modules/ovis/include/opencv2/ovis.hpp
+1
-0
ovis.cpp
modules/ovis/src/ovis.cpp
+7
-0
No files found.
modules/ovis/include/opencv2/ovis.hpp
View file @
40cba0a2
...
...
@@ -31,6 +31,7 @@ enum SceneSettings
enum
MaterialProperty
{
MATERIAL_POINT_SIZE
,
MATERIAL_LINE_WIDTH
,
MATERIAL_OPACITY
,
MATERIAL_EMISSIVE
,
MATERIAL_TEXTURE0
,
...
...
modules/ovis/src/ovis.cpp
View file @
40cba0a2
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment