From ed74f11d39b763de3ca78b18a14f65f1596f5635 Mon Sep 17 00:00:00 2001 From: Oleksii Leleka Date: Sun, 18 Aug 2019 02:41:26 +0300 Subject: [PATCH] water render before world render --- rwengine/src/render/GameRenderer.cpp | 10 +++++----- rwengine/src/render/WaterRenderer.cpp | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/rwengine/src/render/GameRenderer.cpp b/rwengine/src/render/GameRenderer.cpp index df976bf3..78c4a1ec 100644 --- a/rwengine/src/render/GameRenderer.cpp +++ b/rwengine/src/render/GameRenderer.cpp @@ -235,15 +235,15 @@ void GameRenderer::renderWorld(GameWorld* world, const ViewCamera& camera, culled = 0; - renderObjects(world); + renderer->pushDebugGroup("Water"); - renderer->pushDebugGroup("Water"); - - water.render(*this, world); + water.render(*this, world); profWater = renderer->popDebugGroup(); - renderer->pushDebugGroup("Sky"); + renderObjects(world); + + renderer->pushDebugGroup("Sky"); glBindVertexArray(vao); diff --git a/rwengine/src/render/WaterRenderer.cpp b/rwengine/src/render/WaterRenderer.cpp index 4adbef82..9e838153 100644 --- a/rwengine/src/render/WaterRenderer.cpp +++ b/rwengine/src/render/WaterRenderer.cpp @@ -132,7 +132,7 @@ void WaterRenderer::render(GameRenderer &renderer, GameWorld* world) { glStencilFunc(GL_EQUAL, 1, 0xFF); glStencilMask(0x00); - glEnable(GL_DEPTH_TEST); + glDisable(GL_DEPTH_TEST); r.useProgram(waterProg.get()); @@ -152,4 +152,5 @@ void WaterRenderer::render(GameRenderer &renderer, GameWorld* world) { r.drawArrays(m, &gridDraw, wdp); glDisable(GL_STENCIL_TEST); + glEnable(GL_DEPTH_TEST); }