BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed being able to switch between Quad view and normal view.

Browse Source
This commit is contained in:
Tleety
2014-04-27 04:59:11 +02:00
parent a199e777bc
commit 4389f2db4c
4 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Renderer.cpp
+25 -2
View File
@@ -119,10 +119,15 @@ void Renderer::LoadContent()
m_FirstPassProgram.Link();
m_SecondPassProgram.AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Vertex2.glsl")));
m_SecondPassProgram.AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Fragment2-Debug.glsl")));
m_SecondPassProgram.AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Fragment2.glsl")));
m_SecondPassProgram.Compile();
m_SecondPassProgram.Link();
m_SecondPassProgram_Debug.AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Vertex2.glsl")));
m_SecondPassProgram_Debug.AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Fragment2-Debug.glsl")));
m_SecondPassProgram_Debug.Compile();
m_SecondPassProgram_Debug.Link();
m_ScreenQuad = CreateQuad();
FrameBufferTextures();
@@ -130,6 +135,16 @@ void Renderer::LoadContent()
void Renderer::Draw(double dt)
{
if(glfwGetKey(m_Window, GLFW_KEY_F1))
{
m_QuadView = false;
}
if(glfwGetKey(m_Window, GLFW_KEY_F2))
{
m_QuadView = true;
}
glDisable(GL_BLEND);
DrawFBO();
@@ -653,7 +668,14 @@ void Renderer::DrawFBO()
// Draw to screen
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
m_SecondPassProgram.Bind();
if(!m_QuadView)
{
m_SecondPassProgram.Bind();
}
else
{
m_SecondPassProgram_Debug.Bind();
}
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
////SetupDefferedStageUniforms(); // Probably what we do in FrameBufferTextures();
@@ -736,6 +758,7 @@ void Renderer::DrawFBOScene()
{
glm::mat4 cameraMatrix = m_Camera->ProjectionMatrix() * m_Camera->ViewMatrix();
glm::mat4 MVP;
for (auto tuple : ModelsToRender)
{
Model* model;