Commit cef011ad authored by Pavel Grunt's avatar Pavel Grunt

ovis: s/seperate/separate/g

parent ba08dbbe
...@@ -19,7 +19,7 @@ namespace ovis { ...@@ -19,7 +19,7 @@ namespace ovis {
enum SceneSettings enum SceneSettings
{ {
/// the window will use a separate scene. The scene will be shared otherwise. /// the window will use a separate scene. The scene will be shared otherwise.
SCENE_SEPERATE = 1, SCENE_SEPARATE = 1,
/// allow the user to control the camera. /// allow the user to control the camera.
SCENE_INTERACTIVE = 2, SCENE_INTERACTIVE = 2,
/// draw coordinate system crosses for debugging /// draw coordinate system crosses for debugging
......
...@@ -18,7 +18,7 @@ owin.createEntity("figure", "Sinbad.mesh", tvec=(0, -5, 0), rot=(np.pi, 0, 0)) ...@@ -18,7 +18,7 @@ owin.createEntity("figure", "Sinbad.mesh", tvec=(0, -5, 0), rot=(np.pi, 0, 0))
owin.createLightEntity("sun", (0, 0, -100)) owin.createLightEntity("sun", (0, 0, -100))
# interaction scene # interaction scene
iwin = cv.ovis.createWindow("AR", imsize, cv.ovis.SCENE_SEPERATE | cv.ovis.SCENE_INTERACTIVE) iwin = cv.ovis.createWindow("AR", imsize, cv.ovis.SCENE_SEPARATE | cv.ovis.SCENE_INTERACTIVE)
iwin.createEntity("figure", "Sinbad.mesh", tvec=(0, -5, 0), rot=(np.pi, 0, 0)) iwin.createEntity("figure", "Sinbad.mesh", tvec=(0, -5, 0), rot=(np.pi, 0, 0))
iwin.createLightEntity("sun", (0, 0, -100)) iwin.createLightEntity("sun", (0, 0, -100))
iwin.setCameraIntrinsics(K, imsize) iwin.setCameraIntrinsics(K, imsize)
......
...@@ -287,10 +287,10 @@ public: ...@@ -287,10 +287,10 @@ public:
{ {
if (!app->sceneMgr) if (!app->sceneMgr)
{ {
flags |= SCENE_SEPERATE; flags |= SCENE_SEPARATE;
} }
if (flags & SCENE_SEPERATE) if (flags & SCENE_SEPARATE)
{ {
sceneMgr = root->createSceneManager("DefaultSceneManager", title); sceneMgr = root->createSceneManager("DefaultSceneManager", title);
RTShader::ShaderGenerator& shadergen = RTShader::ShaderGenerator::getSingleton(); RTShader::ShaderGenerator& shadergen = RTShader::ShaderGenerator::getSingleton();
...@@ -347,7 +347,7 @@ public: ...@@ -347,7 +347,7 @@ public:
~WindowSceneImpl() ~WindowSceneImpl()
{ {
if (flags & SCENE_SEPERATE) if (flags & SCENE_SEPARATE)
{ {
TextureManager& texMgr = TextureManager::getSingleton(); TextureManager& texMgr = TextureManager::getSingleton();
...@@ -363,7 +363,7 @@ public: ...@@ -363,7 +363,7 @@ public:
} }
} }
if(_app->sceneMgr == sceneMgr && (flags & SCENE_SEPERATE)) if(_app->sceneMgr == sceneMgr && (flags & SCENE_SEPARATE))
{ {
// this is the root window owning the context // this is the root window owning the context
CV_Assert(_app->numWindows() == 1 && "the first OVIS window must be deleted last"); CV_Assert(_app->numWindows() == 1 && "the first OVIS window must be deleted last");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment