Merge branch 'dev'

Author: computersarecool

CMakeLists.txt

@@ -8,7 +8,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
   # Wall: Enable all warnings about constructors
   # Wextra: Enable some extra warnings
   # Werror: Treat all warnings as errors
-  #  set(warnings "-Wall -Wextra -Werror")
+  # set(warnings "-Wall -Wextra -Werror")
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   # W4: Show the most warnings
   # WX: Treat all warnings as errors
@@ -55,6 +55,7 @@ add_subdirectory(${PROJECTS_DIR}/read_pixels)
 add_subdirectory(${PROJECTS_DIR}/point_sprites)
 add_subdirectory(${PROJECTS_DIR}/phong_lighting)
 add_subdirectory(${PROJECTS_DIR}/raytracer)
+add_subdirectory(${PROJECTS_DIR}/fullscreen_quad)
 
 # Create a variable that is set to true and cached after the first configuration
 set(CONFIGURED_ONCE TRUE CACHE INTERNAL "A flag showing that CMake has configured at least once.")

src/projects/basic_cube/src/main.cpp

@@ -75,7 +75,7 @@ class BasicCubeExample : public Application
     void setup() override
     {
         // Set and use cube shader
-        m_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/cube.vert").fragment("../assets/shaders/cube.frag"));
+        m_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/quad.vert").fragment("../assets/shaders/quad.frag"));
         m_shader->introspect();
         m_shader->use();
 

src/projects/compute_shader/src/main.cpp

@@ -85,7 +85,7 @@ class ComputeShaderExample : public Application
 
 	void load_shaders()
 	{
-		m_cube_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/cube.vert").fragment("../assets/shaders/cube.frag"));
+		m_cube_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/quad.vert").fragment("../assets/shaders/quad.frag"));
 		m_full_screen_quad_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/full_screen_quad.vert").fragment("../assets/shaders/full_screen_quad.frag"));
 		m_compute_shader = std::make_unique<GlslProgram>(GlslProgram::Format().compute("../assets/shaders/shader.comp"));
 	}

src/projects/framebuffers/src/main.cpp

@@ -76,7 +76,7 @@ class FboExample : public Application
 	void setup() override
 	{
 		// Create shaders
-		m_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/cube.vert").fragment("../assets/shaders/cube.frag"));
+		m_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/quad.vert").fragment("../assets/shaders/quad.frag"));
 		m_shader2 = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/cube2.vert").fragment("../assets/shaders/cube2.frag"));
 
 		// Cube vertex attribute parameters

src/projects/fullscreen_quad/CMakeLists.txt

@@ -0,0 +1,32 @@
+# Name for this project
+set(PROJECT_NAME "fullscreen_quad")
+
+# Choose the library for the final build
+set(PROJECT_BUILD_DIR ${CMAKE_SOURCE_DIR}/bin/${PROJECT_NAME})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BUILD_DIR}/$<CONFIG>)
+
+# Set sources
+set(PROJECTS_SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/projects)
+set(SOURCES
+  src/main.cpp
+  ${INCLUDE_DIR}/glad/src/glad.c
+  ${INCLUDE_DIR}/glm/glm/gtc/matrix_transform.hpp
+  ${INCLUDE_DIR}/projects/base_app.h
+  ${INCLUDE_DIR}/projects/glsl_program.h
+  ${INCLUDE_DIR}/projects/camera.h
+  ${PROJECTS_SOURCE_DIR}/base_app/base_app.cpp
+  ${PROJECTS_SOURCE_DIR}/base_app/glsl_program.cpp
+  ${PROJECTS_SOURCE_DIR}/base_app/camera.cpp
+  )
+
+
+add_executable(${PROJECT_NAME} ${SOURCES})
+target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS} glfw ${GLFW_LIBRARIES})
+
+# Copy resources
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets DESTINATION ${PROJECT_BUILD_DIR}/)
+
+# Set correct CWD for debugger
+if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+  set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src)
+endif()

src/projects/fullscreen_quad/assets/shaders/quad.frag

@@ -0,0 +1,11 @@
+#version 440 core
+
+layout (location = 0) out vec4 frag_color;
+
+uniform float time;
+
+void main()
+{
+    float red_amount = (sin(time * 4.0) + 1.0) / 2.0;
+    frag_color = vec4(red_amount, 0.0, 0.0, 1.0);
+}

src/projects/fullscreen_quad/assets/shaders/quad.vert

@@ -0,0 +1,13 @@
+#version 440 core
+
+const vec2[4] positions = {
+    {-1.0, -1.0},
+    {1.0, -1.0},
+    {-1.0, 1.0},
+    {1.0, 1.0}
+};
+
+void main()
+{
+    gl_Position = vec4(positions[gl_VertexID].xy, 0.0, 1.0);
+}

src/projects/fullscreen_quad/src/main.cpp

@@ -0,0 +1,38 @@
+// This renders a full screen quad
+#include <memory>
+#include <vector>
+
+#include "base_app.h"
+#include "glsl_program.h"
+
+class FullscreenQuadExample : public Application
+{
+private:
+    GLuint m_vao { 0 };
+    const GLuint m_num_vertices{ 4 };
+    std::unique_ptr<GlslProgram> m_shader;
+
+    void setup() override
+    {
+        // Create shader
+        m_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/quad.vert").fragment("../assets/shaders/quad.frag"));
+        m_shader->use();
+        m_shader->introspect();
+
+        // Setup and bind a VAO
+        glCreateVertexArrays(1, &m_vao);
+        glBindVertexArray(m_vao);
+    }
+
+    void render(double current_time) override
+    {
+        m_shader->uniform("time", static_cast<float>(current_time));
+        glDrawArrays(GL_TRIANGLE_STRIP, 0, m_num_vertices);
+    };
+};
+
+int main(int argc, char* argv[])
+{
+    std::unique_ptr<Application> app{ new FullscreenQuadExample };
+    app->run();
+}

src/projects/geometry_shader_normal_viewer/src/main.cpp

@@ -86,7 +86,7 @@ class GeometryShaderExample : public Application
 	void setup() override
 	{
 		// Create shaders
-		m_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/cube.vert").fragment("../assets/shaders/cube.frag"));
+		m_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/quad.vert").fragment("../assets/shaders/quad.frag"));
 		m_normal_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/normal_viewer.vert").fragment("../assets/shaders/normal_viewer.frag").geometry("../assets/shaders/normal_viewer.geom"));
 
 		// Cube position vertex attribute parameters

src/projects/read_pixels/src/main.cpp

@@ -169,7 +169,7 @@ class ReadPixelsExample : public Application
         m_data_size = ((m_info.window_width * 3 + 3) & ~3) *  m_info.window_height;
 
 		// Create shader
-        m_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/cube.vert").fragment("../assets/shaders/cube.frag"));
+        m_shader = std::make_unique<GlslProgram>(GlslProgram::Format().vertex("../assets/shaders/quad.vert").fragment("../assets/shaders/quad.frag"));
 
 		// Cube vertex attribute parameters
 		const GLuint elements_per_face{ 6 };