Made OgreCameraWrapper virtual and delegated Ogre::Camera handling to…

… implementing class.
advancingu · Oct 5, 2013 · cad4d3a · cad4d3a
1 parent cc71bf7
commit cad4d3a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/example/cameranodeobject.cpp b/example/cameranodeobject.cpp
@@ -20,6 +20,7 @@ static const Ogre::Vector3 initialPosition(0, 0, 300);
 CameraNodeObject::CameraNodeObject(QObject *parent) :
     QObject(parent),
     OgreCameraWrapper(),
+    m_camera(0),
     m_yaw(0),
     m_pitch(0),
     m_zoom(1)

diff --git a/example/cameranodeobject.h b/example/cameranodeobject.h
@@ -30,6 +30,7 @@ class CameraNodeObject : public QObject, public OgreCameraWrapper
 
     Ogre::SceneNode *sceneNode() const
     { return m_node; }
+    Ogre::Camera* camera() const { return m_camera; }
 
     qreal yaw() const
     { return m_yaw; }
@@ -47,6 +48,7 @@ class CameraNodeObject : public QObject, public OgreCameraWrapper
     void updateRotation();
 
     Ogre::SceneNode *m_node;
+    Ogre::Camera *m_camera;
 
     qreal m_yaw;
     qreal m_pitch;

diff --git a/lib/ogrecamerawrapper.cpp b/lib/ogrecamerawrapper.cpp
@@ -10,6 +10,5 @@
 #include "ogrecamerawrapper.h"
 
 OgreCameraWrapper::OgreCameraWrapper()
-    : m_camera(0)
 {
 }
diff --git a/lib/ogrecamerawrapper.h b/lib/ogrecamerawrapper.h
@@ -24,10 +24,7 @@ class OgreCameraWrapper
 public:
     OgreCameraWrapper();
     virtual ~OgreCameraWrapper() {}
-    Ogre::Camera* camera() { return m_camera; }
-
-protected:
-    Ogre::Camera *m_camera;
+    virtual Ogre::Camera* camera() const = 0;
 };
 
 #endif // OGRECAMERAWRAPPER_H
diff --git a/lib/ogreitem.cpp b/lib/ogreitem.cpp
@@ -24,7 +24,7 @@ OgreItem::OgreItem(QQuickItem *parent)
 
 QSGNode *OgreItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 {
-    if (width() <= 0 || height() <= 0 || !m_camera || !m_ogreEngineItem) {
+    if (width() <= 0 || height() <= 0 || !m_camera || !m_camera->camera() || !m_ogreEngineItem) {
         delete oldNode;
         return 0;
     }