From 31fbcbd9e1514e0fa64005688eff32dbcfeda09f Mon Sep 17 00:00:00 2001 From: Dmitri K Date: Fri, 18 Nov 2016 20:16:51 -0500 Subject: [PATCH] sdfsdfsdfsdf --- src/shaders/basicShader.frag | 2 +- src/viewer/simpleViewer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shaders/basicShader.frag b/src/shaders/basicShader.frag index 29e3e8f..edb83e1 100644 --- a/src/shaders/basicShader.frag +++ b/src/shaders/basicShader.frag @@ -35,7 +35,7 @@ vec4 calcDirLight(vec4 tex, vec3 fPos, vec3 fNorm) { // Compute ambient component float amb = 0.2; - float mult = 1; //max(0.0, -LightDirection.y); + float mult = max(0.0, LightDirection.y); //return vec4(0); return vec4(tex.xyz * (diff + amb + spec) * mult, tex.w); diff --git a/src/viewer/simpleViewer.cpp b/src/viewer/simpleViewer.cpp index 490e0a1..383ebcf 100644 --- a/src/viewer/simpleViewer.cpp +++ b/src/viewer/simpleViewer.cpp @@ -146,7 +146,7 @@ void Viewer::draw() camera()->getProjectionMatrix(projectionMatrix); camera()->getModelViewMatrix(modelViewMatrix); - modelViewMatrix.rotate(30,1,0,0); + modelViewMatrix.rotate(30,0,1,0); m_program->setUniformValue(m_projMatrixLocation, projectionMatrix); m_program->setUniformValue(m_mvMatrixLocation, modelViewMatrix);