Commit cef011ad authored by Pavel Grunt's avatar Pavel Grunt
Browse files

ovis: s/seperate/separate/g

parent ba08dbbe

modules/ovis/include/opencv2/ovis.hpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ namespace ovis { 
enum SceneSettings

{

    /// 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.

    SCENE_INTERACTIVE = 2,

    /// draw coordinate system crosses for debugging

modules/ovis/samples/ovis_demo.py

+1 −1
Original line number Diff line number Diff line
@@ -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_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.createLightEntity("sun", (0, 0, -100))

iwin.setCameraIntrinsics(K, imsize)

modules/ovis/src/ovis.cpp

+4 −4
Original line number Diff line number Diff line
@@ -287,10 +287,10 @@ public: 
    {

        if (!app->sceneMgr)

        {

            flags |= SCENE_SEPERATE;

            flags |= SCENE_SEPARATE;

        }



        if (flags & SCENE_SEPERATE)

        if (flags & SCENE_SEPARATE)

        {

            sceneMgr = root->createSceneManager("DefaultSceneManager", title);

            RTShader::ShaderGenerator& shadergen = RTShader::ShaderGenerator::getSingleton();
@@ -347,7 +347,7 @@ public: 


    ~WindowSceneImpl()

    {

        if (flags & SCENE_SEPERATE)

        if (flags & SCENE_SEPARATE)

        {

            TextureManager& texMgr =  TextureManager::getSingleton();
@@ -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

            CV_Assert(_app->numWindows() == 1 && "the first OVIS window must be deleted last");