Heavy buffer update, window update, object tracking

.gitignore

@@ -6,4 +6,3 @@ docs/*
 !docs/CMake*
 !docs/Doxyfile.in
 !.clangd
-.glsld

engine/NBCore/CMakeLists.txt

@@ -13,10 +13,10 @@ toAbsolutePath(NB_CORE_SOURCE
     ./src/Logger.cpp
     ./src/Processes.cpp
     ./src/StringUtils.cpp
-    ./src/TypeTraits.cpp
     ./src/Utils.cpp
 )
 toAbsolutePath(NB_CORE_INCLUDE
+    ./include/NBCore/ANSITerm.hpp
     ./include/NBCore/DataSink.hpp
     ./include/NBCore/Errors.hpp
     ./include/NBCore/ErrorsImpl.hpp

engine/NBCore/include/NBCore/ANSITerm.hpp

@@ -0,0 +1,214 @@
+#pragma once
+#ifndef _NB_ANSI_TERM
+#define _NB_ANSI_TERM
+
+#include <iostream>
+#include <string>
+#include <type_traits>
+
+/*
+----------- TECH DEBT ------------
+Idk wtf to do here. This was originally to allow me to print 
+to terminal easily, but it's becoming too much of an investment.
+For the time being, drop it.
+
+*/
+
+namespace nb {
+
+template <typename ST, typename U>
+struct SmartText {
+    using Type = ST;
+    using ValType = U;
+    static constexpr bool HasChild = Type::HasChild;
+
+    SmartText() = default;
+};
+
+template <typename Type, typename U>
+struct StyleFormatter : SmartText<StyleFormatter<Type, U>, U> {
+    using Base = SmartText<StyleFormatter<Type, U>, U>;
+    using typename Base::ValType;
+    static constexpr bool HasChild  = true;
+
+    StyleFormatter(const std::string& _fmt, const ValType& _val, const std::string& _closing) :
+        fmt{_fmt}, val{_val}, closing{_closing} {}
+
+    std::string fmt;
+    ValType val;
+    std::string closing;
+};
+
+template <typename Child>
+struct StyleFormatter<Child, void> : SmartText<StyleFormatter<Child, void>, void>{
+    using Base = SmartText<StyleFormatter<Child, void>, void>;
+    using Base::ValType;
+    static constexpr bool HasChild  = false;
+
+    StyleFormatter(const std::string& _fmt) : fmt{_fmt} {}
+
+    std::string fmt;
+};
+
+template <typename U=void>
+struct ANSITextColor;
+
+template <typename U>
+struct ANSITextColor : StyleFormatter<ANSITextColor<U>, U> {
+    using Base = StyleFormatter<ANSITextColor, U>;
+    using typename Base::ValType;
+    using Base::HasChild;
+
+    template <typename = typename std::enable_if<HasChild, U>::type>
+    ANSITextColor(const U& _val) : Base{"\x1b[39m", _val, "\x1b[39m"} {}
+    template <typename = typename std::enable_if<!HasChild, U>>
+    ANSITextColor() : Base{"\x1b[92m"} {}
+};
+
+template <>
+struct ANSITextColor<std::string> : StyleFormatter<ANSITextColor<std::string>, std::string> {
+    using Base = StyleFormatter<ANSITextColor<std::string>, std::string>;
+    static constexpr bool HasChild = Base::HasChild;
+
+    template <std::size_t N>
+    ANSITextColor(char const(&_val) [N]) : Base{"\x1b[92m", _val, "\x1b[39m"} {}
+    ANSITextColor(const char* _val) : Base{"\x1b[92m", _val, "\x1b[39m"} {}
+    ANSITextColor(const std::string& _val) : Base{"\x1b[92m", _val, "\x1b[39m"} {}
+};
+
+} // namespace nb
+
+template<typename Type, typename U>
+std::ostream& operator<<(std::ostream& stream, const nb::StyleFormatter<Type, U>& msg) {
+    if (&stream == &std::cout) {
+        stream << msg.fmt;
+        if (msg.HasChild) {
+            stream << msg.val << msg.closing;
+        }
+    } else {
+        if (msg.HasChild) { stream << msg.val; }
+    }
+    stream << std::flush;
+    return stream;
+}
+
+/* struct CellBase {
+    uint8_t width;
+    uint8_t height;
+};
+
+template <typename T>
+struct Cell : SmartText<Cell<T>, T> {
+    using Base = SmartText<Cell<T>, T>;
+    using typename Base::ValType;
+    using Base::HasChild;
+
+    Cell(const ValType& _val, const uint8_t& w, const uint8_t& h=1)
+        : val(_val), width(w), height(h) {}
+
+    ValType val;
+    uint8_t width;
+
+    uint8_t height;
+};
+
+template <>
+struct Cell<std::string> : SmartText<Cell<std::string>, std::string> {
+    using Base = SmartText<Cell<std::string>, std::string>;
+    using typename Base::ValType;
+    using Base::HasChild;
+
+    template <std::size_t N>
+    Cell( const(&_val) [N], const uint8_t& w, const uint8_t& h=0) : Cell(std::string(_val), w, h) {}
+    Cell(char* _val, const uint8_t& w, const uint8_t& h=0) : Cell(std::string(_val), w, h) {}
+    Cell(const ValType& _val, const uint8_t& w, const uint8_t& h=0)
+    : val(_val), width(w) {
+        unsigned int strsize = _val.size();
+        height = strsize / width;
+        height += (strsize % width) ? 1 : 0;
+    }
+
+    ValType val;
+    uint8_t width;
+
+    uint8_t height;
+};
+
+template <typename T>
+std::ostream& operator<<(std::ostream& stream, const Cell<T>& cll) {
+    if (&stream == &std::cout) {
+        stream << "\x1b[s" << cll.val << "\x1b[u\x1b[" << 1+cll.width << "C\x1b[" << 1+cll.height;
+    }
+    return stream;
+}
+
+template <typename T>
+void ChangeCellHeight(int i, Cell<T>& cll, const unsigned int& h) {
+    if (h < cll.height) { cll.height=h; }
+}
+
+template <typename T>
+void GetTallestCell(int i, Cell<T>& cll, unsigned int& h) {
+    if (cll.height > h) { h = cll.height; }
+}
+
+template <typename... Pack>
+struct TableRow {
+    using RowCells = std::tuple<Cell<Pack>...>;
+    using CellWidths = std::array<int, sizeof...(Pack)>;
+    using DelimiterArray = std::array<std::string, sizeof...(Pack)+1>;
+
+    TableRow(CellWidths&& widths_, DelimiterArray&& delims_, const Pack&... vals_) 
+    : widths(widths_), delimiters(delims_), topBorder("") {
+        nb::ForEach(_cells, GetTallestCell, _height);
+    }
+
+    static constexpr int num_columns = sizeof...(Pack);
+    
+    int height() const { return height; }
+    inline int height(const unsigned int newh) {
+        nb::ForEach(_cells, ChangeCellHeight, newh);
+        return (_height=newh);
+    }
+    
+    const CellWidths widths;
+    const DelimiterArray delimiters;
+    const std::string topBorder;
+    const std::string bottomBorder;
+
+protected:
+    RowCells _cells;
+    int _height;
+
+};
+
+template <typename... Pack>
+std::ostream& operator<<(std::ostream& stream, const TableRow<Pack...>& row) {
+
+}
+
+template<typename... Pack>
+class Table {
+public:
+    Table(const Pack&... _vals) :  row(std::array<int, sizeof...(Pack)>(10), 
+                std::array<std::string, sizeof...(Pack)>(""), _vals...) {}
+private:
+    TableRow<Pack...> row;
+};
+
+} // namespace nb
+
+#ifdef _NB_TARGET_WINDOWS
+template<typename... Types>
+std::ostream& operator<<(std::ostream& stream, const nb::TableRow<Types...>& row) {
+    using PosType = decltype(stream.tellp());
+    constexpr int num_cells = sizeof...(Types);
+
+    int col_num = 0;
+    int col_start = 0;
+
+    return stream;
+}
+#endif // _NB_TARGET_WINDOWS */
+
+#endif // _NB_ANSI_TERM

