Moved obj loading to MeshUtility from Mesh

Author: Cheng Xie

src/camera.cpp

@@ -4,8 +4,8 @@
 
 Camera::Camera()
 {
-    near_ = 0.1;
-    far_ = 1000;
+    near_ = 1;
+    far_ = 10000;
     aspectRatio_ = 1;
     heightAngle_ = 60;
 

src/final.pro

@@ -35,11 +35,12 @@ SOURCES += main.cpp \
     particlesystem.cpp \
     phongmaterial.cpp \
     particlematerial.cpp \
-    shader.cpp \
     skybox.cpp \
     skyboxmaterial.cpp \
     texture2d.cpp \
-    texturecube.cpp
+    texturecube.cpp \
+    terrain.cpp \
+    meshutility.cpp
 
 HEADERS += mainwindow.h \
     view.h \
@@ -67,6 +68,8 @@ HEADERS += mainwindow.h \
     skybox.h \
     skyboxmaterial.h \
     texture2d.h \
-    texturecube.h
+    texturecube.h \
+    terrain.h \
+    meshutility.h
 
 FORMS += mainwindow.ui

src/mesh.cpp

@@ -1,9 +1,6 @@
 #include "GL/glew.h"
 #include "mesh.h"
-#include <QFile>
-#include <QTextStream>
-#include <QRegExp>
-#include <QStringList>
+
 
 Mesh::Mesh()
 {
@@ -17,79 +14,6 @@ Mesh::~Mesh()
     glDeleteBuffers(1, &indexBufferObject_);
 }
 
-void Mesh::load(string filename)
-{
-    vector<SimpleVertex> vertexBuffer;
-    IndexBuffer indexBuffer;
-    
-    vector<vec3> normals;
-    vector<vec2> uvs;
-    
-    QFile file(filename.c_str());
-    if (!file.open(QFile::ReadOnly | QFile::Text)) {
-        assert(false);
-        return;
-    }
-    
-    QTextStream f(&file);
-    QString line;
-    
-    QRegExp spaces("\\s+");
-    do {
-        line = f.readLine().trimmed();
-        QStringList parts = line.split(spaces);
-        if (parts.isEmpty()) continue;
-        if (parts[0] == "v" && parts.count() >= 4) {
-            float x = parts[1].toFloat();
-            float y = parts[2].toFloat();
-            float z = parts[3].toFloat();
-            SimpleVertex v;
-            v.position = {x, y, z};
-            vertexBuffer.push_back(v);
-        } 
-        else if (parts[0] == "vn" && parts.count() >= 4) {
-            float x = parts[1].toFloat();
-            float y = parts[2].toFloat();
-            float z = parts[3].toFloat();
-            normals.push_back({x, y, z});
-        }
-        else if (parts[0] == "vt" && parts.count() >= 3) {
-            float u = parts[1].toFloat();
-            float v = parts[2].toFloat();
-            uvs.push_back({u, v});
-        }
-        else if (parts[0] == "f" && parts.count() >= 4) {
-            for (int i = 1; i <= 3; i++) {
-                QStringList subparts = parts[i].split('/');
-                int vertex = subparts.count() > 0 ? subparts[0].toInt() - 1 : -1;
-                int uv = subparts.count() > 1 ? subparts[1].toInt() - 1 : -1;
-                int normal = subparts.count() > 2 ? subparts[2].toInt() - 1 : -1;
-                indexBuffer.push_back(vertex);
-                SimpleVertex& v = vertexBuffer[vertex];
-                if (normal != -1) {
-                    v.normal += normals[normal];    
-                }
-                if (uv != -1) {
-                    v.uv = uvs[uv];
-                }
-            }
-        }
-    } while (!line.isNull());
-    
-    for (SimpleVertex& v : vertexBuffer) {
-        v.normal.normalize();
-    }
-    
-    VertexBufferDesc desc;
-    desc.bufferData = vertexBuffer.data();
-    desc.bufferSize = vertexBuffer.size() * sizeof(SimpleVertex);
-    desc.vertexElementSizes = {3, 3, 2};
-    desc.stride = sizeof(SimpleVertex);
-    
-    setVertexBuffer(desc, PrimitiveType::Triangles);
-    setIndexBuffer(indexBuffer);
-}
-
 void Mesh::render() const
 {
     assert(vertexArrayObject_ > 0 && vertexBufferObject_ > 0);

src/mesh.h

@@ -35,8 +35,6 @@ class Mesh
     Mesh();
     ~Mesh();
 
-    void load(string name);
-    
     void render() const;
 
     // Mesh doesn't own vertex buffer and index buffer, callers are responsible for releasing them

src/meshcache.cpp

@@ -1,4 +1,5 @@
 #include "meshcache.h"
+#include "meshutility.h"
 #include "mesh.h"
 
 static MeshCache* g_instance = NULL;
@@ -21,8 +22,9 @@ Mesh *MeshCache::acquire(string name)
 
     string filename = string("models/") + name + ".obj";
 
-    p = new Mesh;
-    p->load(filename);
+    p = MeshUtility::loadObjModel(filename);
+    
+    assert(p);
 
     addResource(name, p);
 

src/meshutility.cpp

@@ -0,0 +1,83 @@
+#include "meshutility.h"
+#include <QFile>
+#include <QTextStream>
+#include <QRegExp>
+#include <QStringList>
+#include "mesh.h"
+
+Mesh *MeshUtility::loadObjModel(string filename)
+{
+    vector<SimpleVertex> vertexBuffer;
+    IndexBuffer indexBuffer;
+    
+    vector<vec3> normals;
+    vector<vec2> uvs;
+    
+    QFile file(filename.c_str());
+    if (!file.open(QFile::ReadOnly | QFile::Text)) {
+        assert(false);
+        return NULL;
+    }
+    
+    QTextStream f(&file);
+    QString line;
+    
+    QRegExp spaces("\\s+");
+    do {
+        line = f.readLine().trimmed();
+        QStringList parts = line.split(spaces);
+        if (parts.isEmpty()) continue;
+        if (parts[0] == "v" && parts.count() >= 4) {
+            float x = parts[1].toFloat();
+            float y = parts[2].toFloat();
+            float z = parts[3].toFloat();
+            SimpleVertex v;
+            v.position = {x, y, z};
+            vertexBuffer.push_back(v);
+        } 
+        else if (parts[0] == "vn" && parts.count() >= 4) {
+            float x = parts[1].toFloat();
+            float y = parts[2].toFloat();
+            float z = parts[3].toFloat();
+            normals.push_back({x, y, z});
+        }
+        else if (parts[0] == "vt" && parts.count() >= 3) {
+            float u = parts[1].toFloat();
+            float v = parts[2].toFloat();
+            uvs.push_back({u, v});
+        }
+        else if (parts[0] == "f" && parts.count() >= 4) {
+            for (int i = 1; i <= 3; i++) {
+                QStringList subparts = parts[i].split('/');
+                int vertex = subparts.count() > 0 ? subparts[0].toInt() - 1 : -1;
+                int uv = subparts.count() > 1 ? subparts[1].toInt() - 1 : -1;
+                int normal = subparts.count() > 2 ? subparts[2].toInt() - 1 : -1;
+                indexBuffer.push_back(vertex);
+                SimpleVertex& v = vertexBuffer[vertex];
+                if (normal != -1) {
+                    v.normal += normals[normal];    
+                }
+                if (uv != -1) {
+                    v.uv = uvs[uv];
+                }
+            }
+        }
+    } while (!line.isNull());
+    
+    for (SimpleVertex& v : vertexBuffer) {
+        v.normal.normalize();
+    }
+    
+    Mesh* mesh = new Mesh;
+    
+    VertexBufferDesc desc;
+    desc.bufferData = vertexBuffer.data();
+    desc.bufferSize = vertexBuffer.size() * sizeof(SimpleVertex);
+    desc.vertexElementSizes = {3, 3, 2};
+    desc.stride = sizeof(SimpleVertex);
+    
+    mesh->setVertexBuffer(desc, PrimitiveType::Triangles);
+    mesh->setIndexBuffer(indexBuffer);
+    
+    return mesh;
+}

src/meshutility.h

@@ -0,0 +1,12 @@
+#ifndef MESHUTILITY_H
+#define MESHUTILITY_H
+
+#include "common.h"
+
+class MeshUtility
+{
+public:
+    static Mesh* loadObjModel(string filename);
+};
+
+#endif // MESHUTILITY_H

src/scene.cpp

@@ -26,7 +26,7 @@ Scene::~Scene()
         delete object;
     }
 
-    //delete skybox_;
+    delete skybox_;
 }
 
 void Scene::initialize()
@@ -70,8 +70,6 @@ void Scene::initialize()
 
     sceneObjects_.push_back(obj2);
 
-    //
-    
     // Lights owned by the scene
     DirectLight* light = new DirectLight({-1, -0.5, -1}, {1.0, 1.0, 1.0});
     lights_.push_back(light);
@@ -84,6 +82,8 @@ void Scene::initialize()
     particleMaterial->setTexture(tornadoMap);
     particleSystem->setMaterial(particleMaterial);
 
+    particleSystem->transform().translate(0, 10, 0);
+    
     sceneObjects_.push_back(particleSystem);
 
     // Skybox

src/shader.cpp

@@ -0,0 +1,5 @@
+#include "terrain.h"
+
+Terrain::Terrain()
+{
+}

src/terrain.cpp

@@ -0,0 +1,15 @@
+#ifndef TERRAIN_H
+#define TERRAIN_H
+
+#include "sceneobject.h"
+
+class Terrain : public SceneObject
+{
+public:
+    Terrain();
+    
+private:
+    void buildMesh() {}
+};
+
+#endif // TERRAIN_H