diff --git a/CMakeLists.txt b/CMakeLists.txt index ed662f71a8362be1f10ef677eb3c8ad91233b921..2de7e4f48d328208dc9c2562ce80b1536c03bc65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) if(WIN32) option(CMAKE_TOOLCHAIN_FILE "C:/vcpkg/vcpkg/scripts/buildsystems/vcpkg.cmake") elseif(UNIX) - #option(CMAKE_TOOLCHAIN_FILE "/amuhome/b20017738/Bureau/vcpkg/scripts/buildsystems/vcpkg.cmake") + option(CMAKE_TOOLCHAIN_FILE "/amuhome/b20017738/Bureau/vcpkg/scripts/buildsystems/vcpkg.cmake") endif() #============================================================== @@ -59,9 +59,9 @@ set_property(TARGET ${CURRENT_TARGET} PROPERTY RUNTIME_OUTPUT_DIRECTORY $<1:${CM target_include_directories(${CURRENT_TARGET} PRIVATE ${INCLUDE}) -#list(APPEND CMAKE_PREFIX_PATH "/amuhome/b20017738/Bureau/vcpkg/packages/glew_x64-linux") -#list(APPEND CMAKE_PREFIX_PATH "/amuhome/b20017738/Bureau/vcpkg/packages/glm_x64-linux") -#list(APPEND CMAKE_PREFIX_PATH "/amuhome/b20017738/Bureau/vcpkg/packages/imgui_x64-linux") +list(APPEND CMAKE_PREFIX_PATH "/amuhome/b20017738/Bureau/vcpkg/packages/glew_x64-linux") +list(APPEND CMAKE_PREFIX_PATH "/amuhome/b20017738/Bureau/vcpkg/packages/glm_x64-linux") +list(APPEND CMAKE_PREFIX_PATH "/amuhome/b20017738/Bureau/vcpkg/packages/imgui_x64-linux") find_package(glfw3 REQUIRED) find_package(GLEW REQUIRED) diff --git a/Main b/Main index d6eba117ec4ac1e24aaa77c3c625a3077803184e..7276334660cba1c76f07a9bc517346b257a3e2fb 100755 Binary files a/Main and b/Main differ diff --git a/assets/shaders/Framebuffer-Instanced.frag b/assets/shaders/FrameBuffer-Instanced.frag similarity index 100% rename from assets/shaders/Framebuffer-Instanced.frag rename to assets/shaders/FrameBuffer-Instanced.frag diff --git a/assets/shaders/Framebuffer-Instanced.vert b/assets/shaders/FrameBuffer-Instanced.vert similarity index 100% rename from assets/shaders/Framebuffer-Instanced.vert rename to assets/shaders/FrameBuffer-Instanced.vert diff --git a/assets/textures/Test.png b/assets/textures/Test.png new file mode 100644 index 0000000000000000000000000000000000000000..5900cdb901de8ec21b580869c01c70d32e764dae Binary files /dev/null and b/assets/textures/Test.png differ diff --git a/source/engine/graphics/back/buffers/Layout.hpp b/source/engine/graphics/back/buffers/Layout.hpp index dae2abbcc364be4752d926f677757c156ac2b3e5..d0ee3ce48d67ed460fc331bdf569b66b0c6320e7 100644 --- a/source/engine/graphics/back/buffers/Layout.hpp +++ b/source/engine/graphics/back/buffers/Layout.hpp @@ -16,11 +16,11 @@ namespace megu { }; } - using Layout = std::list<layout::Value>; + using Layout_t = std::list<layout::Value>; using Layout_Initializer = std::initializer_list<layout::Value>; namespace layout { - inline size_t weight(const Layout & layout) { + inline size_t weight(const Layout_t & layout) { return std::accumulate(layout.begin(), layout.end(), 0); } } diff --git a/source/engine/graphics/back/buffers/VerticeBuffer.cpp b/source/engine/graphics/back/buffers/VerticeBuffer.cpp index 2bcee15e52d8c3e1395bb6dfc856fd71d184312e..5ace2cdd14f49e44e73c0b16a3c8b62c3afd903e 100644 --- a/source/engine/graphics/back/buffers/VerticeBuffer.cpp +++ b/source/engine/graphics/back/buffers/VerticeBuffer.cpp @@ -3,12 +3,12 @@ #include <list> namespace megu { - VerticeBuffer::VerticeBuffer(const VertexArray & vao, const Layout & attributes, size_t size, EditMode mode) + VerticeBuffer::VerticeBuffer(const VertexArray & vao, const Layout_t & attributes, size_t size, EditMode mode) : DynamicBuffer(size), _vao(&vao), _id(0), _mode(mode), _layout(attributes) { this->generate({}); } - VerticeBuffer::VerticeBuffer(const VertexArray & vao, const Layout & attributes, const std::vector<float> & vertices, EditMode mode) + VerticeBuffer::VerticeBuffer(const VertexArray & vao, const Layout_t & attributes, const std::vector<float> & vertices, EditMode mode) : DynamicBuffer(vertices.size(), vertices.size()), _vao(&vao), _id(0), _mode(mode), _layout(attributes) { this->generate(vertices); } @@ -62,7 +62,7 @@ namespace megu { } } - bool VerticeBuffer::compare(const Layout & layout) const { + bool VerticeBuffer::compare(const Layout_t & layout) const { return this->_layout == layout; } diff --git a/source/engine/graphics/back/buffers/VerticeBuffer.hpp b/source/engine/graphics/back/buffers/VerticeBuffer.hpp index 27411dfe9e1db0d4bcc46b83f9e3e31e412ca9ef..00af7e43ac8979193ff361b81f3c63066e3adb66 100644 --- a/source/engine/graphics/back/buffers/VerticeBuffer.hpp +++ b/source/engine/graphics/back/buffers/VerticeBuffer.hpp @@ -12,12 +12,12 @@ namespace megu { class VerticeBuffer : public DynamicBuffer<float, GL_ARRAY_BUFFER> { public: VerticeBuffer() = delete; - VerticeBuffer(const VertexArray & vao, const Layout &, size_t, EditMode=EditMode::DYNAMIC); - VerticeBuffer(const VertexArray & vao, const Layout &, const std::vector<float> &, EditMode=EditMode::DYNAMIC); + VerticeBuffer(const VertexArray & vao, const Layout_t &, size_t, EditMode=EditMode::DYNAMIC); + VerticeBuffer(const VertexArray & vao, const Layout_t &, const std::vector<float> &, EditMode=EditMode::DYNAMIC); VerticeBuffer(const VerticeBuffer &) = delete; virtual ~VerticeBuffer(); - const Layout & layout() const {return this->_layout;} + const Layout_t & layout() const {return this->_layout;} size_t weight() const; size_t vertices() const; @@ -29,7 +29,7 @@ namespace megu { virtual void generate(const std::vector<float> &); - bool compare(const Layout &) const; + bool compare(const Layout_t &) const; bool operator==(const VerticeBuffer &) const; bool operator!=(const VerticeBuffer &) const; @@ -49,7 +49,7 @@ namespace megu { const VertexArray * _vao; GLuint _id; EditMode _mode; - Layout _layout; + Layout_t _layout; }; diff --git a/source/engine/graphics/back/geometry/Geometry.hpp b/source/engine/graphics/back/geometry/Geometry.hpp index ca78b648733fb414082ae95c5e52ec519f930514..c34f8fd5890d7aeba60c1d1dc73b7adac9c94f6a 100644 --- a/source/engine/graphics/back/geometry/Geometry.hpp +++ b/source/engine/graphics/back/geometry/Geometry.hpp @@ -29,22 +29,22 @@ namespace megu { class Geometry : public Primitived<P> { public: Geometry() = delete; - Geometry(const Layout &); + Geometry(const Layout_t &); ~Geometry() = default; virtual const Vertices_t & vertices() const = 0; - inline const Layout & layout() const {return this->_layout;} + inline const Layout_t & layout() const {return this->_layout;} private: - Layout _layout; + Layout_t _layout; }; template <Primitive_t P> class Geometry_Indiced : public Geometry<P> { public: Geometry_Indiced() = delete; - Geometry_Indiced(const Layout &); + Geometry_Indiced(const Layout_t &); ~Geometry_Indiced() = default; virtual const Elements_t & elements() const = 0; @@ -58,12 +58,12 @@ namespace megu { const Vertices_t & vertices() const {return Static_Geometry<T, P>::Vertices();} - static Layout Layout() {return Counter<megu::layout::Value>::Count<L...>();} + static Layout_t Layout() {return Counter<megu::layout::Value>::Count<L...>();} static const Vertices_t & Vertices() {return T::Vertices();} }; template <class T, Primitive_t P, layout::Value ... L> - class Static_Geometry_Indiced : public Geometry_Indiced<P>, public Static_Geometry<T, P, L> { + class Static_Geometry_Indiced : public Geometry_Indiced<P>, public Static_Geometry<T, P, L...> { public: Static_Geometry_Indiced() = default; ~Static_Geometry_Indiced() = default; diff --git a/source/engine/graphics/back/geometry/Geometry.tpp b/source/engine/graphics/back/geometry/Geometry.tpp index 6bb031da821637d77e7a51cbddfe49c3a7de7c13..952e53104f406f24e3535a5c642cb397c31a1332 100644 --- a/source/engine/graphics/back/geometry/Geometry.tpp +++ b/source/engine/graphics/back/geometry/Geometry.tpp @@ -2,10 +2,10 @@ namespace megu { template <Primitive_t P> - Geometry<P>::Geometry(const Layout & layout) + Geometry<P>::Geometry(const Layout_t & layout) : _layout(layout) {} template <Primitive_t P> - Geometry_Indiced<P>::Geometry_Indiced(const Layout & layout) + Geometry_Indiced<P>::Geometry_Indiced(const Layout_t & layout) : Geometry<P>(layout) {} } \ No newline at end of file diff --git a/source/main.cpp b/source/main.cpp index 74d321b84f11338748102796797672eab6d8aae2..dd11de7f3c0414ab6e496ccd4a91c91391846d22 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -3,9 +3,9 @@ #include <GL/glew.h> #include <GLFW/glfw3.h> -#include <imgui.h> -#include <imgui_impl_glfw.h> -#include <imgui_impl_opengl3.h> +//#include <imgui.h> +//#include <imgui_impl_glfw.h> +//#include <imgui_impl_opengl3.h> #define WINDOW_WIDTH 1280 #define WINDOW_HEIGHT 720 @@ -161,9 +161,9 @@ int main(int argc, const char * argv[]) { std::cout << "Images 2 Inited" << std::endl; //? ImGui - ImGui::CreateContext(); - ImGui_ImplOpenGL3_Init(); - ImGui_ImplGlfw_InitForOpenGL(window.ptr(), true); + //ImGui::CreateContext(); + //ImGui_ImplOpenGL3_Init(); + //ImGui_ImplGlfw_InitForOpenGL(window.ptr(), true); //? Engines megu::GraphicEngine engine(window);