Update CMakeLists.txt

J3ML v20

CMakeLists.txt

@@ -21,7 +21,7 @@ include(cmake/CPM.cmake)
 
 CPMAddPackage(
         NAME J3ML
-        URL https://git.redacted.cc/josh/j3ml/archive/Prerelease-18.zip
+        URL https://git.redacted.cc/josh/j3ml/archive/Prerelease-20.zip
 )
 
 CPMAddPackage(
@@ -34,6 +34,12 @@ CPMAddPackage(
         URL https://git.redacted.cc/Redacted/glad/archive/v2.1.zip
 )
 
+
+CPMAddPackage(
+        NAME LearnOpenGL
+        URL https://git.redacted.cc/josh/LearnOpenGL/archive/Prerelease-2.zip
+)
+
 file(GLOB_RECURSE HEADERS "include/*.h" "include/*.hpp")
 file(GLOB_RECURSE SOURCES "src/*.c"     "src/*.cpp"    )
 file(GLOB_RECURSE ASSETS  "content/*")
@@ -62,6 +68,10 @@ include_directories(${J3ML_SOURCE_DIR}/include)
 include_directories(${ReWindow_SOURCE_DIR}/include)
 include_directories(${glad_SOURCE_DIR}/include)
 
+target_include_directories(JGL PUBLIC ${LearnOpenGL_SOURCE_DIR}/include)
+target_link_libraries(JGL PUBLIC LearnOpenGL)
+
+target_include_directories(JGL PRIVATE ${FREETYPE_INCLUDE_DIRS})
 target_link_libraries(JGL PRIVATE ${FREETYPE_LIBRARIES})
 target_include_directories(JGL PRIVATE ${FREETYPE_INCLUDE_DIRS})
 target_link_libraries(JGL_Demo PUBLIC JGL ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} J3ML ReWindowLibrary GLEW glad)

include/LearnOpenGL/Mesh.h

@@ -1,149 +0,0 @@
-/// @file Mesh.h
-/// @description
-/// @author LearnOpenGL - Updated Josh O'Leary
-/// @lastedit 2024-02-22
-
-// Original Source:
-// https://learnopengl.com/code_viewer_gh.php?code=includes/learnopengl/mesh.h
-
-#pragma once
-
-#include <glad/glad.h>
-#include <GL/glew.h>
-#include <GL/glext.h>
-#include <J3ML/LinearAlgebra/Vector3.h>
-#include <J3ML/LinearAlgebra/Vector2.h>
-#include <string>
-#include "Shader.h"
-
-using J3ML::LinearAlgebra::Vector2;
-using J3ML::LinearAlgebra::Vector3;
-using J3ML::u32;
-
-constexpr int MAX_BONE_INFLUENCE = 4;
-
-namespace LearnOpenGL
-{
-
-    struct Vertex
-    {
-        Vector3 Position;
-        Vector3 Normal;
-        Vector2 TexCoords;
-        Vector3 Tangent;
-        Vector3 BiTangent;
-        int BoneIDs[MAX_BONE_INFLUENCE];
-        float BoneWeights[MAX_BONE_INFLUENCE];
-    };
-
-    // Different from Texture2D in purpose
-    struct Texture {
-        unsigned int id;
-        std::string type;
-        std::string path;
-    };
-
-    class Mesh {
-    public:
-        std::vector<Vertex> vertices;
-        std::vector<uint> indices;
-        std::vector<Texture> textures;
-        uint VAO;
-
-        Mesh(std::vector<Vertex> verts, std::vector<uint> indices, std::vector<Texture> textures)
-        {
-            this->vertices = verts;
-            this->indices = indices;
-            this->textures = textures;
-
-            setupMesh();
-        }
-
-        void Draw(Shader &shader)
-        {
-            uint diffuse  = 1;
-            uint specular = 1;
-            uint normal   = 1;
-            uint height   = 1;
-            for (uint i = 0; i < textures.size(); i++)
-            {
-                // activate proper texture unit before binding
-                glActiveTexture(GL_TEXTURE0 + i);
-                // retrieve texture number (the N in diffuse_textureN)
-                std::string number;
-                std::string name = textures[i].type;
-                if (name == "texture_diffuse")
-                    number = std::to_string(diffuse++);
-                else if (name == "texture_specular")
-                    number = std::to_string(specular++);
-                else if (name == "texture_normal")
-                    number = std::to_string(normal++);
-                else if (name == "texture_height")
-                    number = std::to_string(height++);
-
-                // now set the sampler to the correct texture unit
-                glUniform1i(glGetUniformLocation(shader.ID, (name + number).c_str()), i);
-                // and finally bind the texture
-                glBindTexture(GL_TEXTURE_2D, textures[i].id);
-            }
-
-            // draw mesh
-            glBindVertexArray(VAO);
-            glDrawElements(GL_TRIANGLES, static_cast<uint>(indices.size()), GL_UNSIGNED_INT, 0);
-            glBindVertexArray(0);
-
-            // always good practice to set everything back to defaults once configured.
-
-            glActiveTexture(GL_TEXTURE0);
-        }
-    private:
-        // render data
-        unsigned int VBO, EBO;
-
-        // initializes all the buffer objects/arrays
-        void setupMesh()
-        {
-            glGenVertexArrays(1, &VAO);
-            glGenBuffers(1, &VBO);
-            glGenBuffers(1, &EBO);
-
-            glBindVertexArray(VAO);
-            // load data into vertex buffers
-            glBindBuffer(GL_ARRAY_BUFFER, VBO);
-
-            // A great thing about structs is that their memory layout is sequential for all member items
-            // The effect is that we can simply pass a pointer to the struct and it translates perfectly to a glm::vec3/vec2 array
-            // which again translates to 3/2 floats which translates to a byte array
-            // Except we use J3ML instead of glm, but the concept applies nonetheless
-            glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(Vertex), &vertices[0], GL_STATIC_DRAW);
-
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBO);
-            glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(uint), &indices[0], GL_STATIC_DRAW);
-
-            // set the vertex attribute pointers
-            // vertex positions
-            glEnableVertexAttribArray(0);
-            glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*)0);
-            // vertex normals
-            glEnableVertexAttribArray(1);
-            glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*)offsetof(Vertex, Normal));
-            // vertex texture coords
-            glEnableVertexAttribArray(2);
-            glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*)offsetof(Vertex, TexCoords));
-            // vertex tangent
-            glEnableVertexAttribArray(3);
-            glVertexAttribPointer(3, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*)offsetof(Vertex, Tangent));
-            // vertex bitangent
-            glEnableVertexAttribArray(4);
-            glVertexAttribPointer(4, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*)offsetof(Vertex, BiTangent));
-                // ids
-                glEnableVertexAttribArray(5);
-                glVertexAttribIPointer(5, 4, GL_INT, sizeof(Vertex), (void*)offsetof(Vertex, BoneIDs));
-
-                // weights
-                glEnableVertexAttribArray(6);
-                glVertexAttribPointer(6, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*)offsetof(Vertex, BoneWeights));
-            glBindVertexArray(0);
-        }
-    };
-}

include/LearnOpenGL/Shader.h

@@ -1,58 +0,0 @@
-#pragma once
-
-// LearnOpenGL::Shader
-// OpenGL Shader Class Wrapper
-// Updated by dawsh
-// https://learnopengl.com/code_viewer_gh.php?code=includes/learnopengl/shader.h
-
-#include <filesystem>
-#include <string>
-#include <iostream>
-#include <fstream>
-#include <glad/glad.h>
-#include <J3ML/LinearAlgebra/Vector2.h>
-#include <J3ML/LinearAlgebra/Vector3.h>
-#include <J3ML/LinearAlgebra/Vector4.h>
-#include <J3ML/LinearAlgebra/Matrix2x2.h>
-#include <J3ML/LinearAlgebra/Matrix3x3.h>
-#include <J3ML/LinearAlgebra/Matrix4x4.h>
-
-namespace LearnOpenGL {
-    using J3ML::LinearAlgebra::Vector2;
-    using J3ML::LinearAlgebra::Vector3;
-    using J3ML::LinearAlgebra::Vector4;
-    using J3ML::LinearAlgebra::Matrix2x2;
-    using J3ML::LinearAlgebra::Matrix3x3;
-    using J3ML::LinearAlgebra::Matrix4x4;
-
-    class Shader
-    {
-    public:
-        unsigned int ID{};
-
-        Shader();
-        Shader(std::filesystem::path vertexProgramPath, std::filesystem::path fragmentProgramPath);
-        Shader(std::string vertexProgramSrc, std::string fragmentProgramSrc);
-
-        void use();
-        // Utility uniform functions
-        void setBool(const std::string& name, bool value) const;
-        void setInt(const std::string& name, int value) const;
-        void setFloat(const std::string& name, float value) const;
-        void setVec2(const std::string& name, const Vector2& value) const;
-        void setVec2(const std::string& name, float x, float y) const;
-        void setVec3(const std::string& name, const Vector3& value) const;
-        void setVec3(const std::string& name, float x, float y, float z) const;
-        void setVec4(const std::string& name, const Vector4& value) const;
-        void setVec4(const std::string& name, float x, float y, float z, float w) const;
-        void setMat2(const std::string& name, const Matrix2x2 &mat) const;
-        void setMat3(const std::string& name, const Matrix3x3 &mat) const;
-        void setMat4(const std::string& name, const Matrix4x4 &mat) const;
-
-        GLint getAttribute(const std::string& name) const;
-        GLint getUniform(const std::string& name) const;
-
-    private:
-        void checkCompileErrors(GLuint shader, std::string type);
-    };
-}

include/LearnOpenGL/Texture2D.h

@@ -1,23 +0,0 @@
-#pragma once
-
-namespace {
-    // Texture2D is able to store and configure a texture in OpenGL
-    // It also hosts utility functions for easy management.
-    class Texture2D {
-    public:
-        unsigned int ID; // ID of the texture object
-        unsigned int Width, Height;
-        unsigned int InternalFormat;
-        unsigned int ImageFormat;
-        unsigned int WrapS;
-        unsigned int WrapT;
-        unsigned int Filter_Min;
-        unsigned int Filter_Max;
-
-        Texture2D();
-
-        void Generate(unsigned int width, unsigned int height, unsigned char *data);
-
-        void Bind() const;
-    };
-}

src/LearnOpenGL/Shader.cpp

@@ -1,209 +0,0 @@
-#include <LearnOpenGL/Shader.h>
-
-
-
-
-
-namespace LearnOpenGL
-{
-
-    Shader::Shader(std::filesystem::path vertexProgramPath, std::filesystem::path fragmentProgramPath) {
-        std::string vertexCode;
-        std::string fragmentCode;
-        std::string geometryCode;
-        std::ifstream vShaderFile;
-        std::ifstream fShaderFile;
-        std::ifstream gShaderFile;
-
-        vShaderFile.exceptions(std::ifstream::failbit | std::ifstream::badbit);
-        vShaderFile.exceptions(std::ifstream::failbit | std::ifstream::badbit);
-        vShaderFile.exceptions(std::ifstream::failbit | std::ifstream::badbit);
-
-        try { // Open Files
-            vShaderFile.open(vertexProgramPath);
-            fShaderFile.open(fragmentProgramPath);
-            std::stringstream vShaderStream, fShaderStream;
-            // read file's buffer contents into streams
-            vShaderStream << vShaderFile.rdbuf();
-            fShaderStream << fShaderFile.rdbuf();
-            // close file handlers
-            vShaderFile.close();
-            fShaderFile.close();
-            // convert stream into string
-            vertexCode = vShaderStream.str();
-            fragmentCode = fShaderStream.str();
-            if (false)
-            {
-                gShaderFile.open("");
-                std::stringstream gShaderStream;
-                gShaderStream << gShaderFile.rdbuf();
-                gShaderFile.close();
-                geometryCode = gShaderStream.str();
-            }
-        } catch (std::ifstream::failure& e) {
-            std::cout << "ERROR::SHADER::FILE_NOT_SUCCESSFULLY_READ: " << e.what() << std::endl;
-        }
-        const char* vShaderCode = vertexCode.c_str();
-        const char* fShaderCode = fragmentCode.c_str();
-        // 2. Compile shaders
-        unsigned int vertex, fragment;
-        // vertex shader
-        vertex = glCreateShader(GL_VERTEX_SHADER);
-        glShaderSource(vertex, 1, &vShaderCode, NULL);
-        glCompileShader(vertex);
-        checkCompileErrors(vertex, "VERTEX");
-        // fragment shader
-        fragment = glCreateShader(GL_FRAGMENT_SHADER);
-        glShaderSource(fragment, 1, &fShaderCode, NULL);
-        glCompileShader(fragment);
-        checkCompileErrors(fragment, "FRAGMENT");
-        // if geometry shader is given, compile geometry shader
-        unsigned int geometry;
-        if (false)
-        {
-            //const char * gShaderCode = geometryCode.c_str();
-            //geometry = glCreateShader(GL_GEOMETRY_SHADER);
-            //glShaderSource(geometry, 1, &gShaderCode, NULL);
-            //glCompileShader(geometry);
-            //checkCompileErrors(geometry, "GEOMETRY");
-        }
-        // shader Program
-        ID = glCreateProgram();
-        glAttachShader(ID, vertex);
-        glAttachShader(ID, fragment);
-        if (false) // geometryPath != nullptr)
-            glAttachShader(ID, geometry);
-        glLinkProgram(ID);
-        checkCompileErrors(ID, "PROGRAM");
-        // delete the shaders as they're linked into our program now and are no longer necessary
-        glDeleteShader(vertex);
-        glDeleteShader(fragment);
-        if (false) //geometryPath != nullptr)
-            glDeleteShader(geometry);
-    }
-
-    Shader::Shader(std::string vertexProgramSrc, std::string fragmentProgramSrc) {
-
-        std::string geometryCode;
-
-        const char* vShaderCode = vertexProgramSrc.c_str();
-        const char* fShaderCode = fragmentProgramSrc.c_str();
-        // 2. Compile shaders
-        unsigned int vertex, fragment;
-        // vertex shader
-        vertex = glCreateShader(GL_VERTEX_SHADER);
-        glShaderSource(vertex, 1, &vShaderCode, NULL);
-        glCompileShader(vertex);
-        checkCompileErrors(vertex, "VERTEX");
-        // fragment shader
-        fragment = glCreateShader(GL_FRAGMENT_SHADER);
-        glShaderSource(fragment, 1, &fShaderCode, NULL);
-        glCompileShader(fragment);
-        checkCompileErrors(fragment, "FRAGMENT");
-        // if geometry shader is given, compile geometry shader
-        unsigned int geometry;
-        if (false)
-        {
-            //const char * gShaderCode = geometryCode.c_str();
-            //geometry = glCreateShader(GL_GEOMETRY_SHADER);
-            //glShaderSource(geometry, 1, &gShaderCode, NULL);
-            //glCompileShader(geometry);
-            //checkCompileErrors(geometry, "GEOMETRY");
-        }
-        // shader Program
-        ID = glCreateProgram();
-        glAttachShader(ID, vertex);
-        glAttachShader(ID, fragment);
-        if (false) // geometryPath != nullptr)
-            glAttachShader(ID, geometry);
-        glLinkProgram(ID);
-        checkCompileErrors(ID, "PROGRAM");
-        // delete the shaders as they're linked into our program now and are no longer necessary
-        glDeleteShader(vertex);
-        glDeleteShader(fragment);
-        if (false) //geometryPath != nullptr)
-            glDeleteShader(geometry);
-    }
-
-    void Shader::use() {
-        glUseProgram(ID);
-    }
-
-    GLint Shader::getAttribute(const std::string& name) const
-    {
-        return glGetAttribLocation(ID, name.c_str());
-    }
-
-    GLint Shader::getUniform(const std::string &name) const {
-        return glGetUniformLocation(ID, name.c_str());
-    }
-
-    void Shader::setBool(const std::string &name, bool value) const {
-        glUniform1i(glGetUniformLocation(ID, name.c_str()), (int)value);
-    }
-
-    void Shader::setInt(const std::string &name, int value) const {
-        glUniform1i(glGetUniformLocation(ID, name.c_str()), value);
-    }
-
-    void Shader::setFloat(const std::string &name, float value) const {
-        glUniform1f(glGetUniformLocation(ID, name.c_str()), value);
-    }
-
-    void Shader::setVec2(const std::string &name, const Vector2 &value) const {
-        glUniform2f(glGetUniformLocation(ID, name.c_str()), value.x, value.y);
-    }
-
-    void Shader::setVec2(const std::string &name, float x, float y) const {
-        glUniform2f(glGetUniformLocation(ID, name.c_str()), x, y);
-    }
-
-    void Shader::setVec3(const std::string &name, const Vector3 &value) const {
-        glUniform3f(glGetUniformLocation(ID, name.c_str()), value.x, value.y, value.z);
-    }
-
-    void Shader::setVec3(const std::string &name, float x, float y, float z) const {
-        glUniform3f(glGetUniformLocation(ID, name.c_str()), x, y, z);
-    }
-
-    void Shader::setVec4(const std::string &name, const Vector4 &value) const {
-        glUniform4f(glGetUniformLocation(ID, name.c_str()), value.x, value.y, value.z, value.w);
-    }
-
-    void Shader::setVec4(const std::string &name, float x, float y, float z, float w) const {
-        glUniform4f(glGetUniformLocation(ID, name.c_str()), x, y, z, w);
-    }
-
-    void Shader::setMat2(const std::string &name, const Matrix2x2 &mat) const {
-        //glUniformMatrix2fv(glGetUniformLocation(ID, name.c_str()), 1, GL_FALSE, &mat.At(0, 0));
-    }
-
-    void Shader::setMat3(const std::string &name, const Matrix3x3 &mat) const {
-        //glUniformMatrix3fv(glGetUniformLocation(ID, name.c_str()), 1, GL_FALSE, &mat.At(0, 0));
-    }
-
-    void Shader::setMat4(const std::string &name, const Matrix4x4 &mat) const {
-        //glUniformMatrix4fv(glGetUniformLocation(ID, name.c_str()), 1, GL_FALSE, &mat.At(0, 0));
-    }
-
-    void Shader::checkCompileErrors(GLuint shader, std::string type) {
-        GLint success;
-        GLchar infoLog[1024];
-        if (type != "PROGRAM") {
-            glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
-            if (!success) {
-                glGetShaderInfoLog(shader, 1024, NULL, infoLog);
-                std::cout << "ERROR::SHADER_COMPILATION_ERROR of type: " << type << "\n" << infoLog << std::endl;
-            }
-        } else {
-            glGetProgramiv(shader, GL_LINK_STATUS, &success);
-            if (!success)
-            {
-                glGetProgramInfoLog(shader, 1024, NULL, infoLog);
-                std::cout << "ERROR::PROGRAM_LINKING_ERROR of type: " << type << "\n" << infoLog << std::endl;
-            }
-        }
-    }
-
-    Shader::Shader() {}
-}

src/LearnOpenGL/Texture2D.cpp

@@ -1,29 +0,0 @@
-#include <LearnOpenGL/Texture2D.h>
-#include <glad/glad.h>
-#include <GL/glut.h>
-
-Texture2D::Texture2D()
-        : Width(0), Height(0), InternalFormat(GL_RGB), ImageFormat(GL_RGB), WrapS(GL_REPEAT), WrapT(GL_REPEAT),
-          Filter_Min(GL_LINEAR), Filter_Max(GL_LINEAR) {
-    glGenTextures(1, &this->ID);
-}
-
-void Texture2D::Generate(unsigned int width, unsigned int height, unsigned char *data) {
-    this->Width = width;
-    this->Height = height;
-    glBindTexture(GL_TEXTURE_2D, this->ID);
-    glTexImage2D(GL_TEXTURE_2D, 0, this->InternalFormat, width, height, 0, this->ImageFormat, GL_UNSIGNED_BYTE,
-                 data);
-    // set Texture wrap and filter modes
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, this->WrapS);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, this->WrapT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, this->Filter_Min);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, this->Filter_Max);
-
-    glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-void Texture2D::Bind() const
-{
-    glBindTexture(GL_TEXTURE_2D, this->ID);
-}