diff --git a/Makefile b/Makefile index 484a5df..93e6b9b 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,8 @@ $(SB_SRC_DIR)Box.o : $(addprefix $(SB_SRC_DIR),extension.hpp Segment.hpp) $(SB_SRC_DIR)Segment.o : $(addprefix $(SB_SRC_DIR),extension.hpp Box.hpp) $(SB_SRC_DIR)Pixels.o : $(addprefix $(SB_SRC_DIR),Box.hpp extension.hpp) $(SB_SRC_DIR)Audio.o : $(addprefix $(SB_SRC_DIR),Node.hpp Display.hpp Configuration.hpp Box.hpp filesystem.hpp extension.hpp) +$(SB_SRC_DIR)Texture.o : $(addprefix $(SB_SRC_DIR),GLObject.cpp filesystem.hpp Game.hpp) +$(SRC_DIR)Item.o : $(addprefix $(SB_SRC_DIR),extension.hpp Node.hpp Texture.hpp) $(SRC_DIR)Pudding.o : $(SRC_H_FILES) $(SB_H_FILES) %.o : %.cpp %.hpp $(CPPC) $(CPP_FLAGS) $< -c -o $@ diff --git a/lib/sb b/lib/sb index 1a4b850..6adac98 160000 --- a/lib/sb +++ b/lib/sb @@ -1 +1 @@ -Subproject commit 1a4b8507e3886e02ab1b6589ed3823d7fafd1654 +Subproject commit 6adac9806faba1483da80895de4d9edb783cdb1f diff --git a/src/Item.hpp b/src/Item.hpp index a8defeb..ba46a6e 100644 --- a/src/Item.hpp +++ b/src/Item.hpp @@ -14,8 +14,8 @@ #include #include #include -#include #include "json/json.hpp" +#include "extension.hpp" #include "Node.hpp" #include "Texture.hpp" diff --git a/src/Pudding.hpp b/src/Pudding.hpp index 22921a7..5e7f078 100644 --- a/src/Pudding.hpp +++ b/src/Pudding.hpp @@ -109,4 +109,61 @@ public: }; +class VAO +{ + +private: + + std::shared_ptr array_id = nullptr; + +public: + + VAO() {}; + void generate(); + void id(GLuint); + GLuint id() const; + void bind() const; + static void destroy(GLuint*); + +}; + +class Buffer +{ + +private: + + std::shared_ptr buffer_id = nullptr; + +public: + + Buffer() {}; + void generate(); + void id(GLuint); + +}; + +class VBO : public Buffer +{ +}; + +class Attributes +{ +}; + +class Model +{ +}; + +class Plane : public Model +{ +}; + +class Billboard : public Plane +{ +}; + +class Button : public Billboard +{ +}; + #endif