engine/NBCore/include/NBCore/TypeTraits.hpp

@@ -2,7 +2,9 @@
 #ifndef _NB_TYPE_TRAITS
 #define _NB_TYPE_TRAITS
 
+#include <tuple>
 #include <type_traits>
+#include <vector>
 
 namespace nb {
 
@@ -29,14 +31,6 @@ namespace detail {
     };
 } // namespace detail
 
-enum TypeCodes {
-    UINT8, UINT16, UINT32, UINT64, INT8, INT16, INT32, INT64,
-    FLOAT16, FLOAT32, DOUBLE64, BOOL, NONE
-};
-
-template<typename T>
-static constexpr TypeCodes GetTypeEnum = NONE;
-
 struct NoneType{};
 
 template<typename T, unsigned int Arg>
@@ -96,6 +90,37 @@ struct RunAndOutput {
     }
 };
 
+template<typename A, typename B>
+using SubtractType = decltype(std::declval<A>() - std::declval<B>());
+
+template<typename A, typename B>
+using MultiplyType = decltype(std::declval<A>() * std::declval<B>());
+
+template<typename A, typename B>
+using AdditionType = decltype(std::declval<A>() + std::declval<B>());
+
+template<typename Func, std::size_t N=0, typename... Pack>
+inline typename std::enable_if<N==sizeof...(Pack), void>::type
+ForEach(std::tuple<Pack...>&, Func) {}
+
+template<typename Func, std::size_t N=0, typename... Pack>
+inline typename std::enable_if<N < sizeof...(Pack), void>::type
+ForEach(std::tuple<Pack...>& tup, Func f) {
+    f(N, std::get<N>(tup));
+    ForEach<N+1, Func, Pack...>(tup, f);
+}
+
+template<std::size_t N=0, typename Func, typename Args, typename... Pack>
+inline typename std::enable_if<N==sizeof...(Pack), void>::type
+ForEach(std::tuple<Pack...>&, Func, const Args&) {}
+
+template<std::size_t N=0, typename Func, typename Args, typename... Pack>
+inline typename std::enable_if<N < sizeof...(Pack), void>::type
+ForEach(std::tuple<Pack...>& tup, Func f, const Args& arg) {
+    f(N, std::get<N>(tup), arg);
+    ForEach<N+1, Func, Args, Pack...>(tup, f, arg);
+}
+
 template<typename T, typename... Pack>
 struct Find;
 
