Conjure/LOG750-LAB2
6
0
Fork 0
mirror of https://github.com/ConjureETS/LOG750-LAB2.git synced 2026-03-24 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

sdfsdfsdfsdf

Browse Source
This commit is contained in:
Dmitri K 2016-11-18 20:16:51 -05:00
parent 48e5889f60
commit 31fbcbd9e1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shaders/basicShader.frag
View File

@ -35,7 +35,7 @@ vec4 calcDirLight(vec4 tex, vec3 fPos, vec3 fNorm) {
// Compute ambient component // Compute ambient component
float amb = 0.2; float amb = 0.2;
float mult = 1; //max(0.0, -LightDirection.y); float mult = max(0.0, LightDirection.y);
//return vec4(0); //return vec4(0);
return vec4(tex.xyz * (diff + amb + spec) * mult, tex.w); return vec4(tex.xyz * (diff + amb + spec) * mult, tex.w);

2
src/viewer/simpleViewer.cpp
View File

@ -146,7 +146,7 @@ void Viewer::draw()
camera()->getProjectionMatrix(projectionMatrix); camera()->getProjectionMatrix(projectionMatrix);
camera()->getModelViewMatrix(modelViewMatrix); 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_projMatrixLocation, projectionMatrix);
m_program->setUniformValue(m_mvMatrixLocation, modelViewMatrix); m_program->setUniformValue(m_mvMatrixLocation, modelViewMatrix);