lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplified CSM code, removed some comments.

Browse Source
This commit is contained in:
arby
2021-10-07 23:28:51 +02:00
parent 6f03f5a959
commit c7102b1d9b
1 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/8.guest/2021/2.csm/shadow_mapping.cpp
View File

@@ -320,25 +320,6 @@ void renderScene(const Shader &shader)
shader.setMat4("model", model);
renderCube();
}
// cubes
//model = glm::mat4(1.0f);
//model = glm::translate(model, glm::vec3(-5.0f, -3.0f, 0.0));
//model = glm::scale(model, glm::vec3(2));
//shader.setMat4("model", model);
//renderCube();
//model = glm::mat4(1.0f);
//model = glm::translate(model, glm::vec3(2.0f, 3.0f, 1.0));
//model = glm::scale(model, glm::vec3(2));
//shader.setMat4("model", model);
//renderCube();
//model = glm::mat4(1.0f);
//model = glm::translate(model, glm::vec3(-1.0f, 3.0f, 2.0));
//model = glm::rotate(model, glm::radians(60.0f), glm::normalize(glm::vec3(1.0, 0.0, 1.0)));
//model = glm::scale(model, glm::vec3(2));
//shader.setMat4("model", model);
//renderCube();
}
@@ -633,20 +614,9 @@ glm::mat4 getLightSpaceMatrix(const float nearPlane, const float farPlane)
maxZ *= zMult;
}
const glm::mat4 lpMatrix = glm::ortho(-1.0f, 1.0f, -1.0f, 1.0f, minZ, maxZ);
const glm::mat4 lightProjection = glm::ortho(minX, maxX, minY, maxY, minZ, maxZ);
const float scaleX = 2.0f / (maxX - minX);
const float scaleY = 2.0f / (maxY - minY);
const float offsetX = -0.5f * (minX + maxX) * scaleX;
const float offsetY = -0.5f * (minY + maxY) * scaleY;
glm::mat4 cropMatrix(1.0f);
cropMatrix[0][0] = scaleX;
cropMatrix[1][1] = scaleY;
cropMatrix[3][0] = offsetX;
cropMatrix[3][1] = offsetY;
return cropMatrix * lpMatrix * lightView;
return lightProjection * lightView;
}
std::vector<glm::mat4> getLightSpaceMatrices()