fixed a skybox depth bug

Author: Cheng Xie

diagram.png

@@ -4,7 +4,7 @@
 
 Camera::Camera()
 {
-    near_ = 10;
+    near_ = 1;
     far_ = 10000;
     aspectRatio_ = 1;
     heightAngle_ = 60;

src/camera.cpp

@@ -22,13 +22,6 @@ void FPSCameraController::mouseMoveEvent(QMouseEvent *event)
     if (rbuttonDown_) {
         QPoint mousePos = event->pos();
         QPoint delta = mousePos - oldMousePos_;
-       
-//        QMatrix4x4& rotation;
-//        rotation.rotate(-delta.x() * 0.5, {0, 1, 0});
-//        camera_->setTransform(camera_->transform() * rotation);
-        
-////        rotation.setToIdentity();
-////        rotation.rotate(-delta.y() * 0.5, );
 
         mat4& transform = camera_->transform();
         mat4 mat;

src/fpscameracontroller.cpp

@@ -40,16 +40,16 @@ void Scene::initialize()
     material1->setShiness(50);
 
     // Textures are owned by cache
-    Texture* diffuseMap = TextureCache::getInstance()->acquire("heightmap1", TextureType::Texture2D);
+    Texture* diffuseMap = TextureCache::getInstance()->acquire("frostmourne", TextureType::Texture2D);
     material1->setDiffuseMap(diffuseMap);
 
     SceneObject* obj1 = new SceneObject;
-    Mesh* mesh1 = MeshCache::getInstance()->acquire("cube");
+    Mesh* mesh1 = MeshCache::getInstance()->acquire("frostmourne");
     obj1->setMesh(mesh1);
     obj1->setMaterial(material1);
 
-    obj1->transform().translate(20, 0, 0);
-    obj1->transform().scale(5, 5, 5);
+    obj1->transform().translate(20, 20, 0);
+    obj1->transform().scale(20, 20, 20);
 
     sceneObjects_.push_back(obj1);       
 

src/scene.cpp

@@ -21,7 +21,7 @@ void main()
 
     if (useHeightMap) {
         float height = texture(heightMap, uvL).x;
-        position += normalL * height * 30;
+        position += normalL * height * 50;
 
         float turbulence = 0.1;
         const ivec3 off = ivec3(-1, 0, 1);

src/shaders/phong.vs

@@ -1,3 +1,4 @@
+#include "skybox.h"
 #include "skyboxmaterial.h"
 #include "shader.h"
 #include "shadercache.h"
@@ -22,5 +23,12 @@ void SkyboxMaterial::apply(DrawContext &context)
     assert(texture_);
 
     texture_->apply(context, "cubeMap", 0);
+    
+    glDepthMask(GL_FALSE);
+}
+
+void SkyboxMaterial::endRender()
+{
+    glDepthMask(GL_TRUE);
 }
 

src/skyboxmaterial.cpp

@@ -11,6 +11,7 @@ class SkyboxMaterial : public Material
     void setTexture(Texture *texture);
 
     virtual void apply(DrawContext &context) override;
+    virtual void endRender() override;
 
 private:
     Texture* texture_;

src/skyboxmaterial.h

@@ -22,7 +22,7 @@ void Terrain::buildMesh()
     material->setAmbient({0.2, 0.2, 0.2});
     material->setDiffuse({0.7, 0.7, 0.2});
 
-    Texture* heightMap = TextureCache::getInstance()->acquire("heightmap2", TextureType::Texture2D);
+    Texture* heightMap = TextureCache::getInstance()->acquire("heightmap1", TextureType::Texture2D);
     Texture* diffuseMap = TextureCache::getInstance()->acquire("terrain", TextureType::Texture2D);
 
     material->setHeightMap(heightMap);