Revert struct lol
This commit is contained in:
parent
2f8410e8db
commit
7e0ef3d269
@ -1,3 +1,5 @@
|
|||||||
|
include_directories(./.)
|
||||||
|
|
||||||
add_subdirectory(./NBCore)
|
add_subdirectory(./NBCore)
|
||||||
add_subdirectory(./NBEvents)
|
add_subdirectory(./NBEvents)
|
||||||
add_subdirectory(./NBGraphics)
|
add_subdirectory(./NBGraphics)
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
include_directories(./include)
|
include_directories(./.)
|
||||||
|
|
||||||
toAbsolutePath(NB_CORE_SOURCE
|
toAbsolutePath(NB_CORE_SOURCE
|
||||||
./src/Errors.cpp
|
./src/Errors.cpp
|
||||||
@ -7,14 +7,14 @@ toAbsolutePath(NB_CORE_SOURCE
|
|||||||
)
|
)
|
||||||
|
|
||||||
toAbsolutePath(NB_CORE_INCLUDE
|
toAbsolutePath(NB_CORE_INCLUDE
|
||||||
./include/ANSITerm.hpp
|
./ANSITerm.hpp
|
||||||
./include/DataSink.hpp
|
./DataSink.hpp
|
||||||
./include/Errors.hpp
|
./Errors.hpp
|
||||||
./include/Logger.hpp
|
./Logger.hpp
|
||||||
./include/Processes.hpp
|
./Processes.hpp
|
||||||
./include/ThreadsafeQueue.hpp
|
./ThreadsafeQueue.hpp
|
||||||
./include/Types.hpp
|
./Types.hpp
|
||||||
./include/TypeTraits.hpp
|
./TypeTraits.hpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set(NB_CORE_SOURCE ${NB_CORE_SOURCE} PARENT_SCOPE)
|
set(NB_CORE_SOURCE ${NB_CORE_SOURCE} PARENT_SCOPE)
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
#include "Errors.hpp"
|
#include "Errors.hpp"
|
||||||
#gay
|
|
||||||
|
|
||||||
namespace nb {
|
namespace nb {
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
include_directories(./include)
|
include_directories(./.)
|
||||||
|
|
||||||
toAbsolutePath(NB_EVENTS_SOURCE
|
toAbsolutePath(NB_EVENTS_SOURCE
|
||||||
./src/Events.cpp
|
./src/Events.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
toAbsolutePath(NB_EVENTS_INCLUDE
|
toAbsolutePath(NB_EVENTS_INCLUDE
|
||||||
./include/Events.hpp
|
./Events.hpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set(NB_EVENTS_SOURCE ${NB_EVENTS_SOURCE} PARENT_SCOPE)
|
set(NB_EVENTS_SOURCE ${NB_EVENTS_SOURCE} PARENT_SCOPE)
|
||||||
|
|||||||
@ -9,8 +9,8 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "NBCore/Errors.hpp"
|
#include <NBCore/Errors.hpp>
|
||||||
#include "NBCore/Types.hpp"
|
#include <NBCore/Types.hpp>
|
||||||
|
|
||||||
namespace nb {
|
namespace nb {
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
include_directories(./include)
|
include_directories(./.)
|
||||||
|
|
||||||
find_package(OpenGL)
|
find_package(OpenGL)
|
||||||
add_subdirectory(${GLFW_PATH} ${GLFW_PATH}/build)
|
add_subdirectory(${GLFW_PATH} ${GLFW_PATH}/build)
|
||||||
@ -15,13 +15,13 @@ toAbsolutePath(NB_GRAPHICS_SOURCE
|
|||||||
)
|
)
|
||||||
|
|
||||||
toAbsolutePath(NB_GRAPHICS_INCLUDE
|
toAbsolutePath(NB_GRAPHICS_INCLUDE
|
||||||
./include/Buffers.hpp
|
./Buffers.hpp
|
||||||
./include/Camera.hpp
|
./Camera.hpp
|
||||||
./include/Draw.hpp
|
./Draw.hpp
|
||||||
./include/GLLoad.hpp
|
./GLLoad.hpp
|
||||||
./include/shader.hpp
|
./shader.hpp
|
||||||
./include/VAOManager.hpp
|
./VAOManager.hpp
|
||||||
./include/Window.hpp
|
./Window.hpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set(NB_GRAPHICS_SOURCE ${NB_GRAPHICS_SOURCE} PARENT_SCOPE)
|
set(NB_GRAPHICS_SOURCE ${NB_GRAPHICS_SOURCE} PARENT_SCOPE)
|
||||||
|
|||||||
@ -6,12 +6,11 @@
|
|||||||
|
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <iostream>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace NB {
|
namespace nb {
|
||||||
|
|
||||||
class GLError : public std::runtime_error {
|
class GLError : public std::runtime_error {
|
||||||
public:
|
public:
|
||||||
@ -1,5 +1,6 @@
|
|||||||
#include "Window.hpp"
|
#include "Window.hpp"
|
||||||
namespace NB {
|
|
||||||
|
namespace nb {
|
||||||
|
|
||||||
std::map<GLFWwindow*, Window*> Window::WindowContexts = {};
|
std::map<GLFWwindow*, Window*> Window::WindowContexts = {};
|
||||||
std::map<int, int> Window::GLFWHints = {};
|
std::map<int, int> Window::GLFWHints = {};
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user