pederbs
/
TDT4230_final_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for incorrect normals

This commit is contained in:
Bart van Blokland 2019-02-15 21:55:06 +01:00
parent a430863701
commit 5047f2b506
2 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gamelogic.cpp
View File

@ -99,8 +99,8 @@ void initGame(GLFWwindow* window, CommandLineOptions gameOptions) {
shader->makeBasicShader("../res/shaders/simple.vert", "../res/shaders/simple.frag");
shader->activate();
Mesh box = generateBox(boxDimensions.x, boxDimensions.y, boxDimensions.z, true);
Mesh pad = generateBox(padDimensions.x, padDimensions.y, padDimensions.z, false);
Mesh box = generateBox(boxDimensions.x, boxDimensions.y, boxDimensions.z, false);
Mesh pad = generateBox(padDimensions.x, padDimensions.y, padDimensions.z, true);
Mesh sphere = generateSphere(1.0, 40, 40);
unsigned int ballVAO = generateBuffer(sphere);

108
src/utilities/shapes.cpp
View File

@ -4,64 +4,62 @@
Mesh generateBox(float width, float height, float depth, bool flipFaces) {
// Hardcoded. Sue me.
// Edit: well, that backfired..
std::vector<glm::vec3> vertices = {
{0, 0, 0},
{0, height, depth},
{0, 0, depth},
{0, height, depth},
{0, 0, 0},
{0, height, depth},
{0, height, 0},
{width, 0, 0},
{width, height, 0},
{width, height, depth},
{width, 0, 0},
{width, height, depth},
{width, 0, depth},
{0, 0, 0},
{width, height, 0},
{width, 0, 0},
{0, 0, 0},
{0, height, 0},
{0, height, depth},
{width, 0, 0},
{width, height, depth},
{width, height, 0},
{0, 0, depth},
{width, 0, 0},
{width, 0, depth},
{width, height, depth},
{0, 0, depth},
{width, height, depth},
{0, height, depth},
{0, 0, 0},
{width, 0, 0},
{width, height, 0},
{0, 0, 0},
{width, height, 0},
{0, height, 0},
{0, 0, depth},
{width, height, depth},
{width, 0, depth},
{0, 0, depth},
{0, height, depth},
{width, height, depth},
{0, 0, 0},
{width, 0, depth},
{width, 0, 0},
{0, 0, 0},
{0, 0, depth},
{width, 0, depth},
{width, height, 0},
{0, height, depth},
{0, height, 0},
{0, height, depth},
{width, height, 0},
{0, height, depth},
{width, height, depth}};
{width, height, depth},
{0, height, depth}};
// These are technically inverted relative to the vertex coordinates.
// But for some strange reason the faces are rendered inverted.
// So to make the assignment work this is the best I can do.
std::vector<glm::vec3> normals = {
{-1.0, 0.0, 0.0},
{-1.0, 0.0, 0.0},
{-1.0, 0.0, 0.0},
{-1.0, 0.0, 0.0},
{-1.0, 0.0, 0.0},
{-1.0, 0.0, 0.0},
{1.0, 0.0, 0.0},
{1.0, 0.0, 0.0},
{1.0, 0.0, 0.0},
@ -70,21 +68,21 @@ Mesh generateBox(float width, float height, float depth, bool flipFaces) {
{1.0, 0.0, 0.0},
{1.0, 0.0, 0.0},
{0.0, -1.0, 0.0},
{0.0, -1.0, 0.0},
{0.0, -1.0, 0.0},
{-1.0, 0.0, 0.0},
{-1.0, 0.0, 0.0},
{-1.0, 0.0, 0.0},
{0.0, -1.0, 0.0},
{0.0, -1.0, 0.0},
{0.0, -1.0, 0.0},
{-1.0, 0.0, 0.0},
{-1.0, 0.0, 0.0},
{-1.0, 0.0, 0.0},
{0.0, 1.0, 0.0},
{0.0, 1.0, 0.0},
{0.0, 1.0, 0.0},
{0.0, 0.0, 1.0},
{0.0, 0.0, 1.0},
{0.0, 0.0, 1.0},
{0.0, 1.0, 0.0},
{0.0, 1.0, 0.0},
{0.0, 1.0, 0.0},
{0.0, 0.0, 1.0},
{0.0, 0.0, 1.0},
{0.0, 0.0, 1.0},
{0.0, 0.0, -1.0},
{0.0, 0.0, -1.0},
@ -94,13 +92,21 @@ Mesh generateBox(float width, float height, float depth, bool flipFaces) {
{0.0, 0.0, -1.0},
{0.0, 0.0, -1.0},
{0.0, 0.0, 1.0},
{0.0, 0.0, 1.0},
{0.0, 0.0, 1.0},
{0.0, 1.0, 0.0},
{0.0, 1.0, 0.0},
{0.0, 1.0, 0.0},
{0.0, 0.0, 1.0},
{0.0, 0.0, 1.0},
{0.0, 0.0, 1.0},
{0.0, 1.0, 0.0},
{0.0, 1.0, 0.0},
{0.0, 1.0, 0.0},
{0.0, -1.0, 0.0},
{0.0, -1.0, 0.0},
{0.0, -1.0, 0.0},
{0.0, -1.0, 0.0},
{0.0, -1.0, 0.0},
{0.0, -1.0, 0.0},
};
std::vector<unsigned int> indices = {