@@ -131,6 +156,48 @@ struct Find<T, U> {
     >::value;
 };
 
+template <typename T, typename Pack1, typename... Pack>
+struct RefPackToPtrVec {
+    RefPackToPtrVec(std::vector<T*> _vec, Pack1& p1, Pack&... packs)
+    : vec(_vec) {
+        static_assert(std::is_base_of<T, Pack1>::value);
+        vec.push_back(&p1);
+        vec = RefPackToPtrVec<T, Pack...>(vec, packs...).vec;
+    }
+
+    RefPackToPtrVec(Pack1& p1, Pack&... packs)
+    : RefPackToPtrVec({}, p1, packs...) {}
+
+    std::vector<T*> vec;
+};
+
+template <typename T, typename Pack>
+struct RefPackToPtrVec<T, Pack> {
+    RefPackToPtrVec(std::vector<T*> _vec, Pack& p1)
+    : vec(_vec) {
+        static_assert(std::is_base_of<T, Pack>::value);
+        vec.push_back(&p1);
+    }
+
+    RefPackToPtrVec(Pack& p1)
+    : RefPackToPtrVec({}, p1) {}
+
+    std::vector<T*> vec;
+};
+
+template <typename T, typename... Pack>
+struct PackIsSameType;
+
+template <typename T, typename PackType>
+struct PackIsSameType<T, PackType> {
+    const bool value = std::is_base_of<T, PackType>::value;
+};
+
+template <typename T, typename FirstPack, typename... Pack>
+struct PackIsSameType<T, FirstPack, Pack...> {
+    const bool value = std::is_base_of<T, FirstPack>::value && PackIsSameType<T, Pack...>::value;
+};
+
 } // namespace nb
 
 #endif // _NB_TYPE_TRAITS

engine/NBCore/include/NBCore/Utils.hpp

@@ -2,6 +2,7 @@
 #ifndef _NB_CORE_TYPES
 #define _NB_CORE_TYPES
 
+#include <exception>
 #include <memory>
 #include <unordered_map>
 #include <vector>

engine/NBCore/src/TypeTraits.cpp

