fix depth state

Author: minggo

cocos/base/CCDirector.cpp

@@ -727,14 +727,20 @@ void Director::setAlphaBlending(bool on)
 
 void Director::setDepthTest(bool on)
 {
-    _renderer->setDepthTest(on);
+    if (on)
+    {
+        _renderer->setDepthTest(true);
+        _renderer->setDepthCompareFunction(backend::CompareFunction::LESS_EQUAL);
+    }
+    else
+        _renderer->setDepthTest(false);
+
     _renderer->setDepthWrite(on);
 }
 
 void Director::setClearColor(const Color4F& clearColor)
 {
     _clearColor = clearColor;
-    // _renderer->setClearColor(clearColor);
 }
 
 static void GLToClipTransform(Mat4 *transformOut)

cocos/renderer/CCRenderer.cpp

@@ -289,6 +289,8 @@ void Renderer::processRenderCommand(RenderCommand* command)
                 CCASSERT(cmd->getVertexCount()>= 0 && cmd->getVertexCount() < VBO_SIZE, "VBO for vertex is not big enough, please break the data down or use customized render command");
                 CCASSERT(cmd->getIndexCount()>= 0 && cmd->getIndexCount() < INDEX_VBO_SIZE, "VBO for index is not big enough, please break the data down or use customized render command");
                 drawBatchedTriangles();
+
+                // TODO: should create a new buffer for it.
             }
 
             // queue it
@@ -459,10 +461,22 @@ void Renderer::setDepthWrite(bool value)
     _depthStencilDescriptor.depthWriteEnabled = value;
     _renderPassDescriptor.needDepthAttachment = value;
 }
-bool Renderer::getDepthTest() const
+
+void Renderer::setDepthCompareFunction(backend::CompareFunction func)
+{
+    _depthStencilDescriptor.depthCompareFunction = func;
+}
+
+backend::CompareFunction Renderer::getDepthCompareFunction() const
+{
+    return _depthStencilDescriptor.depthCompareFunction;
+}
+
+bool Renderer::Renderer::getDepthTest() const
 {
     return _depthStencilDescriptor.depthTestEnabled;
 }
+
 bool Renderer::getDepthWrite() const
 {
     return _depthStencilDescriptor.depthWriteEnabled;

cocos/renderer/CCRenderer.h

@@ -209,8 +209,10 @@ class CC_DLL Renderer
 
     void setDepthTest(bool value);
     void setDepthWrite(bool value);
+    void setDepthCompareFunction(backend::CompareFunction func);
     bool getDepthTest() const;
     bool getDepthWrite() const;
+    backend::CompareFunction getDepthCompareFunction() const;
 
     void setStencilTest(bool value);
     void setStencilCompareFunction(backend::CompareFunction func, unsigned int ref, unsigned int readMask);

tests/cpp-tests/Classes/TileMapTest/TileMapTest.cpp

@@ -1084,7 +1084,7 @@ void TMXIsoVertexZ::onExit()
 {
     // At exit use any other projection. 
     Director::getInstance()->setProjection(Director::Projection::DEFAULT);
-   Director::getInstance()->setDepthTest(false);
+    Director::getInstance()->setDepthTest(false);
     TileDemo::onExit();
 }