Seperated terrain shader from phong shader to make it more flexible

Author: Cheng Xie

src/final.pro

@@ -44,7 +44,8 @@ SOURCES += main.cpp \
     orbitcameracontroller.cpp \
     fpscameracontroller.cpp \
     Tornado.cpp \
-    TornadoParticleSystem.cpp
+    TornadoParticleSystem.cpp \
+    terrainmaterial.cpp
 
 HEADERS += mainwindow.h \
     view.h \
@@ -78,6 +79,7 @@ HEADERS += mainwindow.h \
     orbitcameracontroller.h \
     fpscameracontroller.h \
     Tornado.h \
-    TornadoParticleSystem.h
+    TornadoParticleSystem.h \
+    terrainmaterial.h
 
 FORMS += mainwindow.ui

src/fpscameracontroller.cpp

@@ -4,6 +4,8 @@
 #include <QWheelEvent>
 #include "camera.h"
 
+static const float rotate_factor = 0.3;
+
 FPSCameraController::FPSCameraController(Camera *camera) : CameraController(camera)
 {
 
@@ -32,11 +34,11 @@ void FPSCameraController::mouseMoveEvent(QMouseEvent *event)
         transform = mat * transform;
 
         mat.setToIdentity();
-        mat.rotate(-delta.x() * 0.5, {0, 1, 0});
+        mat.rotate(-delta.x() * rotate_factor, {0, 1, 0});
         transform = mat * transform;
 
         mat.setToIdentity();
-        mat.rotate(-delta.y() * 0.5, camera_->right());
+        mat.rotate(-delta.y() * rotate_factor, camera_->right());
         transform = mat * transform;
 
         mat.setToIdentity();

src/fpscameracontroller.h

@@ -24,7 +24,7 @@ class FPSCameraController : public CameraController
     bool dPressed_ = false;
     bool rbuttonDown_ = false;
     QPoint oldMousePos_;
-    float speed_ = 50.f;
+    float speed_ = 10.f;
 };
 
 #endif // FPSCAMERACONTROLLER_H

src/meshutility.cpp

@@ -98,6 +98,8 @@ Mesh *MeshUtility::createPlane(int tessellationLevel, float size)
 
     vec3 dy = (upperleft - lowerleft) / tessellationLevel;
 
+    cout << dy << endl;
+    
     float width = (lowerright - lowerleft).length();
     float height = (upperleft - lowerleft).length();
 
@@ -152,6 +154,7 @@ void MeshUtility::tessellate(vec3 p1, vec3 p2, int level, vector<vec3> &result)
     assert(level > 0);
 
     auto delta = (p2 - p1) / level;
+  
     for (int i = 0; i <= level; i++)
     {
         result.push_back(p1 + delta * i);

src/phongmaterial.cpp

@@ -32,16 +32,6 @@ void PhongMaterial::apply(DrawContext &context)
     else {
         shader_->setUniformValue("useDiffuseMap", false);
     }
-    
-    // TODO
-    if (heightMap_) {
-        shader_->setUniformValue("useHeightMap", true);
-        heightMap_->apply(context, "heightMap", 1);
-    }
-    else {
-        shader_->setUniformValue("useHeightMap", false);
-    }
-    
 }
 
 const Color& PhongMaterial::ambient() const
@@ -72,6 +62,7 @@ void PhongMaterial::setSpecular(const Color &specular)
 {
     specular_ = specular;
 }
+
 float PhongMaterial::shiness() const
 {
     return shiness_;
@@ -86,9 +77,3 @@ void PhongMaterial::setDiffuseMap(Texture *diffuseMap)
 {
     diffuseMap_ = diffuseMap;
 }
-
-void PhongMaterial::setHeightMap(Texture *heightMap)
-{
-    heightMap_ = heightMap;
-}
-

src/phongmaterial.h

@@ -24,11 +24,6 @@ class PhongMaterial : public Material
     void setShiness(float shiness);
 
     void setDiffuseMap(Texture *diffuseMap);
-    Texture* getDiffuseMap(){return diffuseMap_;}
-    
-    // TODO
-    void setHeightMap(Texture *heightMap);
-    Texture* getHeightMap(){return heightMap_;}
 
 private:
     Color ambient_;
@@ -37,9 +32,6 @@ class PhongMaterial : public Material
     float shiness_ = 0;
 
     Texture* diffuseMap_ = NULL;
-    
-    // TODO
-    Texture* heightMap_ = NULL;
 };
 
 #endif // PHONGMATERIAL_H

