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
cef011ad
Commit
cef011ad
authored
Oct 30, 2019
by
Pavel Grunt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ovis: s/seperate/separate/g
parent
ba08dbbe
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
ovis.hpp
modules/ovis/include/opencv2/ovis.hpp
+1
-1
ovis_demo.py
modules/ovis/samples/ovis_demo.py
+1
-1
ovis.cpp
modules/ovis/src/ovis.cpp
+4
-4
No files found.
modules/ovis/include/opencv2/ovis.hpp
View file @
cef011ad
...
...
@@ -19,7 +19,7 @@ namespace ovis {
enum
SceneSettings
{
/// the window will use a separate scene. The scene will be shared otherwise.
SCENE_SEP
E
RATE
=
1
,
SCENE_SEP
A
RATE
=
1
,
/// allow the user to control the camera.
SCENE_INTERACTIVE
=
2
,
/// draw coordinate system crosses for debugging
...
...
modules/ovis/samples/ovis_demo.py
View file @
cef011ad
...
...
@@ -18,7 +18,7 @@ owin.createEntity("figure", "Sinbad.mesh", tvec=(0, -5, 0), rot=(np.pi, 0, 0))
owin
.
createLightEntity
(
"sun"
,
(
0
,
0
,
-
100
))
# interaction scene
iwin
=
cv
.
ovis
.
createWindow
(
"AR"
,
imsize
,
cv
.
ovis
.
SCENE_SEP
E
RATE
|
cv
.
ovis
.
SCENE_INTERACTIVE
)
iwin
=
cv
.
ovis
.
createWindow
(
"AR"
,
imsize
,
cv
.
ovis
.
SCENE_SEP
A
RATE
|
cv
.
ovis
.
SCENE_INTERACTIVE
)
iwin
.
createEntity
(
"figure"
,
"Sinbad.mesh"
,
tvec
=
(
0
,
-
5
,
0
),
rot
=
(
np
.
pi
,
0
,
0
))
iwin
.
createLightEntity
(
"sun"
,
(
0
,
0
,
-
100
))
iwin
.
setCameraIntrinsics
(
K
,
imsize
)
...
...
modules/ovis/src/ovis.cpp
View file @
cef011ad
...
...
@@ -287,10 +287,10 @@ public:
{
if
(
!
app
->
sceneMgr
)
{
flags
|=
SCENE_SEP
E
RATE
;
flags
|=
SCENE_SEP
A
RATE
;
}
if
(
flags
&
SCENE_SEP
E
RATE
)
if
(
flags
&
SCENE_SEP
A
RATE
)
{
sceneMgr
=
root
->
createSceneManager
(
"DefaultSceneManager"
,
title
);
RTShader
::
ShaderGenerator
&
shadergen
=
RTShader
::
ShaderGenerator
::
getSingleton
();
...
...
@@ -347,7 +347,7 @@ public:
~
WindowSceneImpl
()
{
if
(
flags
&
SCENE_SEP
E
RATE
)
if
(
flags
&
SCENE_SEP
A
RATE
)
{
TextureManager
&
texMgr
=
TextureManager
::
getSingleton
();
...
...
@@ -363,7 +363,7 @@ public:
}
}
if
(
_app
->
sceneMgr
==
sceneMgr
&&
(
flags
&
SCENE_SEP
E
RATE
))
if
(
_app
->
sceneMgr
==
sceneMgr
&&
(
flags
&
SCENE_SEP
A
RATE
))
{
// this is the root window owning the context
CV_Assert
(
_app
->
numWindows
()
==
1
&&
"the first OVIS window must be deleted last"
);
...
...
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