Vector normals

Author: Pilzschaf

.gitignore

@@ -35,3 +35,6 @@ tools/modelexporter
 
 # Dolphin
 .directory
+
+# VSCode
+.vscode/ipch

defines.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <cstdint>
+#include "libs/glm/glm.hpp"
 
 typedef int8_t int8;
 typedef int16_t int16;
@@ -15,12 +16,6 @@ typedef float float32;
 typedef double float64;
 
 struct Vertex {
-	float32 x;
-	float32 y;
-	float32 z;
-	
-	float32 r;
-	float32 g;
-	float32 b;
-	float32 a;
+	glm::vec3 position;
+	glm::vec3 normal;
 };

main.cpp

@@ -95,13 +95,12 @@ int main(int argc, char** argv) {
 
 	for(uint64 i = 0; i < numVertices; i++) {
 		Vertex vertex;
-		input.read((char*)&vertex.x, sizeof(float));
-		input.read((char*)&vertex.y, sizeof(float));
-		input.read((char*)&vertex.z, sizeof(float));
-		vertex.r = 1.0f;
-		vertex.g = 1.0f;
-		vertex.b = 1.0f;
-		vertex.a = 1.0f;
+		input.read((char*)&vertex.position.x, sizeof(float));
+		input.read((char*)&vertex.position.y, sizeof(float));
+		input.read((char*)&vertex.position.z, sizeof(float));
+		input.read((char*)&vertex.normal.x, sizeof(float));
+		input.read((char*)&vertex.normal.y, sizeof(float));
+		input.read((char*)&vertex.normal.z, sizeof(float));
 		vertices.push_back(vertex);
 	}
 	for(uint64 i = 0; i < numIndices; i++) {

models/monkey.bmf

@@ -1,7 +1,7 @@
 #version 330 core
 
 layout(location = 0) in vec3 a_position;
-layout(location = 1) in vec4 a_color;
+layout(location = 1) in vec3 a_normal;
 
 out vec4 v_color;
 
@@ -10,5 +10,5 @@ uniform mat4 u_modelViewProj;
 void main()
 {
     gl_Position = u_modelViewProj * vec4(a_position, 1.0f);
-    v_color = a_color;
+    v_color = vec4(a_normal, 1.0f);
 }

shaders/basic.vs

@@ -12,15 +12,22 @@ struct Position {
 };
 
 std::vector<Position> positions;
+std::vector<Position> normals;
 std::vector<uint32_t> indices;
 
 void processMesh(aiMesh* mesh, const aiScene* scene) {
     for(unsigned int i = 0; i < mesh->mNumVertices; i++) {
-        Position vertex;
-        vertex.x = mesh->mVertices[i].x;
-        vertex.y = mesh->mVertices[i].y;
-        vertex.z = mesh->mVertices[i].z;
-        positions.push_back(vertex);
+        Position position;
+        position.x = mesh->mVertices[i].x;
+        position.y = mesh->mVertices[i].y;
+        position.z = mesh->mVertices[i].z;
+        positions.push_back(position);
+
+        Position normal;
+        normal.x = mesh->mNormals[i].x;
+        normal.y = mesh->mNormals[i].y;
+        normal.z = mesh->mNormals[i].z;
+        normals.push_back(normal);
     }
 
     for(unsigned int i = 0; i < mesh->mNumFaces; i++) {
@@ -65,7 +72,7 @@ int main(int argc, char** argv) {
     }
 
     Assimp::Importer importer;
-    const aiScene* scene = importer.ReadFile(argv[argc-1], aiProcess_Triangulate | aiProcess_OptimizeMeshes | aiProcess_OptimizeGraph | aiProcess_JoinIdenticalVertices | aiProcess_ImproveCacheLocality);
+    const aiScene* scene = importer.ReadFile(argv[argc-1], aiProcess_Triangulate | aiProcess_GenNormals | aiProcess_OptimizeMeshes | aiProcess_OptimizeGraph | aiProcess_JoinIdenticalVertices | aiProcess_ImproveCacheLocality);
     if(!scene || scene->mFlags & AI_SCENE_FLAGS_INCOMPLETE, !scene->mRootNode) {
         std::cout << "Error while loading model with assimp: " << importer.GetErrorString() << std::endl;
         return 1;
@@ -87,6 +94,10 @@ int main(int argc, char** argv) {
         output.write((char*)&positions[i].x, sizeof(float));
         output.write((char*)&positions[i].y, sizeof(float));
         output.write((char*)&positions[i].z, sizeof(float));
+
+        output.write((char*)&normals[i].x, sizeof(float));
+        output.write((char*)&normals[i].y, sizeof(float));
+        output.write((char*)&normals[i].z, sizeof(float));
     }
     for(uint64_t i = 0; i < numIndices; i++) {
         output.write((char*)&indices[i], sizeof(uint32_t));

tools/modelexporter.cpp

@@ -13,9 +13,9 @@ struct VertexBuffer {
         glBufferData(GL_ARRAY_BUFFER, numVertices * sizeof(Vertex), data, GL_STATIC_DRAW);
 
         glEnableVertexAttribArray(0);
-	    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*) offsetof(struct Vertex,x));
+	    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*) offsetof(struct Vertex,position));
         glEnableVertexAttribArray(1);
-	    glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*) offsetof(struct Vertex,r));
+	    glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*) offsetof(struct Vertex,normal));
 
         glBindVertexArray(0);
     }