ovis: fix camera entity positioning

paroj · paroj · commit 4e77e6fdaa55 · 2018-03-29T12:40:37.000+02:00
diff --git a/modules/ovis/src/ovis.cpp b/modules/ovis/src/ovis.cpp
@@ -119,6 +119,10 @@ static SceneNode& _getSceneNode(SceneManager* sceneMgr, const String& name)
     try
     {
         mo = sceneMgr->getMovableObject(name, "Camera");
+
+        // with cameras we have an extra CS flip node
+        if(mo)
+            return *mo->getParentSceneNode()->getParentSceneNode();
     }
     catch (ItemIdentityException&)
     {
@@ -385,6 +389,8 @@ class WindowSceneImpl : public WindowScene
         Vector3 t;
         _convertRT(rot, tvec, q, t);
         SceneNode* node = sceneMgr->getRootSceneNode()->createChildSceneNode(t, q);
+        node = node->createChildSceneNode();
+        node->setOrientation(toOGRE); // camera mesh is oriented by OGRE conventions by default
         node->attachObject(cam);
 
         RealRect ext = cam->getFrustumExtents();

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,10 @@ static SceneNode& _getSceneNode(SceneManager* sceneMgr, const String& name)`
`119`	`119`	`try`
`120`	`120`	`{`
`121`	`121`	`mo = sceneMgr->getMovableObject(name, "Camera");`
	`122`	`+`
	`123`	`+ // with cameras we have an extra CS flip node`
	`124`	`+ if(mo)`
	`125`	`+ return *mo->getParentSceneNode()->getParentSceneNode();`
`122`	`126`	`}`
`123`	`127`	`catch (ItemIdentityException&)`
`124`	`128`	`{`
`@@ -385,6 +389,8 @@ class WindowSceneImpl : public WindowScene`
`385`	`389`	`Vector3 t;`
`386`	`390`	`_convertRT(rot, tvec, q, t);`
`387`	`391`	`SceneNode* node = sceneMgr->getRootSceneNode()->createChildSceneNode(t, q);`
	`392`	`+ node = node->createChildSceneNode();`
	`393`	`+ node->setOrientation(toOGRE); // camera mesh is oriented by OGRE conventions by default`
`388`	`394`	`node->attachObject(cam);`
`389`	`395`
`390`	`396`	`RealRect ext = cam->getFrustumExtents();`