src/scene.cpp

@@ -38,7 +38,7 @@ void Scene::initialize()
     material1->setAmbient({0.2, 0.2, 0.2});
     material1->setDiffuse({0.7, 0.7, 0.7});
     material1->setSpecular({0.7, 0.7, 0.7});
-    material1->setShiness(50);
+    material1->setShiness(100);
 
     // Textures are owned by cache
     Texture* diffuseMap = TextureCache::getInstance()->acquire("frostmourne", TextureType::Texture2D);
@@ -49,28 +49,10 @@ void Scene::initialize()
     obj1->setMesh(mesh1);
     obj1->setMaterial(material1);
 
-    obj1->transform().translate(20, 20, 0);
+    obj1->transform().translate(0, 50, 0);
     obj1->transform().scale(20, 20, 20);
 
-    sceneObjects_.push_back(obj1);       
-    
-    //
-    PhongMaterial* material2 = new PhongMaterial;
-    material2->setAmbient({0.2, 0.2, 0.2});
-    material2->setDiffuse({0.7, 0.7, 0.7});
-    material2->setSpecular({0.7, 0.7, 0.7});
-    material2->setShiness(50);
-    
-    SceneObject *obj2 = new SceneObject;
-    Mesh* mesh2 = MeshCache::getInstance()->acquire("bunny");
-    obj2->setMesh(mesh2);
-    
-    obj2->setMaterial(material2);
-    
-    obj2->transform().translate(-20, 0, 0);
-    obj2->transform().scale(20, 20, 20);
-
-    sceneObjects_.push_back(obj2);
+    sceneObjects_.push_back(obj1);
 
     // Lights owned by the scene
     DirectLight* light = new DirectLight({-1, -0.5, -1}, {1.0, 1.0, 1.0});
@@ -80,16 +62,10 @@ void Scene::initialize()
     skybox_ = new Skybox("cloudy");
 
     // Terrain
-    int size = 800;
+    int size = 200;
 
-    Terrain* terrain = new Terrain({0, 0, 0}, size+2);
+    Terrain* terrain = new Terrain({0, 0, 0}, size);
     sceneObjects_.push_back(terrain);
-    
-//    terrain = new Terrain({size, 0, size}, size+2);
-//    sceneObjects_.push_back(terrain);
-    
-//    terrain = new Terrain({size, 0, 0}, size+2);
-//    sceneObjects_.push_back(terrain);
 
     // Get a tornado in here!
     vec3 tornadoStart;
@@ -112,7 +88,7 @@ void Scene::render(DrawContext &context)
     context.sceneObjects = &sceneObjects_;
     context.scene = this;
 
-    skybox_->render(context);
+    //skybox_->render(context);
 
     for (SceneObject* object : sceneObjects_) {
         object->render(context);

src/shaders/phong.fs

@@ -34,7 +34,7 @@ void main()
     vec3 Li = lightColor * cos_factor;
 
     vec3 color = Li * brdf_phong;
-    color += ambient;
+    color += ambient * brdf_diffuse;
 
     fragColor = vec4(color, 1);
 }

src/shaders/phong.vs

@@ -7,9 +7,6 @@ layout (location = 2) in vec2 uvL;
 uniform mat4 world;
 uniform mat4 worldViewProjection;
 
-uniform bool useHeightMap;
-uniform sampler2D heightMap;
-
 out vec3 normalW;
 out vec3 positionW;
 out vec2 uv;
@@ -19,22 +16,6 @@ void main()
     vec3 position = positionL;
     vec3 normal = normalL;
 
