From 2100a9c2218a611e90d6caa4e65b8a5fc8dbdebd Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Sun, 16 Apr 2023 00:22:02 -0500 Subject: [PATCH] Format --- assignment-2b/.gitignore | 1 + assignment-2b/CMakeLists.txt | 148 ++++----- assignment-2b/compile_commands.json | 1 + assignment-2b/src/main.cpp | 464 +++++++++++++++------------ assignment-2b/src/shader.frag | 43 +-- assignment-2b/src/shader.hpp | 264 +++++++++------- assignment-2b/src/shader.vert | 36 ++- assignment-2b/src/trimesh.hpp | 472 ++++++++++++++++------------ 8 files changed, 791 insertions(+), 638 deletions(-) mode change 100755 => 100644 assignment-2b/CMakeLists.txt create mode 120000 assignment-2b/compile_commands.json diff --git a/assignment-2b/.gitignore b/assignment-2b/.gitignore index 7981c18..f096ddc 100644 --- a/assignment-2b/.gitignore +++ b/assignment-2b/.gitignore @@ -1,2 +1,3 @@ /build .DS_Store +.cache diff --git a/assignment-2b/CMakeLists.txt b/assignment-2b/CMakeLists.txt old mode 100755 new mode 100644 index c5b6604..bc5a416 --- a/assignment-2b/CMakeLists.txt +++ b/assignment-2b/CMakeLists.txt @@ -1,71 +1,79 @@ -# Set the minimum required version of cmake for this project -cmake_minimum_required (VERSION 3.1) - -# Create a project called 'HW2b' -project(HW2b) - -# Find OpenGL, set link library names and include paths -find_package(OpenGL REQUIRED) -set(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) -set(OPENGL_INCLUDE_DIRS ${OPENGL_INCLUDE_DIR}) -include_directories(${OPENGL_INCLUDE_DIRS}) - -# Disable building some of the extra things GLFW has (examples, tests, docs) -set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL " " FORCE) -set(GLFW_BUILD_TESTS OFF CACHE BOOL " " FORCE) -set(GLFW_BUILD_DOCS OFF CACHE BOOL " " FORCE) - -add_definitions( -DMY_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}/src/" ) -add_definitions( -DMY_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/" ) - -# Run cmake on the CMakeLists.txt file found inside of the GLFW directory -add_subdirectory(ext/glfw) - -# Make a list of all the source files -set( - SOURCES - src/main.cpp - ext/glad/src/glad.c -) - -# Make a list of all the header files -set( - INCLUDES - src/shader.hpp - src/trimesh.hpp -) - -# Make a list of all of the directories to look in when doing #include "whatever.h" -set( - INCLUDE_DIRS - ext/ - ext/glfw/include - ext/glad/include -) +# Set the minimum required version of cmake for this project +cmake_minimum_required (VERSION 3.1) -# Make a list of the libraries -set( - LIBS - glfw - ${OPENGL_LIBRARIES} -) - -# Define what we are trying to produce here (an executable), -# and what items are needed to create it (the header and source files) -add_executable(${PROJECT_NAME} ${SOURCES} ${INCLUDES}) - -# Tell cmake which directories to look in when you #include a file -# Equivalent to the "-I" option for g++ -include_directories(${INCLUDE_DIRS}) - -# Tell cmake which libraries to link to -# Equivalent to the "-l" option for g++ -target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBS}) - -# For Visual Studio only -if (MSVC) - # Do a parallel compilation of this project - target_compile_options(${PROJECT_NAME} PRIVATE "/MP") - # Have this project be the default startup project (the one to build/run when hitting F5) - set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME}) -endif() \ No newline at end of file +# Create a project called 'HW2b' +project(HW2b) + +# Generate the `compile_commands.json` file. +set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "") + +if(CMAKE_EXPORT_COMPILE_COMMANDS) + set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES + ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}) +endif() + +# Find OpenGL, set link library names and include paths +find_package(OpenGL REQUIRED) +set(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) +set(OPENGL_INCLUDE_DIRS ${OPENGL_INCLUDE_DIR}) +include_directories(${OPENGL_INCLUDE_DIRS}) + +# Disable building some of the extra things GLFW has (examples, tests, docs) +set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL " " FORCE) +set(GLFW_BUILD_TESTS OFF CACHE BOOL " " FORCE) +set(GLFW_BUILD_DOCS OFF CACHE BOOL " " FORCE) + +add_definitions( -DMY_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}/src/" ) +add_definitions( -DMY_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/" ) + +# Run cmake on the CMakeLists.txt file found inside of the GLFW directory +add_subdirectory(ext/glfw) + +# Make a list of all the source files +set( + SOURCES + src/main.cpp + ext/glad/src/glad.c +) + +# Make a list of all the header files +set( + INCLUDES + src/shader.hpp + src/trimesh.hpp +) + +# Make a list of all of the directories to look in when doing #include "whatever.h" +set( + INCLUDE_DIRS + ext/ + ext/glfw/include + ext/glad/include +) + +# Make a list of the libraries +set( + LIBS + glfw + ${OPENGL_LIBRARIES} +) + +# Define what we are trying to produce here (an executable), +# and what items are needed to create it (the header and source files) +add_executable(${PROJECT_NAME} ${SOURCES} ${INCLUDES}) + +# Tell cmake which directories to look in when you #include a file +# Equivalent to the "-I" option for g++ +include_directories(${INCLUDE_DIRS}) + +# Tell cmake which libraries to link to +# Equivalent to the "-l" option for g++ +target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBS}) + +# For Visual Studio only +if (MSVC) + # Do a parallel compilation of this project + target_compile_options(${PROJECT_NAME} PRIVATE "/MP") + # Have this project be the default startup project (the one to build/run when hitting F5) + set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME}) +endif() diff --git a/assignment-2b/compile_commands.json b/assignment-2b/compile_commands.json new file mode 120000 index 000000000..25eb4b2 --- /dev/null +++ b/assignment-2b/compile_commands.json @@ -0,0 +1 @@ +build/compile_commands.json \ No newline at end of file diff --git a/assignment-2b/src/main.cpp b/assignment-2b/src/main.cpp index f735b83..4e21f3c 100755 --- a/assignment-2b/src/main.cpp +++ b/assignment-2b/src/main.cpp @@ -1,12 +1,14 @@ -// This template code was originally written by Matt Overby while a TA for CSci5607 +// This template code was originally written by Matt Overby while a TA for +// CSci5607 + +#include "glad/glad.h" // The loaders are included by glfw3 (glcorearb.h) if we are not using glew. -#include "glad/glad.h" #include "GLFW/glfw3.h" // Includes -#include "trimesh.hpp" #include "shader.hpp" +#include "trimesh.hpp" #include // memcpy // Constants @@ -15,269 +17,319 @@ class Mat4x4 { public: + float m[16]; - float m[16]; + // clang-format off + Mat4x4(){ // Default: Identity + m[0] = 1.f; m[4] = 0.f; m[8] = 0.f; m[12] = 0.f; + m[1] = 0.f; m[5] = 1.f; m[9] = 0.f; m[13] = 0.f; + m[2] = 0.f; m[6] = 0.f; m[10] = 1.f; m[14] = 0.f; + m[3] = 0.f; m[7] = 0.f; m[11] = 0.f; m[15] = 1.f; + } + // clang-format on - Mat4x4(){ // Default: Identity - m[0] = 1.f; m[4] = 0.f; m[8] = 0.f; m[12] = 0.f; - m[1] = 0.f; m[5] = 1.f; m[9] = 0.f; m[13] = 0.f; - m[2] = 0.f; m[6] = 0.f; m[10] = 1.f; m[14] = 0.f; - m[3] = 0.f; m[7] = 0.f; m[11] = 0.f; m[15] = 1.f; - } + // clang-format off + void make_identity(){ + m[0] = 1.f; m[4] = 0.f; m[8] = 0.f; m[12] = 0.f; + m[1] = 0.f; m[5] = 1.f; m[9] = 0.f; m[13] = 0.f; + m[2] = 0.f; m[6] = 0.f; m[10] = 1.f; m[14] = 0.f; + m[3] = 0.f; m[7] = 0.f; m[11] = 0.f; m[15] = 1.f; + } + // clang-format on - void make_identity(){ - m[0] = 1.f; m[4] = 0.f; m[8] = 0.f; m[12] = 0.f; - m[1] = 0.f; m[5] = 1.f; m[9] = 0.f; m[13] = 0.f; - m[2] = 0.f; m[6] = 0.f; m[10] = 1.f; m[14] = 0.f; - m[3] = 0.f; m[7] = 0.f; m[11] = 0.f; m[15] = 1.f; - } + // clang-format off + void print(){ + std::cout << m[0] << ' ' << m[4] << ' ' << m[8] << ' ' << m[12] << "\n"; + std::cout << m[1] << ' ' << m[5] << ' ' << m[9] << ' ' << m[13] << "\n"; + std::cout << m[2] << ' ' << m[6] << ' ' << m[10] << ' ' << m[14] << "\n"; + std::cout << m[3] << ' ' << m[7] << ' ' << m[11] << ' ' << m[15] << "\n"; + } + // clang-format on - void print(){ - std::cout << m[0] << ' ' << m[4] << ' ' << m[8] << ' ' << m[12] << "\n"; - std::cout << m[1] << ' ' << m[5] << ' ' << m[9] << ' ' << m[13] << "\n"; - std::cout << m[2] << ' ' << m[6] << ' ' << m[10] << ' ' << m[14] << "\n"; - std::cout << m[3] << ' ' << m[7] << ' ' << m[11] << ' ' << m[15] << "\n"; - } - - void make_scale(float x, float y, float z){ - make_identity(); - m[0] = x; m[5] = y; m[10] = z; - } + void make_scale(float x, float y, float z) { + make_identity(); + m[0] = x; + m[5] = y; + m[10] = z; + } }; -static inline const Vec3f operator*(const Mat4x4 &m, const Vec3f &v){ - Vec3f r( m.m[0]*v[0]+m.m[4]*v[1]+m.m[8]*v[2], - m.m[1]*v[0]+m.m[5]*v[1]+m.m[9]*v[2], - m.m[2]*v[0]+m.m[6]*v[1]+m.m[10]*v[2] ); - return r; +static inline const Vec3f operator*(const Mat4x4 &m, const Vec3f &v) { + Vec3f r(m.m[0] * v[0] + m.m[4] * v[1] + m.m[8] * v[2], + m.m[1] * v[0] + m.m[5] * v[1] + m.m[9] * v[2], + m.m[2] * v[0] + m.m[6] * v[1] + m.m[10] * v[2]); + return r; } - // // Global state variables // namespace Globals { - double cursorX, cursorY; // cursor positions - float win_width, win_height; // window size - float aspect; - GLuint verts_vbo[1], colors_vbo[1], normals_vbo[1], faces_ibo[1], tris_vao; - TriMesh mesh; - - // Model, view and projection matrices, initialized to the identity - Mat4x4 model; // not used in this assignment; included for completeness only - Mat4x4 view; - Mat4x4 projection; -} +double cursorX, cursorY; // cursor positions +float win_width, win_height; // window size +float aspect; +GLuint verts_vbo[1], colors_vbo[1], normals_vbo[1], faces_ibo[1], tris_vao; +TriMesh mesh; +// Model, view and projection matrices, initialized to the identity +Mat4x4 model; // not used in this assignment; included for completeness only +Mat4x4 view; +Mat4x4 projection; +} // namespace Globals // // Callbacks // -static void error_callback(int error, const char* description){ fprintf(stderr, "Error: %s\n", description); } - -static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods){ - // Close on escape or Q - if( action == GLFW_PRESS ){ - switch ( key ) { - case GLFW_KEY_ESCAPE: glfwSetWindowShouldClose(window, GL_TRUE); break; - case GLFW_KEY_Q: glfwSetWindowShouldClose(window, GL_TRUE); break; - // ToDo: update the viewing transformation matrix according to key presses - } - } +static void error_callback(int error, const char *description) { + fprintf(stderr, "Error: %s\n", description); } -static void framebuffer_size_callback(GLFWwindow* window, int width, int height){ - Globals::win_width = float(width); - Globals::win_height = float(height); - Globals::aspect = Globals::win_width/Globals::win_height; - - glViewport(0,0,width,height); - - // ToDo: update the perspective matrix as the window size changes - +static void key_callback(GLFWwindow *window, int key, int scancode, int action, + int mods) { + // Close on escape or Q + if (action == GLFW_PRESS) { + switch (key) { + case GLFW_KEY_ESCAPE: + glfwSetWindowShouldClose(window, GL_TRUE); + break; + case GLFW_KEY_Q: + glfwSetWindowShouldClose(window, GL_TRUE); + break; + // ToDo: update the viewing transformation matrix according to key presses + } + } } +static void framebuffer_size_callback(GLFWwindow *window, int width, + int height) { + Globals::win_width = float(width); + Globals::win_height = float(height); + Globals::aspect = Globals::win_width / Globals::win_height; + + glViewport(0, 0, width, height); + + // ToDo: update the perspective matrix as the window size changes +} // Function to set up geometry void init_scene(); - // // Main // -int main(int argc, char *argv[]){ +int main(int argc, char *argv[]) { - // Load the mesh - std::stringstream obj_file; obj_file << MY_DATA_DIR << "sibenik/sibenik.obj"; - if( !Globals::mesh.load_obj( obj_file.str() ) ){ return 0; } - Globals::mesh.print_details(); + // Load the mesh + std::stringstream obj_file; + obj_file << MY_DATA_DIR << "sibenik/sibenik.obj"; + if (!Globals::mesh.load_obj(obj_file.str())) { + return 0; + } + Globals::mesh.print_details(); - // Forcibly scale the mesh vertices so that the entire model fits within a (-1,1) volume: the code below is a temporary measure that is needed to enable the entire model to be visible in the template app, before the student has defined the proper viewing and projection matrices - // This code should eventually be replaced by the use of an appropriate projection matrix - // FYI: the model dimensions are: center = (0,0,0); height: 30.6; length: 40.3; width: 17.0 - // find the extremum of the vertex locations (this approach works because the model is known to be centered; a more complicated method would be required in the general case) - float min, max, scale; - min = Globals::mesh.vertices[0][0]; max = Globals::mesh.vertices[0][0]; - for( int i=0; i max) max = Globals::mesh.vertices[i][0]; - if (Globals::mesh.vertices[i][1] < min) min = Globals::mesh.vertices[i][1]; - else if (Globals::mesh.vertices[i][1] > max) max = Globals::mesh.vertices[i][1]; - if (Globals::mesh.vertices[i][2] < min) min = Globals::mesh.vertices[i][2]; - else if (Globals::mesh.vertices[i][2] > max) max = Globals::mesh.vertices[i][2]; - } - // work with positive numbers - if (min < 0) min = -min; - // scale so that the component that is most different from 0 is mapped to 1 (or -1); all other values will then by definition fall between -1 and 1 - if (max > min) scale = 1/max; else scale = 1/min; - - // scale the model vertices by brute force - Mat4x4 mscale; mscale.make_scale( scale, scale, scale ); - for( int i=0; i max) + max = Globals::mesh.vertices[i][0]; + if (Globals::mesh.vertices[i][1] < min) + min = Globals::mesh.vertices[i][1]; + else if (Globals::mesh.vertices[i][1] > max) + max = Globals::mesh.vertices[i][1]; + if (Globals::mesh.vertices[i][2] < min) + min = Globals::mesh.vertices[i][2]; + else if (Globals::mesh.vertices[i][2] > max) + max = Globals::mesh.vertices[i][2]; + } + // work with positive numbers + if (min < 0) + min = -min; + // scale so that the component that is most different from 0 is mapped to 1 + // (or -1); all other values will then by definition fall between -1 and 1 + if (max > min) + scale = 1 / max; + else + scale = 1 / min; - // Set up the window variable - GLFWwindow* window; - - // Define the error callback function - glfwSetErrorCallback(&error_callback); + // scale the model vertices by brute force + Mat4x4 mscale; + mscale.make_scale(scale, scale, scale); + for (int i = 0; i < Globals::mesh.vertices.size(); ++i) { + Globals::mesh.vertices[i] = mscale * Globals::mesh.vertices[i]; + } + // The above can be removed once a proper projection matrix is defined - // Initialize glfw - if( !glfwInit() ){ return EXIT_FAILURE; } + // Set up the window variable + GLFWwindow *window; - // Ask for OpenGL 3.3 - glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); - glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); - glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); - glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); + // Define the error callback function + glfwSetErrorCallback(&error_callback); - // Create the glfw window - Globals::win_width = WIN_WIDTH; - Globals::win_height = WIN_HEIGHT; - window = glfwCreateWindow(int(Globals::win_width), int(Globals::win_height), "HW2b", NULL, NULL); - if( !window ){ glfwTerminate(); return EXIT_FAILURE; } + // Initialize glfw + if (!glfwInit()) { + return EXIT_FAILURE; + } - // Define callbacks to handle user input and window resizing - glfwSetKeyCallback(window, &key_callback); - glfwSetFramebufferSizeCallback(window, &framebuffer_size_callback); + // Ask for OpenGL 3.3 + glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); + glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); + glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); + glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); - // More setup stuff - glfwMakeContextCurrent(window); // Make the window current - glfwSwapInterval(1); // Set the swap interval + // Create the glfw window + Globals::win_width = WIN_WIDTH; + Globals::win_height = WIN_HEIGHT; + window = glfwCreateWindow(int(Globals::win_width), int(Globals::win_height), + "HW2b", NULL, NULL); + if (!window) { + glfwTerminate(); + return EXIT_FAILURE; + } - // make sure the openGL and GLFW code can be found - if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) { - std::cout << "Failed to gladLoadGLLoader" << std::endl; - glfwTerminate(); - return EXIT_FAILURE; - } + // Define callbacks to handle user input and window resizing + glfwSetKeyCallback(window, &key_callback); + glfwSetFramebufferSizeCallback(window, &framebuffer_size_callback); - // Initialize the shaders - // MY_SRC_DIR was defined in CMakeLists.txt - // it specifies the full path to this project's src/ directory. - mcl::Shader shader; - std::stringstream ss; ss << MY_SRC_DIR << "shader."; - shader.init_from_files( ss.str()+"vert", ss.str()+"frag" ); + // More setup stuff + glfwMakeContextCurrent(window); // Make the window current + glfwSwapInterval(1); // Set the swap interval - // Initialize the scene - init_scene(); - framebuffer_size_callback(window, int(Globals::win_width), int(Globals::win_height)); + // make sure the openGL and GLFW code can be found + if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) { + std::cout << "Failed to gladLoadGLLoader" << std::endl; + glfwTerminate(); + return EXIT_FAILURE; + } - // Perform some OpenGL initializations - glEnable(GL_DEPTH_TEST); // turn hidden surfce removal on - glClearColor(1.f,1.f,1.f,1.f); // set the background to white + // Initialize the shaders + // MY_SRC_DIR was defined in CMakeLists.txt + // it specifies the full path to this project's src/ directory. + mcl::Shader shader; + std::stringstream ss; + ss << MY_SRC_DIR << "shader."; + shader.init_from_files(ss.str() + "vert", ss.str() + "frag"); - // Enable the shader, this allows us to set uniforms and attributes - shader.enable(); + // Initialize the scene + init_scene(); + framebuffer_size_callback(window, int(Globals::win_width), + int(Globals::win_height)); - // Bind buffers - glBindVertexArray(Globals::tris_vao); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, Globals::faces_ibo[0]); - - // Game loop - while( !glfwWindowShouldClose(window) ){ + // Perform some OpenGL initializations + glEnable(GL_DEPTH_TEST); // turn hidden surfce removal on + glClearColor(1.f, 1.f, 1.f, 1.f); // set the background to white - // Clear the color and depth buffers - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + // Enable the shader, this allows us to set uniforms and attributes + shader.enable(); - // Send updated info to the GPU - glUniformMatrix4fv( shader.uniform("model"), 1, GL_FALSE, Globals::model.m ); // model transformation (always the identity matrix in this assignment) - glUniformMatrix4fv( shader.uniform("view"), 1, GL_FALSE, Globals::view.m ); // viewing transformation - glUniformMatrix4fv( shader.uniform("projection"), 1, GL_FALSE, Globals::projection.m ); // projection matrix + // Bind buffers + glBindVertexArray(Globals::tris_vao); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, Globals::faces_ibo[0]); - // Draw - glDrawElements(GL_TRIANGLES, Globals::mesh.faces.size()*3, GL_UNSIGNED_INT, 0); + // Game loop + while (!glfwWindowShouldClose(window)) { - // Finalize - glfwSwapBuffers(window); - glfwPollEvents(); + // Clear the color and depth buffers + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - } // end game loop + // Send updated info to the GPU + glUniformMatrix4fv(shader.uniform("model"), 1, GL_FALSE, + Globals::model.m); // model transformation (always the + // identity matrix in this assignment) + glUniformMatrix4fv(shader.uniform("view"), 1, GL_FALSE, + Globals::view.m); // viewing transformation + glUniformMatrix4fv(shader.uniform("projection"), 1, GL_FALSE, + Globals::projection.m); // projection matrix - // Unbind - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); - glBindVertexArray(0); + // Draw + glDrawElements(GL_TRIANGLES, Globals::mesh.faces.size() * 3, + GL_UNSIGNED_INT, 0); - // Disable the shader, we're done using it - shader.disable(); - - return EXIT_SUCCESS; + // Finalize + glfwSwapBuffers(window); + glfwPollEvents(); + + } // end game loop + + // Unbind + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + glBindVertexArray(0); + + // Disable the shader, we're done using it + shader.disable(); + + return EXIT_SUCCESS; } +void init_scene() { -void init_scene(){ + using namespace Globals; - using namespace Globals; + // Create the buffer for vertices + glGenBuffers(1, verts_vbo); + glBindBuffer(GL_ARRAY_BUFFER, verts_vbo[0]); + glBufferData(GL_ARRAY_BUFFER, mesh.vertices.size() * sizeof(mesh.vertices[0]), + &mesh.vertices[0][0], GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); - // Create the buffer for vertices - glGenBuffers(1, verts_vbo); - glBindBuffer(GL_ARRAY_BUFFER, verts_vbo[0]); - glBufferData(GL_ARRAY_BUFFER, mesh.vertices.size()*sizeof(mesh.vertices[0]), &mesh.vertices[0][0], GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); + // Create the buffer for colors + glGenBuffers(1, colors_vbo); + glBindBuffer(GL_ARRAY_BUFFER, colors_vbo[0]); + glBufferData(GL_ARRAY_BUFFER, mesh.colors.size() * sizeof(mesh.colors[0]), + &mesh.colors[0][0], GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); - // Create the buffer for colors - glGenBuffers(1, colors_vbo); - glBindBuffer(GL_ARRAY_BUFFER, colors_vbo[0]); - glBufferData(GL_ARRAY_BUFFER, mesh.colors.size()*sizeof(mesh.colors[0]), &mesh.colors[0][0], GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); + // Create the buffer for normals + glGenBuffers(1, normals_vbo); + glBindBuffer(GL_ARRAY_BUFFER, normals_vbo[0]); + glBufferData(GL_ARRAY_BUFFER, mesh.normals.size() * sizeof(mesh.normals[0]), + &mesh.normals[0][0], GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); - // Create the buffer for normals - glGenBuffers(1, normals_vbo); - glBindBuffer(GL_ARRAY_BUFFER, normals_vbo[0]); - glBufferData(GL_ARRAY_BUFFER, mesh.normals.size()*sizeof(mesh.normals[0]), &mesh.normals[0][0], GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); + // Create the buffer for indices + glGenBuffers(1, faces_ibo); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, faces_ibo[0]); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, + mesh.faces.size() * sizeof(mesh.faces[0]), &mesh.faces[0][0], + GL_STATIC_DRAW); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); - // Create the buffer for indices - glGenBuffers(1, faces_ibo); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, faces_ibo[0]); - glBufferData(GL_ELEMENT_ARRAY_BUFFER, mesh.faces.size()*sizeof(mesh.faces[0]), &mesh.faces[0][0], GL_STATIC_DRAW); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + // Create the VAO + glGenVertexArrays(1, &tris_vao); + glBindVertexArray(tris_vao); - // Create the VAO - glGenVertexArrays(1, &tris_vao); - glBindVertexArray(tris_vao); + int vert_dim = 3; - int vert_dim = 3; + // location=0 is the vertex + glEnableVertexAttribArray(0); + glBindBuffer(GL_ARRAY_BUFFER, verts_vbo[0]); + glVertexAttribPointer(0, vert_dim, GL_FLOAT, GL_FALSE, + sizeof(mesh.vertices[0]), 0); - // location=0 is the vertex - glEnableVertexAttribArray(0); - glBindBuffer(GL_ARRAY_BUFFER, verts_vbo[0]); - glVertexAttribPointer(0, vert_dim, GL_FLOAT, GL_FALSE, sizeof(mesh.vertices[0]), 0); + // location=1 is the color + glEnableVertexAttribArray(1); + glBindBuffer(GL_ARRAY_BUFFER, colors_vbo[0]); + glVertexAttribPointer(1, vert_dim, GL_FLOAT, GL_FALSE, sizeof(mesh.colors[0]), + 0); - // location=1 is the color - glEnableVertexAttribArray(1); - glBindBuffer(GL_ARRAY_BUFFER, colors_vbo[0]); - glVertexAttribPointer(1, vert_dim, GL_FLOAT, GL_FALSE, sizeof(mesh.colors[0]), 0); - - // location=2 is the normal - glEnableVertexAttribArray(2); - glBindBuffer(GL_ARRAY_BUFFER, normals_vbo[0]); - glVertexAttribPointer(2, vert_dim, GL_FLOAT, GL_FALSE, sizeof(mesh.normals[0]), 0); - - // Done setting data for the vao - glBindVertexArray(0); + // location=2 is the normal + glEnableVertexAttribArray(2); + glBindBuffer(GL_ARRAY_BUFFER, normals_vbo[0]); + glVertexAttribPointer(2, vert_dim, GL_FLOAT, GL_FALSE, + sizeof(mesh.normals[0]), 0); + // Done setting data for the vao + glBindVertexArray(0); } - diff --git a/assignment-2b/src/shader.frag b/assignment-2b/src/shader.frag index 3fe1179..4b79421 100755 --- a/assignment-2b/src/shader.frag +++ b/assignment-2b/src/shader.frag @@ -1,31 +1,32 @@ #version 330 core -layout (location=0) out vec4 out_fragcolor; +layout(location = 0) out vec4 out_fragcolor; in vec3 position; in vec3 color; in vec3 normal; -void main(){ - - // hard code some material properties - float ka = 0.3f; - float kd = 0.6f; - - // hard code a static point light source at (0,0,0) - // L is a unit vector from the fragment location towards this light - vec3 L = -1.f*normalize(vec3(position)); +void main() { - // normalize the input normal that was interpolated from the mesh vertices - vec3 N = normalize(normal); - - // compute a simple diffuse shading weight that is agnostic to the order in which the triangle vertices were specified - float N_dot_L = dot(N, L); - if ((N_dot_L) < 0.0) { N_dot_L *= -1.0; } - - // use a simplified ambient+diffuse shading model to define the fragment color - vec3 result = ka * color + kd * color * N_dot_L; - out_fragcolor = vec4( result, 1.0 ); -} + // hard code some material properties + float ka = 0.3f; + float kd = 0.6f; + // hard code a static point light source at (0,0,0) + // L is a unit vector from the fragment location towards this light + vec3 L = -1.f * normalize(vec3(position)); + // normalize the input normal that was interpolated from the mesh vertices + vec3 N = normalize(normal); + + // compute a simple diffuse shading weight that is agnostic to the order in + // which the triangle vertices were specified + float N_dot_L = dot(N, L); + if ((N_dot_L) < 0.0) { + N_dot_L *= -1.0; + } + + // use a simplified ambient+diffuse shading model to define the fragment color + vec3 result = ka * color + kd * color * N_dot_L; + out_fragcolor = vec4(result, 1.0); +} diff --git a/assignment-2b/src/shader.hpp b/assignment-2b/src/shader.hpp index bd4f192..2d4df5a 100755 --- a/assignment-2b/src/shader.hpp +++ b/assignment-2b/src/shader.hpp @@ -1,21 +1,26 @@ // Copyright 2016 University of Minnesota -// -// SHADER Uses the BSD 2-Clause License (http://www.opensource.org/licenses/BSD-2-Clause) -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// 1. Redistributions of source code must retain the above copyright notice, this list of +// +// SHADER Uses the BSD 2-Clause License +// (http://www.opensource.org/licenses/BSD-2-Clause) Redistribution and use in +// source and binary forms, with or without modification, are permitted provided +// that the following conditions are met: +// 1. Redistributions of source code must retain the above copyright notice, +// this list of // conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF MINNESOTA, DULUTH OR CONTRIBUTORS BE -// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// 2. Redistributions in binary form must reproduce the above copyright notice, +// this list +// of conditions and the following disclaimer in the documentation and/or +// other materials provided with the distribution. +// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// UNIVERSITY OF MINNESOTA, DULUTH OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // // Adapted from r3dux (http://r3dux.org). @@ -47,154 +52,179 @@ namespace mcl { class Shader { public: - Shader() : program_id(0) {} + Shader() : program_id(0) {} - ~Shader(){ glDeleteProgram(program_id); } + ~Shader() { glDeleteProgram(program_id); } - // Init the shader from files (must create OpenGL context first!) - inline void init_from_files( std::string vertex_file, std::string frag_file ); + // Init the shader from files (must create OpenGL context first!) + inline void init_from_files(std::string vertex_file, std::string frag_file); - // Init the shader from strings (must create OpenGL context first!) - inline void init_from_strings( std::string vertex_source, std::string frag_source ){ init(vertex_source, frag_source); } + // Init the shader from strings (must create OpenGL context first!) + inline void init_from_strings(std::string vertex_source, + std::string frag_source) { + init(vertex_source, frag_source); + } - // Be sure to initialize the shader before enabling it - inline void enable(); + // Be sure to initialize the shader before enabling it + inline void enable(); - // Not really needed, but nice for readability - inline void disable(){ glUseProgram(0); } + // Not really needed, but nice for readability + inline void disable() { glUseProgram(0); } - // Returns the bound location of a named attribute - inline GLuint attribute( const std::string name ); + // Returns the bound location of a named attribute + inline GLuint attribute(const std::string name); + + // Returns the bound location of a named uniform + inline GLuint uniform(const std::string name); - // Returns the bound location of a named uniform - inline GLuint uniform( const std::string name ); - private: - GLuint program_id; - GLuint vertex_id; - GLuint fragment_id; + GLuint program_id; + GLuint vertex_id; + GLuint fragment_id; - std::unordered_map attributes; - std::unordered_map uniforms; + std::unordered_map attributes; + std::unordered_map uniforms; - // Initialize the shader, called by init_from_* - inline void init( std::string vertex_source, std::string frag_source ); + // Initialize the shader, called by init_from_* + inline void init(std::string vertex_source, std::string frag_source); - // Compiles the shader, called by init - inline GLuint compile( std::string shaderSource, GLenum type ); + // Compiles the shader, called by init + inline GLuint compile(std::string shaderSource, GLenum type); }; // end of shader - // // Implementation // -GLuint Shader::compile( std::string source, GLenum type ){ +GLuint Shader::compile(std::string source, GLenum type) { - // Generate a shader id - // Note: Shader id will be non-zero if successfully created. - GLuint shaderId = glCreateShader(type); - if( shaderId == 0 ){ throw std::runtime_error("\n**glCreateShader Error"); } + // Generate a shader id + // Note: Shader id will be non-zero if successfully created. + GLuint shaderId = glCreateShader(type); + if (shaderId == 0) { + throw std::runtime_error("\n**glCreateShader Error"); + } - // Attach the GLSL source code and compile the shader - const char *shaderchar = source.c_str(); - glShaderSource(shaderId, 1, &shaderchar, NULL); - glCompileShader(shaderId); + // Attach the GLSL source code and compile the shader + const char *shaderchar = source.c_str(); + glShaderSource(shaderId, 1, &shaderchar, NULL); + glCompileShader(shaderId); - // Check the compilation status and throw a runtime_error if shader compilation failed - GLint shaderStatus; - glGetShaderiv(shaderId, GL_COMPILE_STATUS, &shaderStatus); - if( shaderStatus == GL_FALSE ){ throw std::runtime_error("\n**glCompileShader Error"); } + // Check the compilation status and throw a runtime_error if shader + // compilation failed + GLint shaderStatus; + glGetShaderiv(shaderId, GL_COMPILE_STATUS, &shaderStatus); + if (shaderStatus == GL_FALSE) { + throw std::runtime_error("\n**glCompileShader Error"); + } - return shaderId; + return shaderId; } +void Shader::init(std::string vertex_source, std::string frag_source) { -void Shader::init(std::string vertex_source, std::string frag_source){ + // Create the resource + program_id = glCreateProgram(); + if (program_id == 0) { + throw std::runtime_error("\n**glCreateProgram Error"); + } + glUseProgram(program_id); - // Create the resource - program_id = glCreateProgram(); - if( program_id == 0 ){ throw std::runtime_error("\n**glCreateProgram Error"); } - glUseProgram(program_id); + // Compile the shaders and return their id values + vertex_id = compile(vertex_source, GL_VERTEX_SHADER); + fragment_id = compile(frag_source, GL_FRAGMENT_SHADER); - // Compile the shaders and return their id values - vertex_id = compile(vertex_source, GL_VERTEX_SHADER); - fragment_id = compile(frag_source, GL_FRAGMENT_SHADER); + // Attach and link the shader program + glAttachShader(program_id, vertex_id); + glAttachShader(program_id, fragment_id); + glLinkProgram(program_id); - // Attach and link the shader program - glAttachShader(program_id, vertex_id); - glAttachShader(program_id, fragment_id); - glLinkProgram(program_id); + // Once the shader program has the shaders attached and linked, the shaders + // are no longer required. If the linking failed, then we're going to abort + // anyway so we still detach the shaders. + glDetachShader(program_id, vertex_id); + glDetachShader(program_id, fragment_id); - // Once the shader program has the shaders attached and linked, the shaders are no longer required. - // If the linking failed, then we're going to abort anyway so we still detach the shaders. - glDetachShader(program_id, vertex_id); - glDetachShader(program_id, fragment_id); + // Check the program link status and throw a runtime_error if program linkage + // failed. + GLint programLinkSuccess = GL_FALSE; + glGetProgramiv(program_id, GL_LINK_STATUS, &programLinkSuccess); + if (programLinkSuccess != GL_TRUE) { + throw std::runtime_error("\n**Shader Error: Problem with link"); + } - // Check the program link status and throw a runtime_error if program linkage failed. - GLint programLinkSuccess = GL_FALSE; - glGetProgramiv(program_id, GL_LINK_STATUS, &programLinkSuccess); - if( programLinkSuccess != GL_TRUE ){ throw std::runtime_error("\n**Shader Error: Problem with link"); } + // Check the validation status and throw a runtime_error if program validation + // failed. Does NOT work with corearb headers??? + // glValidateProgram(program_id); + // GLint programValidatationStatus; + // glGetProgramiv(program_id, GL_VALIDATE_STATUS, + //&programValidatationStatus); if( programValidatationStatus != GL_TRUE ){ + //throw std::runtime_error("\n**Shader Error: Problem with validation"); } - // Check the validation status and throw a runtime_error if program validation failed. - // Does NOT work with corearb headers??? -// glValidateProgram(program_id); -// GLint programValidatationStatus; -// glGetProgramiv(program_id, GL_VALIDATE_STATUS, &programValidatationStatus); -// if( programValidatationStatus != GL_TRUE ){ throw std::runtime_error("\n**Shader Error: Problem with validation"); } - - glUseProgram(0); + glUseProgram(0); } +void Shader::init_from_files(std::string vertex_file, std::string frag_file) { -void Shader::init_from_files( std::string vertex_file, std::string frag_file ){ + std::string vert_string, frag_string; - std::string vert_string, frag_string; + // Load the vertex shader + std::ifstream vert_in(vertex_file, std::ios::in | std::ios::binary); + if (vert_in) { + vert_string = (std::string((std::istreambuf_iterator(vert_in)), + std::istreambuf_iterator())); + } else { + throw std::runtime_error("\n**Shader Error: failed to load \"" + + vertex_file + "\""); + } - // Load the vertex shader - std::ifstream vert_in( vertex_file, std::ios::in | std::ios::binary ); - if( vert_in ){ vert_string = (std::string((std::istreambuf_iterator(vert_in)), std::istreambuf_iterator())); } - else{ throw std::runtime_error("\n**Shader Error: failed to load \""+vertex_file+"\"" ); } + // Load the fragement shader + std::ifstream frag_in(frag_file, std::ios::in | std::ios::binary); + if (frag_in) { + frag_string = (std::string((std::istreambuf_iterator(frag_in)), + std::istreambuf_iterator())); + } else { + throw std::runtime_error("\n**Shader Error: failed to load \"" + frag_file + + "\""); + } - // Load the fragement shader - std::ifstream frag_in( frag_file, std::ios::in | std::ios::binary ); - if( frag_in ){ frag_string = (std::string((std::istreambuf_iterator(frag_in)), std::istreambuf_iterator())); } - else{ throw std::runtime_error("\n**Shader Error: failed to load \""+frag_file+"\"" ); } - - init( vert_string, frag_string ); + init(vert_string, frag_string); } - -void Shader::enable(){ - if( program_id!=0 ){ glUseProgram(program_id); } - else{ throw std::runtime_error("\n**Shader Error: Can't enable, not initialized"); } +void Shader::enable() { + if (program_id != 0) { + glUseProgram(program_id); + } else { + throw std::runtime_error("\n**Shader Error: Can't enable, not initialized"); + } } +GLuint Shader::attribute(const std::string name) { -GLuint Shader::attribute(const std::string name){ - - // Add the attribute to the map table if it doesn't already exist - if( attributes.count(name)==0 ){ - attributes[name] = glGetAttribLocation( program_id, name.c_str() ); - if( attributes[name] == -1 ){ throw std::runtime_error("\n**Shader Error: bad attribute ("+name+")"); } - } - return attributes[name]; + // Add the attribute to the map table if it doesn't already exist + if (attributes.count(name) == 0) { + attributes[name] = glGetAttribLocation(program_id, name.c_str()); + if (attributes[name] == -1) { + throw std::runtime_error("\n**Shader Error: bad attribute (" + name + + ")"); + } + } + return attributes[name]; } +GLuint Shader::uniform(const std::string name) { -GLuint Shader::uniform(const std::string name){ - - // Add the uniform to the map table if it doesn't already exist - if( uniforms.count(name)==0 ){ - uniforms[name] = glGetUniformLocation( program_id, name.c_str() ); - if( uniforms[name] == -1 ){ throw std::runtime_error("\n**Shader Error: bad uniform ("+name+")"); } - } - return uniforms[name]; + // Add the uniform to the map table if it doesn't already exist + if (uniforms.count(name) == 0) { + uniforms[name] = glGetUniformLocation(program_id, name.c_str()); + if (uniforms[name] == -1) { + throw std::runtime_error("\n**Shader Error: bad uniform (" + name + ")"); + } + } + return uniforms[name]; } - } // end namespace mcl #endif - diff --git a/assignment-2b/src/shader.vert b/assignment-2b/src/shader.vert index 1cea263..8315910 100755 --- a/assignment-2b/src/shader.vert +++ b/assignment-2b/src/shader.vert @@ -1,8 +1,8 @@ #version 330 core -layout(location=0) in vec4 in_position; -layout(location=1) in vec3 in_color; -layout(location=2) in vec3 in_normal; +layout(location = 0) in vec4 in_position; +layout(location = 1) in vec3 in_color; +layout(location = 2) in vec3 in_normal; out vec3 position; out vec3 color; @@ -12,16 +12,22 @@ uniform mat4 model; uniform mat4 view; uniform mat4 projection; -void main() -{ - // pass the vertex color and normal information to the fragment shader (without any modification) - color = in_color; - normal = in_normal; - - // determine what the vertex position will be after the model transformation and pass that information to the fragment shader, for use in the illumination calculations - // in our case the model transformation is the identity matrix so this isn't actually necessary, but it's included here for completeness. Note that the vectors needed for the lighting calculations must be computed using the vertex locations *without* perspective warp applied - position = vec3(model * in_position); - - // apply the model, view, and projection transformations to the vertex position value that will be sent to the clipper, rasterizer, ... - gl_Position = (projection * view * model * in_position); +void main() { + // pass the vertex color and normal information to the fragment shader + // (without any modification) + color = in_color; + normal = in_normal; + + // determine what the vertex position will be after the model transformation + // and pass that information to the fragment shader, for use in the + // illumination calculations in our case the model transformation is the + // identity matrix so this isn't actually necessary, but it's included here + // for completeness. Note that the vectors needed for the lighting + // calculations must be computed using the vertex locations *without* + // perspective warp applied + position = vec3(model * in_position); + + // apply the model, view, and projection transformations to the vertex + // position value that will be sent to the clipper, rasterizer, ... + gl_Position = (projection * view * model * in_position); } diff --git a/assignment-2b/src/trimesh.hpp b/assignment-2b/src/trimesh.hpp index f5c122b..7e122e9 100755 --- a/assignment-2b/src/trimesh.hpp +++ b/assignment-2b/src/trimesh.hpp @@ -1,31 +1,36 @@ // Copyright 2016 University of Minnesota -// -// TRIMESH Uses the BSD 2-Clause License (http://www.opensource.org/licenses/BSD-2-Clause) -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// 1. Redistributions of source code must retain the above copyright notice, this list of +// +// TRIMESH Uses the BSD 2-Clause License +// (http://www.opensource.org/licenses/BSD-2-Clause) Redistribution and use in +// source and binary forms, with or without modification, are permitted provided +// that the following conditions are met: +// 1. Redistributions of source code must retain the above copyright notice, +// this list of // conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF MINNESOTA, DULUTH OR CONTRIBUTORS BE -// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// 2. Redistributions in binary form must reproduce the above copyright notice, +// this list +// of conditions and the following disclaimer in the documentation and/or +// other materials provided with the distribution. +// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// UNIVERSITY OF MINNESOTA, DULUTH OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef TRIMESH_HPP #define TRIMESH_HPP 1 -#include -#include -#include #include #include +#include #include +#include +#include // // Vector Class @@ -33,261 +38,310 @@ // template class Vec { public: - // Constructors - Vec(){ data[0]=T(0); data[1]=T(0); data[2]=T(0); } - Vec(T x_, T y_, T z_){ data[0]=x_; data[1]=y_; data[2]=z_; } + // Constructors + Vec() { + data[0] = T(0); + data[1] = T(0); + data[2] = T(0); + } + Vec(T x_, T y_, T z_) { + data[0] = x_; + data[1] = y_; + data[2] = z_; + } - // Data - T data[3]; + // Data + T data[3]; - // Functions - T operator[](int i) const { return data[i]; } - T& operator[](int i){ return data[i]; } - Vec &operator += (const Vec &x) { - for(size_t i=0; idot(*this); } // squared length - double len() const { return sqrt(len2()); } // length - T dot(const Vec &v) const { - T r(0); - for(size_t i=0; i cross(const Vec<3,T> &v) const { - assert(D == 3); // only defined for 3 dims - return Vec<3,T>(data[1]*v[2] - data[2]*v[1], data[2]*v[0] - data[0]*v[2], data[0]*v[1] - data[1]*v[0]); - } - void normalize() { - double l = len(); if( l<=0.0 ){ return; } - for(size_t i=0; i &operator+=(const Vec &x) { + for (size_t i = 0; i < D; ++i) { + data[i] += x[i]; + } + return *this; + } + double len2() const { return this->dot(*this); } // squared length + double len() const { return sqrt(len2()); } // length + T dot(const Vec &v) const { + T r(0); + for (size_t i = 0; i < D; ++i) { + r += v[i] * data[i]; + } + return r; + } + Vec<3, T> cross(const Vec<3, T> &v) const { + assert(D == 3); // only defined for 3 dims + return Vec<3, T>(data[1] * v[2] - data[2] * v[1], + data[2] * v[0] - data[0] * v[2], + data[0] * v[1] - data[1] * v[0]); + } + void normalize() { + double l = len(); + if (l <= 0.0) { + return; + } + for (size_t i = 0; i < D; ++i) { + data[i] = data[i] / l; + } + } }; -template static inline const Vec operator-(const Vec &v1, const Vec &v2){ - Vec r; - for(size_t i=0; i +static inline const Vec operator-(const Vec &v1, + const Vec &v2) { + Vec r; + for (size_t i = 0; i < D; ++i) { + r[i] = v1[i] - v2[i]; + } + return r; } -template static inline const Vec operator*(const Vec &v, const T &x){ - Vec r; - for (size_t i=0; i +static inline const Vec operator*(const Vec &v, const T &x) { + Vec r; + for (size_t i = 0; i < D; ++i) { + r[i] = v[i] * x; + } + return r; } -typedef Vec<3,float> Vec3f; -typedef Vec<3,int> Vec3i; - +typedef Vec<3, float> Vec3f; +typedef Vec<3, int> Vec3i; // // Triangle Mesh Class // class TriMesh { public: - std::vector vertices; - std::vector normals; - std::vector colors; - std::vector faces; + std::vector vertices; + std::vector normals; + std::vector colors; + std::vector faces; - // Compute normals if not loaded from obj - // or if recompute is set to true. - void need_normals( bool recompute=false ); + // Compute normals if not loaded from obj + // or if recompute is set to true. + void need_normals(bool recompute = false); - // Sets a default vertex color if - // they haven't been set. - void need_colors( Vec3f default_color = Vec3f(0.4,0.4,0.4) ); + // Sets a default vertex color if + // they haven't been set. + void need_colors(Vec3f default_color = Vec3f(0.4, 0.4, 0.4)); - // Loads an OBJ file - bool load_obj( std::string file ); + // Loads an OBJ file + bool load_obj(std::string file); - // Prints details about the mesh - void print_details(); + // Prints details about the mesh + void print_details(); }; - - // // Implementation // -void TriMesh::print_details(){ - std::cout << "Vertices: " << vertices.size() << std::endl; - std::cout << "Normals: " << normals.size() << std::endl; - std::cout << "Colors: " << colors.size() << std::endl; - std::cout << "Faces: " << faces.size() << std::endl; +void TriMesh::print_details() { + std::cout << "Vertices: " << vertices.size() << std::endl; + std::cout << "Normals: " << normals.size() << std::endl; + std::cout << "Colors: " << colors.size() << std::endl; + std::cout << "Faces: " << faces.size() << std::endl; } - -void TriMesh::need_normals( bool recompute ){ - if( vertices.size() == normals.size() && !recompute ){ return; } - if( normals.size() != vertices.size() ){ normals.resize( vertices.size() ); } - std::cout << "Computing TriMesh normals" << std::endl; - const int nv = normals.size(); - for( int i = 0; i < nv; ++i ){ normals[i][0] = 0.f; normals[i][1] = 0.f; normals[i][2] = 0.f; } - int nf = faces.size(); - for( int f = 0; f < nf; ++f ){ - Vec3i face = faces[f]; - const Vec3f &p0 = vertices[ face[0] ]; - const Vec3f &p1 = vertices[ face[1] ]; - const Vec3f &p2 = vertices[ face[2] ]; - Vec3f a = p0-p1, b = p1-p2, c = p2-p0; - float l2a = a.len2(), l2b = b.len2(), l2c = c.len2(); - if (!l2a || !l2b || !l2c){ continue; } // check for zeros or nans - Vec3f facenormal = a.cross( b ); - normals[faces[f][0]] += facenormal * (1.0f / (l2a * l2c)); - normals[faces[f][1]] += facenormal * (1.0f / (l2b * l2a)); - normals[faces[f][2]] += facenormal * (1.0f / (l2c * l2b)); - } - for (int i = 0; i < nv; i++){ normals[i].normalize(); } +void TriMesh::need_normals(bool recompute) { + if (vertices.size() == normals.size() && !recompute) { + return; + } + if (normals.size() != vertices.size()) { + normals.resize(vertices.size()); + } + std::cout << "Computing TriMesh normals" << std::endl; + const int nv = normals.size(); + for (int i = 0; i < nv; ++i) { + normals[i][0] = 0.f; + normals[i][1] = 0.f; + normals[i][2] = 0.f; + } + int nf = faces.size(); + for (int f = 0; f < nf; ++f) { + Vec3i face = faces[f]; + const Vec3f &p0 = vertices[face[0]]; + const Vec3f &p1 = vertices[face[1]]; + const Vec3f &p2 = vertices[face[2]]; + Vec3f a = p0 - p1, b = p1 - p2, c = p2 - p0; + float l2a = a.len2(), l2b = b.len2(), l2c = c.len2(); + if (!l2a || !l2b || !l2c) { + continue; + } // check for zeros or nans + Vec3f facenormal = a.cross(b); + normals[faces[f][0]] += facenormal * (1.0f / (l2a * l2c)); + normals[faces[f][1]] += facenormal * (1.0f / (l2b * l2a)); + normals[faces[f][2]] += facenormal * (1.0f / (l2c * l2b)); + } + for (int i = 0; i < nv; i++) { + normals[i].normalize(); + } } // end need normals -void TriMesh::need_colors( Vec3f default_color ){ - if( vertices.size() == colors.size() ){ return; } - else{ colors.resize( vertices.size(), default_color ); } +void TriMesh::need_colors(Vec3f default_color) { + if (vertices.size() == colors.size()) { + return; + } else { + colors.resize(vertices.size(), default_color); + } } // end need colors // Function to split a string into multiple strings, seperated by delimeter -static void split_str( char delim, const std::string &str, std::vector *result ){ - std::stringstream ss(str); std::string s; - while( std::getline(ss, s, delim) ){ result->push_back(s); } +static void split_str(char delim, const std::string &str, + std::vector *result) { + std::stringstream ss(str); + std::string s; + while (std::getline(ss, s, delim)) { + result->push_back(s); + } } -bool TriMesh::load_obj( std::string file ){ +bool TriMesh::load_obj(std::string file) { - std::cout << "\nLoading " << file << std::endl; + std::cout << "\nLoading " << file << std::endl; - // README: - // - // The problem with standard obj files and opengl is that - // there isn't a good way to make triangles with different indices - // for vertices/normals. At least, not any way that I'm aware of. - // So for now, we'll do the inefficient (but robust) way: - // redundant vertices/normals. - // + // README: + // + // The problem with standard obj files and opengl is that + // there isn't a good way to make triangles with different indices + // for vertices/normals. At least, not any way that I'm aware of. + // So for now, we'll do the inefficient (but robust) way: + // redundant vertices/normals. + // - std::vector temp_normals; - std::vector temp_verts; - std::vector temp_colors; + std::vector temp_normals; + std::vector temp_verts; + std::vector temp_colors; - // - // First loop, make buffers - // - std::ifstream infile( file.c_str() ); - if( infile.is_open() ){ + // + // First loop, make buffers + // + std::ifstream infile(file.c_str()); + if (infile.is_open()) { - std::string line; - while( std::getline( infile, line ) ){ + std::string line; + while (std::getline(infile, line)) { - std::stringstream ss(line); - std::string tok; ss >> tok; + std::stringstream ss(line); + std::string tok; + ss >> tok; - // Vertex - if( tok == "v" ){ + // Vertex + if (tok == "v") { - // First three location - float x, y, z; ss >> x >> y >> z; - temp_verts.push_back( Vec3f(x,y,z) ); + // First three location + float x, y, z; + ss >> x >> y >> z; + temp_verts.push_back(Vec3f(x, y, z)); - // Next three colors - float cx, cy, cz; - if( ss >> cx >> cy >> cz ){ - temp_colors.push_back( Vec3f(cx,cy,cz) ); - } else { - temp_colors.push_back( Vec3f(0.3f,0.3f,0.3f) ); - } - } + // Next three colors + float cx, cy, cz; + if (ss >> cx >> cy >> cz) { + temp_colors.push_back(Vec3f(cx, cy, cz)); + } else { + temp_colors.push_back(Vec3f(0.3f, 0.3f, 0.3f)); + } + } - // Normal - if( tok == "vn" ){ - float x, y, z; ss >> x >> y >> z; - temp_normals.push_back( Vec3f(x,y,z) ); - } + // Normal + if (tok == "vn") { + float x, y, z; + ss >> x >> y >> z; + temp_normals.push_back(Vec3f(x, y, z)); + } - } // end loop lines + } // end loop lines - } // end load obj - else { std::cerr << "\n**TriMesh::load_obj Error: Could not open file " << file << std::endl; return false; } + } // end load obj + else { + std::cerr << "\n**TriMesh::load_obj Error: Could not open file " << file + << std::endl; + return false; + } - // - // Second loop, make faces - // - std::ifstream infile2( file.c_str() ); - if( infile2.is_open() ){ + // + // Second loop, make faces + // + std::ifstream infile2(file.c_str()); + if (infile2.is_open()) { - std::string line; - while( std::getline( infile2, line ) ){ + std::string line; + while (std::getline(infile2, line)) { - std::stringstream ss(line); - std::string tok; ss >> tok; + std::stringstream ss(line); + std::string tok; + ss >> tok; - // Face - if( tok == "f" ){ + // Face + if (tok == "f") { - Vec3i face; - // Get the three vertices - for( size_t i=0; i<3; ++i ){ + Vec3i face; + // Get the three vertices + for (size_t i = 0; i < 3; ++i) { - std::string f_str; ss >> f_str; - std::vector f_vals; - split_str( '/', f_str, &f_vals ); - assert(f_vals.size()>0); + std::string f_str; + ss >> f_str; + std::vector f_vals; + split_str('/', f_str, &f_vals); + assert(f_vals.size() > 0); - face[i] = vertices.size(); - int v_idx = std::stoi(f_vals[0])-1; - vertices.push_back( temp_verts[v_idx] ); - colors.push_back( temp_colors[v_idx] ); + face[i] = vertices.size(); + int v_idx = std::stoi(f_vals[0]) - 1; + vertices.push_back(temp_verts[v_idx]); + colors.push_back(temp_colors[v_idx]); - // Check for normal - if( f_vals.size()>2 ){ - int n_idx = std::stoi(f_vals[2])-1; - normals.push_back( temp_normals[n_idx] ); - } - } + // Check for normal + if (f_vals.size() > 2) { + int n_idx = std::stoi(f_vals[2]) - 1; + normals.push_back(temp_normals[n_idx]); + } + } - faces.push_back(face); + faces.push_back(face); - // If it's a quad, make another triangle - std::string last_vert=""; - if( ss >> last_vert ){ - Vec3i face2; - face2[0] = face[0]; - face2[1] = face[2]; + // If it's a quad, make another triangle + std::string last_vert = ""; + if (ss >> last_vert) { + Vec3i face2; + face2[0] = face[0]; + face2[1] = face[2]; - std::vector f_vals; - split_str( '/', last_vert, &f_vals ); - assert(f_vals.size()>0); + std::vector f_vals; + split_str('/', last_vert, &f_vals); + assert(f_vals.size() > 0); - int v_idx = std::stoi(f_vals[0])-1; - vertices.push_back( temp_verts[v_idx] ); - colors.push_back( temp_colors[v_idx] ); - face2[2] = vertices.size(); + int v_idx = std::stoi(f_vals[0]) - 1; + vertices.push_back(temp_verts[v_idx]); + colors.push_back(temp_colors[v_idx]); + face2[2] = vertices.size(); - // Check for normal - if( f_vals.size()>2 ){ - int n_idx = std::stoi(f_vals[2])-1; - normals.push_back( temp_normals[n_idx] ); - } + // Check for normal + if (f_vals.size() > 2) { + int n_idx = std::stoi(f_vals[2]) - 1; + normals.push_back(temp_normals[n_idx]); + } - faces.push_back(face2); - } + faces.push_back(face2); + } - } // end parse face + } // end parse face - } // end loop lines + } // end loop lines - } // end load obj + } // end load obj - // Make sure we have normals - if( !normals.size() ){ - std::cout << "**Warning: normals not loaded so we'll compute them instead." << std::endl; - need_normals(); - } + // Make sure we have normals + if (!normals.size()) { + std::cout << "**Warning: normals not loaded so we'll compute them instead." + << std::endl; + need_normals(); + } - return true; + return true; } // end load obj - #endif -