@@ -1,17 +0,0 @@
-#include <NBCore/TypeTraits.hpp>
-
-namespace nb {
-
-template<> constexpr TypeCodes GetTypeEnum<unsigned char> = TypeCodes::UINT8;
-template<> constexpr TypeCodes GetTypeEnum<unsigned short> = TypeCodes::UINT16;
-template<> constexpr TypeCodes GetTypeEnum<unsigned int> = TypeCodes::UINT32;
-template<> constexpr TypeCodes GetTypeEnum<unsigned long int> = TypeCodes::UINT64;
-template<> constexpr TypeCodes GetTypeEnum<char> = TypeCodes::INT8;
-template<> constexpr TypeCodes GetTypeEnum<short> = TypeCodes::INT16;
-template<> constexpr TypeCodes GetTypeEnum<int> = TypeCodes::INT32;
-template<> constexpr TypeCodes GetTypeEnum<long> = TypeCodes::INT64;
-template<> constexpr TypeCodes GetTypeEnum<float> = TypeCodes::FLOAT32;
-template<> constexpr TypeCodes GetTypeEnum<double> = TypeCodes::DOUBLE64;
-template<> constexpr TypeCodes GetTypeEnum<bool> = TypeCodes::BOOL;    
-
-} // namespace nb

engine/NBGraphics/include/NBGraphics/Window.hpp

@@ -6,7 +6,6 @@
 #include <NBGraphics/OGLObjects.hpp>
 
 #include <array>
-#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -31,86 +30,6 @@ class GLFWError : public Error<GLFWError> {
     static const ErrorCodeMap ErrorMessages;
 };
 
-class OGLWindow;
-
-enum WindowCallbacks {
-    KEY, CHAR, CHAR_MODS, MOUSE_BUTTON, CURSOR_POS, CURSOR_ENTER,
-    SCROLL, DROP, WINDOW_POS, WINDOW_SIZE, WINDOW_CLOSE, WINDOW_REFRESH,
-    WINDOW_FOCUS, WINDOW_ICONIFY, WINDOW_MAX, FRAMEBUFFER_SIZE, WINDOW_SCALE,
-};
-
-template<WindowCallbacks>
-struct OGLWindowCallbacks;
-
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::KEY> {
-    using type = typename std::function<void(OGLWindow*, int, int, int, int)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::CHAR> {
-    using type = typename std::function<void(OGLWindow*, unsigned int)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::CHAR_MODS> {
-    using type = typename std::function<void(OGLWindow*, unsigned int, int)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::CURSOR_ENTER> {
-    using type = typename std::function<void(OGLWindow*, int)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::CURSOR_POS> {
-    using type = typename std::function<void(OGLWindow*, double, double)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::MOUSE_BUTTON> {
-    using type = typename std::function<void(OGLWindow*, int, int, int)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::SCROLL> {
-    using type = typename std::function<void(OGLWindow*, double, double)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::DROP> {
-    using type = typename std::function<void(OGLWindow*, int, const char**)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::WINDOW_POS> {
-    using type = typename std::function<void(OGLWindow*, int, int)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::WINDOW_SIZE> {
-    using type = typename std::function<void(OGLWindow*, int, int)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::WINDOW_CLOSE> {
-    using type = typename std::function<void(OGLWindow*)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::WINDOW_REFRESH> {
-    using type = typename std::function<void(OGLWindow*)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::WINDOW_FOCUS> {
-    using type = typename std::function<void(OGLWindow*, int)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::WINDOW_ICONIFY> {
-    using type = typename std::function<void(OGLWindow*, int)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::WINDOW_MAX> {
-    using type = typename std::function<void(OGLWindow*, int)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::FRAMEBUFFER_SIZE> {
-    using type = typename std::function<void(OGLWindow*, int, int)>;
-};
-template<>
-struct OGLWindowCallbacks<WindowCallbacks::WINDOW_SCALE> {
-    using type = typename std::function<void(OGLWindow*, int)>;
-};
-
 class OGLWindow {
     using GLFWHint = std::array<int, 2>;
     private:
@@ -137,14 +56,21 @@ class OGLWindow {
         unsigned int,
         unsigned int,
         const std::string&,
-        const std::vector<std::array<int, 2>>& integerWindowHints,
-        const std::vector<std::tuple<int, std::string>>& stringWindowHints={},
+        const std::vector<std::array<int, 2>>&,
+        const std::vector<std::tuple<int, std::string>>&,
         GLFWwindow* sharingContext = NULL
     );
     GLFWwindow* makeCurrent() const;
     void detachWindow();
 
     public:
+    enum Callbacks {
+        KEY, CHAR, CHAR_MODS, MOUSE_BUTTON, CURSOR_POS, CURSOR_ENTER,
+        SCROLL, DROP, WINDOW_POS, WINDOW_SIZE, WINDOW_CLOSE, WINDOW_REFRESH,
+        WINDOW_FOCUS, WINDOW_ICONIFY, WINDOW_MAX, FRAMEBUFFER_SIZE, WINDOW_SCALE,
+    };
+    template<typename... T>
+    using CallbackFunc = void(*)(OGLWindow*, T...);
 
     static inline bool IsGLFWInitialized() { return _glfwInitialized; }
     static bool InitGLFW(const std::vector<GLFWHint>& hints={});
@@ -169,7 +95,6 @@ class OGLWindow {
         const std::vector<std::array<int, 2>>& integerHints={},
         const std::vector<std::tuple<int, std::string>>& stringHints={}
     );
-
     OGLWindow(OGLWindow&&) = delete;
     OGLWindow(const OGLWindow&) = delete;
     ~OGLWindow();
@@ -181,91 +106,14 @@ class OGLWindow {
     inline std::string getTitle() const { return _title; }
     std::array<int, 2> getSize() const;
     bool shouldClose() const;
-    inline void pollEvents() const { CheckForMainThread(); glfwPollEvents(); }
-    inline void swapBuffers() const { glfwSwapBuffers(_window_ptr); }
+    inline void processEvents() const { CheckForMainThread(); glfwPollEvents(); }
+    inline void refresh() const { glfwSwapBuffers(_window_ptr); }
 
     void setSize(unsigned int x, unsigned int y);
     void setTitle(const std::string&);
     void shouldClose(bool);
-
-    template<WindowCallbacks CallbackType, typename CallbackFunc>
-    void setCallback(CallbackFunc callback) {
-        CheckForMainThread();
-        auto tmp = makeCurrent();
-        static auto this_ptr = this;
-        static typename OGLWindowCallbacks<CallbackType>::type tmp_callback = callback;
-        if constexpr (CallbackType == KEY) {
-            glfwSetKeyCallback(_window_ptr, [](GLFWwindow*, int a, int b, int c, int d){
-                tmp_callback(this_ptr, a,b,c,d);
-            });
-        } else if constexpr (CallbackType == CHAR) {
-                glfwSetCharCallback(_window_ptr, [](GLFWwindow*, int a) {
-                tmp_callback(this_ptr, a);
-            });
-        } else if constexpr (CallbackType == CHAR_MODS) {
-                glfwSetCharModsCallback(_window_ptr, [](GLFWwindow*, unsigned int a, int b) {
-                tmp_callback(this_ptr, a, b);
-            });
-        } else if constexpr (CallbackType == CURSOR_ENTER) {
-                glfwSetCursorEnterCallback(_window_ptr, [](GLFWwindow*, int a) {
-                tmp_callback(this_ptr, a);
-            });
-        } else if constexpr (CallbackType == CURSOR_POS) {
-            glfwSetCursorPosCallback(_window_ptr, [](GLFWwindow*, double a, double b){
-                tmp_callback(this_ptr, a,b);
-            });
-        } else if constexpr (CallbackType == MOUSE_BUTTON) {
-            glfwSetMouseButtonCallback(_window_ptr, [](GLFWwindow*, int a, int b, int c){
-                tmp_callback(this_ptr, a,b,c);
-            });
-        } else if constexpr (CallbackType == SCROLL) {
-                glfwSetScrollCallback(_window_ptr, [](GLFWwindow*, double a, double b) {
-                tmp_callback(this_ptr, a,b);
-            });
-        } else if constexpr (CallbackType == DROP) {
-                glfwSetDropCallback(_window_ptr, [](GLFWwindow*, int a, const char** b) {
-                tmp_callback(this_ptr, a, b);
-            });
-        } else if constexpr (CallbackType == WINDOW_POS) {
-            glfwSetWindowPosCallback(_window_ptr, [](GLFWwindow*, int a, int b){
-                tmp_callback(this_ptr, a,b);
-            });
-        } else if constexpr (CallbackType == WINDOW_SIZE) {
-            glfwSetWindowSizeCallback(_window_ptr, [](GLFWwindow*, int a, int b){
-                tmp_callback(this_ptr, a,b);
-            });
-        } else if constexpr (CallbackType == WINDOW_CLOSE) {
-            glfwSetWindowCloseCallback(_window_ptr, [](GLFWwindow*){
-                tmp_callback(this_ptr);
-            });
-        } else if constexpr (CallbackType == WINDOW_REFRESH) {
-            glfwSetWindowRefreshCallback(_window_ptr, [](GLFWwindow*){
-                tmp_callback(this_ptr);
-            });
-        } else if constexpr (CallbackType == WINDOW_FOCUS) {
-            glfwSetWindowFocusCallback(_window_ptr, [](GLFWwindow*, int a) {
-                tmp_callback(this_ptr, a);
-            });
-        } else if constexpr (CallbackType == WINDOW_ICONIFY) {
-                glfwSetWindowIconifyCallback(_window_ptr, [](GLFWwindow*, int a) {
-                tmp_callback(this_ptr, a);
-            });
-        } else if constexpr (CallbackType == WINDOW_MAX) {
-                glfwSetWindowMaximizeCallback(_window_ptr, [](GLFWwindow*, int a) {
-                tmp_callback(this_ptr, a);
-            });
-        } else if constexpr (CallbackType == FRAMEBUFFER_SIZE) {
-                glfwSetFramebufferSizeCallback(_window_ptr, [](GLFWwindow*, int a, int b) {
-                tmp_callback(this_ptr, a, b);
-            });
-        } else if constexpr (CallbackType == WINDOW_SCALE) {
-                glfwSetWindowContentScaleCallback(_window_ptr, [](GLFWwindow*, int a, int b) {
-                tmp_callback(this_ptr, a, b);
-            });
-        } else {
-            static_assert(false, "No matching callback.");
-        }
-    }
+/*     template<enum Callbacks, typename Func>
+    void setCallBack(Func); */
 };
 
 };

engine/NBGraphics/src/Window.cpp

@@ -60,14 +60,14 @@ void OGLWindow::SetHintString(const std::tuple<int, std::string>& hint) {
 
 GLFWwindow* OGLWindow::MakeCurrent(const std::shared_ptr<OGLWindow>& window) {
     auto tmp = _currWindow;
-    if (window) {
     _currWindow = window->getWindowPtr();
+    if (window) {
+        glfwMakeContextCurrent(_currWindow);
         _currArena = window->_arena;
     } else {
-        _currWindow = nullptr;
+        glfwMakeContextCurrent(nullptr);
         _currArena = nullptr;
     }
-    glfwMakeContextCurrent(_currWindow);
     return tmp;
 }
 
@@ -200,4 +200,14 @@ void OGLWindow::setTitle(const std::string& name) {
     glfwSetWindowTitle(_window_ptr, _title.c_str());
 }
 
+/* template<> void OGLWindow::setCallBack<OGLWindow::KEY>( CallbackFunc<int,int,int,int> func) {
+    CheckForMainThread();
+    auto tmp = makeCurrent();
+    auto tmp_func = 
+        [=](GLFWwindow* window, int a, int b, int c, int d){
+            func(this, a, b, c, d);
+        };
+    glfwSetKeyCallback(_window_ptr, tmp_func);
+} */
+
 };

engine/NBGraphics/tests/TestWindow.cpp

@@ -69,25 +69,13 @@ int main() {
         }}, indxs);
     LOG(prog.log());
 
-    using nb::WindowCallbacks;
-
-    window->setCallback<nb::KEY>(
-        [](nb::OGLWindow* w, int key, int, int, int)->void{
-        if (key == GLFW_KEY_Q) {
-            w->shouldClose(true);
-        }
-    });
-    window->setCallback<nb::CURSOR_POS>(
-        [](nb::OGLWindow* w, double x, double y)->void{
-            nb::logger.msg("Pos in x is " + std::to_string(x));
-        }
-    );
-    while(!window->shouldClose()) {
+    GLFWwindow* window_ptr = window->getWindowPtr();
+    while(!glfwWindowShouldClose(window_ptr)) {
         OPENGL_CALL(glClearColor(0.2f, 0.3f, 0.3f, 1.0f));
         OPENGL_CALL(glClear(GL_COLOR_BUFFER_BIT));
         tri.draw();
-        window->pollEvents();
-        window->swapBuffers();
+        glfwPollEvents();
+        glfwSwapBuffers(window_ptr);
     }    
 
     return 0;