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
8a8d609a
Commit
8a8d609a
authored
Nov 27, 2019
by
Pavel Rojtberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ovis: drop several workarounds for old OGRE versions
not needed since we require OGRE 1.11.5 via CMake
parent
c9514b80
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
11 deletions
+0
-11
ovis.cpp
modules/ovis/src/ovis.cpp
+0
-11
No files found.
modules/ovis/src/ovis.cpp
View file @
8a8d609a
...
...
@@ -335,11 +335,7 @@ public:
{
camman
.
reset
(
new
OgreBites
::
CameraMan
(
camNode
));
camman
->
setStyle
(
OgreBites
::
CS_ORBIT
);
#if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 5)
camman
->
setFixedYaw
(
false
);
#else
camNode
->
setFixedYawAxis
(
true
,
Vector3
::
NEGATIVE_UNIT_Y
);
// OpenCV +Y in Ogre CS
#endif
}
if
(
!
app
->
sceneMgr
)
...
...
@@ -579,7 +575,6 @@ public:
const
Scalar
&
specularColour
)
CV_OVERRIDE
{
Light
*
light
=
sceneMgr
->
createLight
(
name
);
light
->
setDirection
(
Vector3
::
NEGATIVE_UNIT_Z
);
// convert to BGR
light
->
setDiffuseColour
(
ColourValue
(
diffuseColour
[
2
],
diffuseColour
[
1
],
diffuseColour
[
0
]));
light
->
setSpecularColour
(
ColourValue
(
specularColour
[
2
],
specularColour
[
1
],
specularColour
[
0
]));
...
...
@@ -838,9 +833,7 @@ public:
void
fixCameraYawAxis
(
bool
useFixed
,
InputArray
_up
)
CV_OVERRIDE
{
#if OGRE_VERSION >= ((1 << 16) | (11 << 8) | 5)
if
(
camman
)
camman
->
setFixedYaw
(
useFixed
);
#endif
Vector3
up
=
Vector3
::
NEGATIVE_UNIT_Y
;
if
(
!
_up
.
empty
())
...
...
@@ -997,11 +990,7 @@ void setMaterialProperty(const String& name, int prop, const Scalar& val)
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"
);
...
...
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