faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Merge branch 'master' of github.com:Faerbit/swp

Browse Source
This commit is contained in:
Steffen Fündgens 2014-12-15 13:36:13 +01:00
commit 2e472f8921
4 changed files with 444 additions and 634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Blenderfiles/marbleSmooth.blend
View File

Binary file not shown.

1074
Levels/Geometry/marbleSmooth.obj
View File

File diff suppressed because it is too large Load Diff

BIN
Levels/Textures/Marbletexture.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 9.5 MiB

4
object.cc
View File

@ -25,8 +25,8 @@ void Object::render(ACGL::OpenGL::SharedShaderProgram shader, bool lightingPass,
// set model matrix
shader->setUniform( "modelMatrix", modelMatrix);
// set shadowMVPs
glm::mat4 shadowMVPs[35];
for(unsigned int i = 0; (i<shadowVPs->size() && i<35); i++) {
glm::mat4 shadowMVPs[5];
for(unsigned int i = 0; (i<shadowVPs->size() && i<5); i++) {
shadowMVPs[i] = shadowVPs->at(i) * modelMatrix;
}
glUniformMatrix4fv(shader->getUniformLocation("shadowMVPs"),