Skip to content
Snippets Groups Projects
Commit 195b2e99 authored by Baton Théau's avatar Baton Théau
Browse files

Fixing same typename as methode error + fix Maj in path

parent 72d2b266
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 28 additions and 28 deletions
CMakeLists.txt
+ 4
− 4
View file @ 195b2e99
......@@ -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)
......
Main
+ 0
− 0
View file @ 195b2e99
No preview for this file type
assets/textures/Test.png 0 → 100644
+ 0
− 0
View file @ 195b2e99
assets/textures/Test.png

36.4 KiB

source/engine/graphics/back/buffers/Layout.hpp
+ 2
− 2
View file @ 195b2e99
......@@ -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);
}
}
......
source/engine/graphics/back/buffers/VerticeBuffer.cpp
+ 3
− 3
View file @ 195b2e99
......@@ -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;
}
......
source/engine/graphics/back/buffers/VerticeBuffer.hpp
+ 5
− 5
View file @ 195b2e99
......@@ -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;
};
......
source/engine/graphics/back/geometry/Geometry.hpp
+ 6
− 6
View file @ 195b2e99
......@@ -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;
......
source/engine/graphics/back/geometry/Geometry.tpp
+ 2
− 2
View file @ 195b2e99
......@@ -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
source/main.cpp
+ 6
− 6
View file @ 195b2e99
......@@ -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);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment