Skip to content

Commit

Permalink
changed to single-header structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@DM8AT
DM8AT committed Aug 23, 2024
1 parent 3cfd6f0 commit d792d49
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 55 deletions.
26 changes: 13 additions & 13 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ OBJ_DIR := $(BIN)
OBJGL_FLAGS :=

OBJGL_OBJ := $(OBJ_DIR)/OGL_Instance.o $(OBJ_DIR)/OGL_Window.o $(OBJ_DIR)/OGL_BaseState.o $(OBJ_DIR)/OGL_BindableBase.o $(OBJ_DIR)/OGL_BaseFunctions.o $(OBJ_DIR)/OGL_Shader.o $(OBJ_DIR)/OGL_VertexAttributes.o $(OBJ_DIR)/OGL_UniformBuffer.o $(OBJ_DIR)/OGL_ShaderStorageBuffer.o $(OBJ_DIR)/OGL_IndexBuffer.o $(OBJ_DIR)/OGL_Texture.o $(OBJ_DIR)/OGL_Framebuffer.o
OBJGL_FIL := $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_Instance.cpp $(OBGL_DIR)/OGL_Window.cpp $(OBGL_DIR)/OGL_BaseState.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/OGL_BaseFunctions.cpp $(OBGL_DIR)/OGL_Shader.cpp $(OBGL_DIR)/OGL_VertexAttributes.cpp $(OBGL_DIR)/OGL_UniformBuffer.cpp $(OBGL_DIR)/OGL_ShaderStorageBuffer.cpp $(OBGL_DIR)/OGL_IndexBuffer.cpp $(OBGL_DIR)/OGL_Texture.cpp $(OBGL_DIR)/OGL_Framebuffer.cpp
OBJGL_FIL := $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_Instance.cpp $(OBGL_DIR)/OGL_Window.cpp $(OBGL_DIR)/OGL_BaseState.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/OGL_BaseFunctions.cpp $(OBGL_DIR)/OGL_Shader.cpp $(OBGL_DIR)/OGL_VertexAttributes.cpp $(OBGL_DIR)/OGL_UniformBuffer.cpp $(OBGL_DIR)/OGL_ShaderStorageBuffer.cpp $(OBGL_DIR)/OGL_IndexBuffer.cpp $(OBGL_DIR)/OGL_Texture.cpp $(OBGL_DIR)/OGL_Framebuffer.cpp

all: $(BIN)/$(EXECUTABLE)

Expand All @@ -28,40 +28,40 @@ libObjectGL: $(OBJGL_OBJ)
$(BIN)/libObjectGL: $(OBJGL_OBJ)
-ar rcs $(BIN)/libObjectGL $(OBJGL_OBJ)

$(OBJ_DIR)/OGL_Instance.o: $(OBGL_DIR)/OGL_Instance.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_BaseState.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/OGL_Window.cpp
$(OBJ_DIR)/OGL_Instance.o: $(OBGL_DIR)/OGL_Instance.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_BaseState.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/OGL_Window.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

$(OBJ_DIR)/OGL_Window.o: $(OBGL_DIR)/OGL_Window.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_BaseState.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/OGL_Instance.cpp
$(OBJ_DIR)/OGL_Window.o: $(OBGL_DIR)/OGL_Window.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_BaseState.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/OGL_Instance.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

$(OBJ_DIR)/OGL_BaseFunctions.o: $(OBGL_DIR)/OGL_BaseFunctions.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_BaseState.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/OGL_Window.cpp $(OBGL_DIR)/OGL_Instance.cpp
$(OBJ_DIR)/OGL_BaseFunctions.o: $(OBGL_DIR)/OGL_BaseFunctions.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_BaseState.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/OGL_Window.cpp $(OBGL_DIR)/OGL_Instance.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

$(OBJ_DIR)/OGL_BindableBase.o: $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(OBJ_DIR)/OGL_BindableBase.o: $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

$(OBJ_DIR)/OGL_BaseState.o: $(OBGL_DIR)/OGL_BaseState.cpp $(OBGL_DIR)/ObjectGLGlobalState.hpp
$(OBJ_DIR)/OGL_BaseState.o: $(OBGL_DIR)/OGL_BaseState.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

$(OBJ_DIR)/OGL_Shader.o: $(OBGL_DIR)/OGL_Shader.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(OBJ_DIR)/OGL_Shader.o: $(OBGL_DIR)/OGL_Shader.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

$(OBJ_DIR)/OGL_VertexAttributes.o: $(OBGL_DIR)/OGL_VertexAttributes.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(OBJ_DIR)/OGL_VertexAttributes.o: $(OBGL_DIR)/OGL_VertexAttributes.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

$(OBJ_DIR)/OGL_UniformBuffer.o: $(OBGL_DIR)/OGL_UniformBuffer.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(OBJ_DIR)/OGL_UniformBuffer.o: $(OBGL_DIR)/OGL_UniformBuffer.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

$(OBJ_DIR)/OGL_ShaderStorageBuffer.o: $(OBGL_DIR)/OGL_ShaderStorageBuffer.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(OBJ_DIR)/OGL_ShaderStorageBuffer.o: $(OBGL_DIR)/OGL_ShaderStorageBuffer.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

$(OBJ_DIR)/OGL_IndexBuffer.o: $(OBGL_DIR)/OGL_IndexBuffer.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(OBJ_DIR)/OGL_IndexBuffer.o: $(OBGL_DIR)/OGL_IndexBuffer.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

$(OBJ_DIR)/OGL_Texture.o: $(OBGL_DIR)/OGL_Texture.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(OBJ_DIR)/OGL_Texture.o: $(OBGL_DIR)/OGL_Texture.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

$(OBJ_DIR)/OGL_Framebuffer.o: $(OBGL_DIR)/OGL_Framebuffer.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/ObjectGLGlobalState.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(OBJ_DIR)/OGL_Framebuffer.o: $(OBGL_DIR)/OGL_Framebuffer.cpp $(OBGL_DIR)/OGL_BindableBase.cpp $(OBGL_DIR)/ObjectGL.hpp $(OBGL_DIR)/OGL_BaseState.cpp
$(CXX) -c $< -o $@ $(CXX_FLAGS) $(OBJGL_FLAGS)

run: clean all
Expand Down
4 changes: 3 additions & 1 deletion src/ObjectGL/OGL_BaseState.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
*
*/

//ask for access to the background library
#define OGL_KEEP_BG_ACCESS
//include the global state
#include "ObjectGLGlobalState.hpp"
#include "ObjectGL.hpp"

//say that an instance class will exist
class OGL_Instance;
Expand Down
26 changes: 24 additions & 2 deletions src/ObjectGL/ObjectGL.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,30 @@

//check if the file this is included into should get access to the background dependencys
#ifdef OGL_KEEP_BG_ACCESS
//include the global state
#include "ObjectGLGlobalState.hpp"

//stdlib
#include <cstdint>
#include <memory>
#include <vector>

//say that an instance class will exist
class OGL_Instance;
//say that a window class will exist
class OGL_Window;

/**
* @brief store a pointer to the current instance
*/
extern OGL_Instance* oglCurrentInstance;
/**
* @brief store a pointer to the current window
*/
extern OGL_Window* oglCurrentWindow;
/**
* @brief store a vector of pointers to the instances
*/
extern std::vector<OGL_Instance*> oglAllInstances;

#endif

/**
Expand Down
39 changes: 0 additions & 39 deletions src/ObjectGL/ObjectGLGlobalState.hpp
View file

This file was deleted.

0 comments on commit d792d49

Please sign in to comment.