-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Finished moving code around and refactoring, time to push then merge
- Loading branch information
Showing
17 changed files
with
350 additions
and
497 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,181 +1,8 @@ | ||
| #include <GL/glew.h> // GLEW | ||
| #include <GLFW/glfw3.h> // GLFW | ||
| #include <iostream> | ||
|
|
||
| #include "Shader.h" // Shader Abstraction | ||
| //#include "Texture.h" // Texture Abstraction | ||
| #include "Camera.h" // Camera Abstraction | ||
| #include "Model.h" | ||
|
|
||
| #define STB_IMAGE_IMPLEMENTATION | ||
| #include "stb_image/stb_image.h" // stb_image | ||
| #include "ImGui/imgui_impl_glfw.h" // ImGui | ||
| #include "ImGui/imgui_impl_opengl3.h" | ||
| #include "GLM/glm.hpp" // GLM | ||
| #include "GLM/gtc/matrix_transform.hpp" | ||
| #include "GLM/gtc/type_ptr.hpp" | ||
|
|
||
| // Screen | ||
| const unsigned int screenWidth = 1920; | ||
| const unsigned int screenHeight = 1080; | ||
| bool isWireframe = false; | ||
|
|
||
| // Camera | ||
| Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); | ||
| float lastX = screenWidth / 2.0f; | ||
| float lastY = screenHeight / 2.0f; | ||
| bool firstMouse = true; | ||
|
|
||
| // Timing | ||
| float deltaTime = 0.0f; | ||
| float lastFrame = 0.0f; | ||
|
|
||
| // Lighting | ||
| glm::vec3 lightPos(1.2f, 1.0f, 2.0f); | ||
|
|
||
| void framebufferSizeCallback(GLFWwindow* window, int width, int height) | ||
| { | ||
| glViewport(0, 0, width, height); | ||
| } | ||
| void mouseCallback(GLFWwindow* window, double xposIn, double yposIn) | ||
| { | ||
| float xpos = static_cast<float>(xposIn); | ||
| float ypos = static_cast<float>(yposIn); | ||
|
|
||
| if (firstMouse) | ||
| { | ||
| lastX = xpos; | ||
| lastY = ypos; | ||
| firstMouse = false; | ||
| } | ||
|
|
||
| float xoffset = xpos - lastX; | ||
| float yoffset = lastY - ypos; // reversed since y-coordinates go from bottom to top | ||
|
|
||
| lastX = xpos; | ||
| lastY = ypos; | ||
|
|
||
| camera.ProcessMouseMovement(xoffset, yoffset); | ||
| } | ||
| void scrollCallback(GLFWwindow* window, double xoffset, double yoffset) | ||
| { | ||
| camera.ProcessMouseScroll(static_cast<float>(yoffset)); | ||
| } | ||
| void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods) | ||
| { | ||
| if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS) | ||
| { | ||
| glfwSetWindowShouldClose(window, true); | ||
| std::cout << "Escape Key pressed, Exiting program..." << std::endl; | ||
| } | ||
| if (key == GLFW_KEY_TAB && action == GLFW_PRESS) | ||
| { | ||
| isWireframe = !isWireframe; | ||
| std::cout << "Wireframe Toggled" << std::endl; | ||
| } | ||
|
|
||
| if (glfwGetKey(window, GLFW_KEY_W) == GLFW_PRESS) | ||
| camera.ProcessKeyboard(FORWARD, deltaTime); | ||
| if (glfwGetKey(window, GLFW_KEY_S) == GLFW_PRESS) | ||
| camera.ProcessKeyboard(BACKWARD, deltaTime); | ||
| if (glfwGetKey(window, GLFW_KEY_A) == GLFW_PRESS) | ||
| camera.ProcessKeyboard(LEFT, deltaTime); | ||
| if (glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS) | ||
| camera.ProcessKeyboard(RIGHT, deltaTime); | ||
| } | ||
| #include "MainLoop.h" | ||
|
|
||
| int main(void) | ||
| { | ||
| /* Initialize GLFW */ if (!glfwInit()) | ||
| { | ||
| std::cout << "Failed to initialize GLFW" << std::endl; | ||
| return -1; | ||
| } | ||
| /* Set OpenGL to 3.3 Core */ { | ||
| glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); | ||
| glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); | ||
| glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); | ||
| } | ||
| GLFWwindow* window = glfwCreateWindow(screenWidth, screenHeight, "App", NULL, NULL); | ||
| /* Check if window created */ if (!window) | ||
| { | ||
| std::cout << "Failed to create GLFW window" << std::endl; | ||
| glfwTerminate(); | ||
| return -1; | ||
| } | ||
| /* GLFW Settings */ { | ||
| glfwMakeContextCurrent(window); | ||
| glfwSetFramebufferSizeCallback(window, framebufferSizeCallback); // Viewport Updates | ||
| glfwSetKeyCallback(window, keyCallback); // Key Callback | ||
| glfwSwapInterval(1); // Enable VSync | ||
| glEnable(GL_DEPTH_TEST); // Enable Z-Buffer | ||
| glfwSetCursorPosCallback(window, mouseCallback); // Mouse Callback | ||
| glfwSetScrollCallback(window, scrollCallback); // Mouse Scroll Callback | ||
| glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED); // Hide Cursor | ||
| } | ||
| /* Initialize GLEW */ if (glewInit()) | ||
| { | ||
| std::cout << "Failed to initialize GLEW" << std::endl; | ||
| return -1; | ||
| } | ||
|
|
||
| // Initialize ImGui | ||
| ImGui::CreateContext(); | ||
| ImGui_ImplGlfw_InitForOpenGL(window, true); | ||
| ImGui_ImplOpenGL3_Init((char*)glGetString(GL_NUM_SHADING_LANGUAGE_VERSIONS)); | ||
| ImGui::StyleColorsDark(); | ||
|
|
||
| Shader ourShader("res/shader/vertex.glsl", "res/shader/fragment.glsl"); | ||
| stbi_set_flip_vertically_on_load(1); | ||
| Model ourModel("res/model/backpack.obj"); | ||
|
|
||
| while (!glfwWindowShouldClose(window)) | ||
| { | ||
| float currentFrame = static_cast<float>(glfwGetTime()); | ||
| deltaTime = currentFrame - lastFrame; | ||
| lastFrame = currentFrame; | ||
|
|
||
| // Render | ||
| glClearColor(0.1f, 0.1f, 0.1f, 1.0f); | ||
| glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); | ||
| glPolygonMode(GL_FRONT_AND_BACK, isWireframe ? GL_LINE : GL_FILL); | ||
|
|
||
| // ImGui New Frame | ||
| ImGui_ImplOpenGL3_NewFrame(); | ||
| ImGui_ImplGlfw_NewFrame(); | ||
| ImGui::NewFrame(); | ||
|
|
||
| // view/projection transformations | ||
| ourShader.Bind(); | ||
| glm::mat4 projection = glm::perspective(glm::radians(camera.Zoom), (float)screenWidth / (float)screenHeight, 0.1f, 100.0f); | ||
| glm::mat4 view = camera.GetViewMatrix(); | ||
| ourShader.SetUniformMat4f("projection", projection); | ||
| ourShader.SetUniformMat4f("view", view); | ||
|
|
||
| // render the loaded model | ||
| glm::mat4 model = glm::mat4(1.0f); | ||
| model = glm::translate(model, glm::vec3(0.0f, 0.0f, 0.0f)); // translate it down so it's at the center of the scene | ||
| model = glm::scale(model, glm::vec3(1.0f, 1.0f, 1.0f)); // it's a bit too big for our scene, so scale it down | ||
| ourShader.SetUniformMat4f("model", model); | ||
| ourModel.Draw(ourShader); | ||
|
|
||
| // ImGui Test | ||
| ImGui::Text("(%.1f FPS)", ImGui::GetIO().Framerate); | ||
|
|
||
| // ImGui Render | ||
| ImGui::Render(); | ||
| ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); | ||
|
|
||
| // Swap Buffers and Poll Events | ||
| glfwSwapBuffers(window); | ||
| glfwPollEvents(); | ||
| } | ||
| /* Cleanup */ { | ||
|
|
||
| ImGui_ImplOpenGL3_Shutdown(); | ||
| ImGui_ImplGlfw_Shutdown(); | ||
| ImGui::DestroyContext(); | ||
| glfwTerminate(); | ||
| return 0; | ||
| } | ||
| App app; | ||
| app.Run(); | ||
| return 0; | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.