-    if (useHeightMap) {
-        float height = texture(heightMap, uvL).x;
-        position += normalL * height * 50;
-
-        float turbulence = 0.1;
-        const ivec3 off = ivec3(-1, 0, 1);
-
-        float h_pos_u = textureOffset(heightMap, uvL, off.zy).x;
-        float h_neg_u = textureOffset(heightMap, uvL, off.xy).x;
-        float h_pos_v = textureOffset(heightMap, uvL, off.yz).x;
-        float h_neg_v = textureOffset(heightMap, uvL, off.yx).x;
-        vec3 du = normalize(vec3(turbulence, h_pos_u - h_neg_u, 0));
-        vec3 dv = normalize(vec3(0, h_pos_v - h_neg_v, -turbulence));
-        normal = cross(du, dv);
-    }
-
     positionW = (world * vec4(position, 1)).xyz;
     normalW = (world * vec4(normal, 0)).xyz;
     uv = uvL;

src/shaders/terrain.fs

@@ -0,0 +1,30 @@
+#version 330
+
+in vec3 normalW;
+in vec3 positionW;
+in vec2 uv;
+
+uniform vec3 lightDir;
+uniform vec3 lightColor;
+
+uniform vec3 ambient;
+
+uniform sampler2D diffuseMap;
+
+out vec4 fragColor;
+
+void main()
+{
+    vec3 n = normalize(normalW);
+    vec3 l = normalize(-lightDir);
+
+    vec3 brdf_diffuse = texture(diffuseMap, uv * 15).xyz;
+
+    float cos_factor = max(0, dot(l, n));
+    vec3 Li = lightColor * cos_factor;
+
+    vec3 color = Li * brdf_diffuse;
+    color += ambient * brdf_diffuse;
+
+    fragColor = vec4(color, 1);
+}

src/shaders/terrain.vs

@@ -0,0 +1,41 @@
+#version 330
+
+layout (location = 0) in vec3 positionL;
+layout (location = 2) in vec2 uvL;
+
+uniform mat4 world;
+uniform mat4 worldViewProjection;
+
+uniform float heightScale;
+
+uniform sampler2D heightMap;
+
+out vec3 normalW;
+out vec3 positionW;
+out vec2 uv;
+
+void main()
+{
+    vec3 position = positionL;
+    vec3 normal = vec3(0, 1, 0);
+
+    float height = texture(heightMap, uvL).x;
+    position += normal * height * heightScale;
+
+    float turbulence = 0.1;
+    const ivec3 off = ivec3(-1, 0, 1);
+
+    float h_pos_u = textureOffset(heightMap, uvL, off.zy).x;
+    float h_neg_u = textureOffset(heightMap, uvL, off.xy).x;
+    float h_pos_v = textureOffset(heightMap, uvL, off.yz).x;
+    float h_neg_v = textureOffset(heightMap, uvL, off.yx).x;
+    vec3 du = normalize(vec3(turbulence, h_pos_u - h_neg_u, 0));
+    vec3 dv = normalize(vec3(0, h_pos_v - h_neg_v, -turbulence));
+    normal = cross(du, dv);
+
+    positionW = (world * vec4(position, 1)).xyz;
+    normalW = (world * vec4(normal, 0)).xyz;
+    uv = uvL;
+
+    gl_Position = worldViewProjection * vec4(position, 1);
+}

src/terrain.cpp

@@ -1,23 +1,24 @@
 #include "terrain.h"
 #include "meshutility.h"
-#include "phongmaterial.h"
+#include "terrainmaterial.h"
 #include "mesh.h"
 #include "texturecache.h"
 
 Terrain::Terrain(const vec3& center, int size)
 {
     mesh_ = MeshUtility::createPlane(200, size / 2);
 
-    PhongMaterial* material = new PhongMaterial;
-    material->setAmbient({0.2, 0.2, 0.2});
-    material->setDiffuse({0.7, 0.7, 0.2});
+    TerrainMaterial* material = new TerrainMaterial;
+    material->setAmbient({0.4, 0.4, 0.4});
 
-    Texture* heightMap = TextureCache::getInstance()->acquire("heightmap3", TextureType::Texture2D);
+    Texture* heightMap = TextureCache::getInstance()->acquire("heightmap2", TextureType::Texture2D);
     Texture* diffuseMap = TextureCache::getInstance()->acquire("terrain", TextureType::Texture2D);
 
     material->setHeightMap(heightMap);
     material->setDiffuseMap(diffuseMap);
 
+    material->setHeightScale(10);
+    
     setMaterial(material);
 
     transform().translate(center);