change functions for windows

JorgenPo · Mar 22, 2017 · 3744c0a · 3744c0a
1 parent ffd067f
commit 3744c0a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/core/blcamera.h b/src/core/blcamera.h
@@ -22,20 +22,20 @@ class Camera {
 public:
 
     Camera();
-    Camera(float fov, float ratio, float near, float far);
+    Camera(float fov, float ratio, float nearPlane, float farPlane);
 
     virtual ~Camera();
 
     // Setters
     void setPerspective(float fov, float ratio,
-                        float near, float far);
+                        float nearPlane, float farPlane);
 
     void setPerspective(const QMatrix4x4 &perspective);
 
     void setFov(float fov);
     void setAspectRatio(float ratio);
-    void setNearPlane(float near);
-    void setFarPlane(float far);
+    void setNearPlane(float nearPlane);
+    void setFarPlane(float farPlane);
 
     void setView(const QVector3D &position,
                  const QVector3D &lookAt,
@@ -67,8 +67,8 @@ class Camera {
     // Getters
     float fov() const { return m_fov; }
     float ratio() const { return m_ratio; }
-    float near() const { return m_near; }
-    float far() const { return m_far; }
+    float nearPlane() const { return m_near; }
+    float farPlane() const { return m_far; }
 
     QMatrix4x4 perspective();
     QMatrix4x4 view();

diff --git a/src/core/blmodel.cpp b/src/core/blmodel.cpp
@@ -10,6 +10,8 @@ Model::Model()
       m_rotation(), m_matModel(),
       m_needUpdate()
 {
+    initializeOpenGLFunctions();
+
     m_texture = std::shared_ptr<Texture>(ResourceManager::getInstance()
             .get<Texture>("textures/default.jpg"));
 }

diff --git a/src/core/blmodel.h b/src/core/blmodel.h
@@ -25,7 +25,7 @@ namespace black {
  * @version 1.0 19.03.2017
  *  Working version of Model class
  */
-class Model : public Resource
+class Model : public Resource, private QOpenGLFunctions
 {
     friend class ResourceManager;
 public: