WIP ImGui and DrawRequest/DrawCallHandler

.gitmodules

@@ -1,13 +1,7 @@
-[submodule "lib/benchmark"]
-	path = thirdParty/benchmark
-	url = https://github.com/google/benchmark.git
 [submodule "thirdParty/SDL"]
 	path = thirdParty/SDL
 	url = https://github.com/libsdl-org/SDL/
 	branch = SDL2
-[submodule "thirdParty/glfw"]
-	path = thirdParty/glfw
-	url = https://github.com/glfw/glfw
 [submodule "thirdParty/gv"]
 	path = thirdParty/gv
 	url = https://github.com/kohakow/gv
@@ -20,18 +14,9 @@
 [submodule "thirdParty/glm"]
 	path = thirdParty/glm
 	url = https://github.com/g-truc/glm
-[submodule "thirdParty/json"]
-	path = thirdParty/json
-	url = https://github.com/nlohmann/json
-[submodule "thirdParty/tinygltf"]
-	path = thirdParty/tinygltf
-	url = https://github.com/syoyo/tinygltf/
 [submodule "thirdParty/entt"]
 	path = thirdParty/entt
 	url = https://github.com/skypjack/entt
-[submodule "thirdParty/imgui"]
-	path = thirdParty/imgui
-	url = https://github.com/ocornut/imgui
 [submodule "thirdParty/assimp"]
 	path = thirdParty/assimp
 	url = https://github.com/assimp/assimp

Future/CMakeLists.txt

@@ -10,11 +10,10 @@ project(Future)
 
 add_subdirectory(${THIRD_PARTY_LIB_DIR}/spdlog spdlog)
 add_subdirectory(${THIRD_PARTY_LIB_DIR}/SDL SDL)
-add_subdirectory(${THIRD_PARTY_LIB_DIR}/glfw glfw)
 add_subdirectory(${THIRD_PARTY_LIB_DIR}/glm glm)
-add_subdirectory(${THIRD_PARTY_LIB_DIR}/json json)
 set(BUILD_SHARED_LIBS ON)
 add_subdirectory(${THIRD_PARTY_LIB_DIR}/assimp assimp)
+#add_subdirectory(${THIRD_PARTY_LIB_DIR}/imgui_cmake imgui)
 
 add_library(Future SHARED
         # GLAD
@@ -53,10 +52,10 @@ add_library(Future SHARED
         src/Rendering/Textures/Texture.hpp
         src/Rendering/Camera.cpp
         src/Rendering/Camera.hpp
-        src/Rendering/Model/Mesh.cpp
-        src/Rendering/Model/Mesh.hpp
-        src/Rendering/Model/Model.cpp
-        src/Rendering/Model/Model.hpp
+        src/Rendering/Mesh/Mesh.cpp
+        src/Rendering/Mesh/Mesh.hpp
+        src/Rendering/Mesh/Model.cpp
+        src/Rendering/Mesh/Model.hpp
         src/Rendering/Vertex.hpp
 )
 
@@ -66,16 +65,17 @@ target_include_directories(Future PUBLIC
         ${THIRD_PARTY_LIB_DIR}/glad/include/
         ${THIRD_PARTY_LIB_DIR}/stb/
         ${THIRD_PARTY_LIB_DIR}/glm/glm/
-        ${THIRD_PARTY_LIB_DIR}/json/include
         ${THIRD_PARTY_LIB_DIR}/assimp/include
+        #${THIRD_PARTY_LIB_DIR}/imgui_cmake
+        #${THIRD_PARTY_LIB_DIR}/imgui_cmake/backends
 )
 
 target_link_libraries(Future PUBLIC spdlog::spdlog $<$<BOOL:${MINGW}>:ws2_32>)
 target_link_libraries(Future PUBLIC SDL2::SDL2main)
 target_link_libraries(Future PUBLIC SDL2::SDL2)
-target_link_libraries(Future PUBLIC glfw)
 target_link_libraries(Future PUBLIC glm)
 target_link_libraries(Future PUBLIC assimp)
+#target_link_libraries(Future PUBLIC imgui)
 
 add_custom_command(TARGET Future POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory

Future/src/Rendering/Camera.hpp

@@ -3,7 +3,6 @@
 
 #include "Shaders.hpp"
 #include "../../../thirdParty/glm/glm/vec3.hpp"
-#include "../../../thirdParty/glfw/include/GLFW/glfw3.h"
 #include "../../../thirdParty/glm/glm/glm.hpp"
 #include <glad/glad.h>
 #include "../../../thirdParty/glm/glm/gtc/type_ptr.hpp"

Future/src/Rendering/DrawCalls/DrawCallHandler.cpp

@@ -0,0 +1,27 @@
+#include "DrawCallHandler.hpp"
+
+namespace Future {
+    unsigned int DrawCallHandler::Push(DrawRequest request) {
+        drawRequestQueue.push_back(request);
+    }
+
+    bool DrawCallHandler::Pop(unsigned int id) {
+        auto it = std::find_if(drawRequestQueue.begin(), drawRequestQueue.end(),
+                               [id](const DrawRequest& request) {
+                                   return request.ID == id;
+                               });
+        if (it != drawRequestQueue.end()) {
+            drawRequestQueue.erase(it);
+            return true;
+        }
+        return false;
+    }
+
+    void DrawCallHandler::DrawFrame() {
+        for (unsigned int i = 0; i < drawRequestQueue.size(); i++)
+        {
+            //drawRequestQueue[i].mesh.Draw(shader, camera, matricesMeshes[i], translationsMeshes[i], rotationsMeshes[i], scalesMeshes[i]);
+        }
+        drawRequestQueue.clear();
+    }
+}

Future/src/Rendering/DrawCalls/DrawCallHandler.hpp

@@ -0,0 +1,16 @@
+#pragma once
+#include "DrawRequest.hpp"
+#include <glad.h>
+
+namespace Future {
+    class DrawCallHandler {
+        public:
+            [[nodiscard]] unsigned int GetDrawCalls() const { return drawRequestQueue.size(); }
+            unsigned int Push(DrawRequest request);
+            bool Pop(unsigned int ID);
+            void DrawFrame();
+
+        private:
+            std::vector<DrawRequest> drawRequestQueue;
+    };
+}

Future/src/Rendering/DrawCalls/DrawRequest.hpp

@@ -0,0 +1,12 @@
+#pragma once
+#include "../Shaders.hpp"
+#include "../Mesh/Mesh.hpp"
+
+struct DrawRequest
+{
+    unsigned int ID;
+    Future::Shaders shaders;
+    //Future::Material material;
+    Future::Mesh mesh;
+    glm::mat4 modelMatrix;
+};

Future/src/Rendering/Model/Model.hpp → Future/src/Rendering/Mesh/Model.hpp

@@ -10,7 +10,6 @@
 #include <assimp/Importer.hpp>
 #include <assimp/scene.h>
 #include <assimp/postprocess.h>
-#include <../../../thirdParty/json/include/nlohmann/json.hpp>
 #include <glm/gtx/matrix_decompose.hpp>
 
 namespace Future

Future/src/Rendering/Renderer.cpp

@@ -130,7 +130,7 @@ namespace Future
             m_mainCamera.UpdateMatrix(45.0f, 0.01f, 10000.0f);
             m_mainCamera.Matrix(*defaultShaderProgram, "camMatrix");
 
-            //helmet.Draw(*defaultShaderProgram, m_mainCamera);
+            helmet.Draw(*defaultShaderProgram, m_mainCamera);
             sponza.Draw(*defaultShaderProgram, m_mainCamera);
 
             glBindFramebuffer(GL_FRAMEBUFFER, 0); // Bind the default framebuffer

Future/src/Rendering/Renderer.hpp

@@ -12,7 +12,7 @@
 #include <../../../thirdParty/glm/glm/gtc/matrix_transform.hpp>
 #include <../../../thirdParty/glm/glm/gtc/type_ptr.hpp>
 #include "Shaders.hpp"
-#include "Model/Model.hpp"
+#include "Mesh/Model.hpp"
 #include "Camera.hpp"
 #include "Shaders.hpp"
 #include "Buffers/EBO.hpp"

Future/src/Rendering/Vertex.hpp

@@ -1,5 +1,4 @@
-#ifndef VERTEX_HPP
-#define VERTEX_HPP
+#pragma once
 #include "vec2.hpp"
 #include "vec3.hpp"
 
@@ -10,5 +9,3 @@ struct Vertex
     glm::vec3 color;
     glm::vec2 TexCoords;
 };
-
-#endif //VERTEX_HPP

thirdParty/imgui_cmake/.editorconfig

@@ -0,0 +1,28 @@
+# See http://editorconfig.org to read about the EditorConfig format.
+# - In theory automatically supported by VS2017+ and most common IDE or text editors.
+# - In practice VS2019-VS2022 stills don't trim trailing whitespaces correctly :(
+#   - Suggest installing this to trim whitespaces:
+#      GitHub https://github.com/madskristensen/TrailingWhitespace
+#      VS2019 https://marketplace.visualstudio.com/items?itemName=MadsKristensen.TrailingWhitespaceVisualizer
+#      VS2022 https://marketplace.visualstudio.com/items?itemName=MadsKristensen.TrailingWhitespace64
+#     (in spite of its name doesn't only visualize but also trims)
+#   - Alternative for older VS2010 to VS2015: https://marketplace.visualstudio.com/items?itemName=EditorConfigTeam.EditorConfig
+
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# Use 4 spaces as indentation
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[imstb_*]
+indent_size = 3
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
+indent_size = 4

thirdParty/imgui_cmake/.gitattributes

@@ -0,0 +1,30 @@
+* text=auto
+
+*.c text
+*.cpp text
+*.h text
+*.m text
+*.mm text
+*.md text
+*.txt text
+*.html text
+*.bat text
+*.frag text
+*.vert text
+*.mkb text
+*.icf text
+
+*.sln text eol=crlf
+*.vcxproj text eol=crlf
+*.vcxproj.filters text eol=crlf
+*.natvis text eol=crlf
+
+Makefile text eol=lf
+*.sh text eol=lf
+*.pbxproj text eol=lf
+*.storyboard text eol=lf
+*.plist text eol=lf
+
+*.png binary
+*.ttf binary
+*.lib binary

thirdParty/imgui_cmake/.gitignore

@@ -0,0 +1,61 @@
+## OSX artifacts
+.DS_Store
+
+## Dear ImGui artifacts
+imgui.ini
+imgui*.ini
+
+## General build artifacts
+*.o
+*.obj
+*.exe
+examples/*/Debug/*
+examples/*/Release/*
+examples/*/x64/*
+
+## Visual Studio artifacts
+.vs
+ipch
+*.opensdf
+*.log
+*.pdb
+*.ilk
+*.user
+*.sdf
+*.suo
+*.VC.db
+*.VC.VC.opendb
+
+## Getting files created in JSON/Schemas/Catalog/ from a VS2022 update
+JSON/
+
+## Commonly used CMake directories
+build*/
+
+## Xcode artifacts
+project.xcworkspace
+xcuserdata
+
+## Emscripten artifacts
+examples/*.o.tmp
+examples/*.out.js
+examples/*.out.wasm
+examples/example_glfw_opengl3/web/*
+examples/example_glfw_wgpu/web/*
+examples/example_glfw_wgpu/external/*
+examples/example_sdl2_opengl3/web/*
+
+## JetBrains IDE artifacts
+.idea
+cmake-build-*
+
+## Unix executables from our example Makefiles
+examples/example_glfw_metal/example_glfw_metal
+examples/example_glfw_opengl2/example_glfw_opengl2
+examples/example_glfw_opengl3/example_glfw_opengl3
+examples/example_glut_opengl2/example_glut_opengl2
+examples/example_null/example_null
+examples/example_sdl2_metal/example_sdl2_metal
+examples/example_sdl2_opengl2/example_sdl2_opengl2
+examples/example_sdl2_opengl3/example_sdl2_opengl3
+examples/example_sdl2_sdlrenderer/example_sdl2_sdlrenderer

thirdParty/imgui_cmake/CMakeLists.txt

@@ -0,0 +1,24 @@
+set(_target "imgui")
+
+add_library(${_target}
+    imconfig.h
+    imgui_demo.cpp
+    imgui_draw.cpp
+    imgui_tables.cpp
+    imgui_widgets.cpp
+    imgui.cpp
+    misc/cpp/imgui_stdlib.cpp
+    misc/cpp/imgui_stdlib.h
+    backends/imgui_impl_opengl3.cpp
+    backends/imgui_impl_opengl3.h
+    backends/imgui_impl_sdl2.cpp
+    backends/imgui_impl_sdl2.h
+)
+
+target_include_directories(${_target}
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/imgui"
+    PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
+target_link_libraries(${_target} PUBLIC SDL2::SDL2main)
+target_link_libraries(${_target} PUBLIC SDL2::SDL2)

thirdParty/imgui_cmake/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2024 Omar Cornut
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.