diff --git a/src/AssetManager.c b/src/AssetManager.c index 1c00ee8..3e7eae5 100644 --- a/src/AssetManager.c +++ b/src/AssetManager.c @@ -2,8 +2,9 @@ #define STB_IMAGE_IMPLEMENTATION #include -#include -#include +#include "Dengine/Platform.h" +#include "Dengine/AssetManager.h" + GLOBAL_VAR AssetManager assetManager; Texture *asset_getTexture(const enum TexList type) diff --git a/src/Platform.c b/src/Platform.c index a0f17b6..b54de7b 100644 --- a/src/Platform.c +++ b/src/Platform.c @@ -1,4 +1,4 @@ -#include +#include "Dengine/Platform.h" i32 platform_readFileToBuffer(const char *const filePath, PlatformFileReadResult *file) diff --git a/src/Renderer.c b/src/Renderer.c index f87e337..a43f5e9 100644 --- a/src/Renderer.c +++ b/src/Renderer.c @@ -1,5 +1,5 @@ -#include -#include +#include "Dengine/OpenGL.h" +#include "Dengine/Renderer.h" void renderer_entity(Renderer *renderer, Entity *entity, f32 rotate, v3 color) { diff --git a/src/Shader.c b/src/Shader.c index 7c0733a..245f1ed 100644 --- a/src/Shader.c +++ b/src/Shader.c @@ -1,4 +1,4 @@ -#include +#include "Dengine/Shader.h" const i32 shader_loadProgram(Shader *const shader, const GLuint vertexShader, const GLuint fragmentShader) diff --git a/src/Texture.c b/src/Texture.c index ca8e4da..c5e3759 100644 --- a/src/Texture.c +++ b/src/Texture.c @@ -1,4 +1,4 @@ -#include +#include "Dengine\Texture.h" enum BytesPerPixel { diff --git a/src/WorldTraveller.c b/src/WorldTraveller.c index c06b86d..96275e8 100644 --- a/src/WorldTraveller.c +++ b/src/WorldTraveller.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "Dengine/AssetManager.h" +#include "Dengine/Math.h" +#include "WorldTraveller/WorldTraveller.h" //TODO(doyle): This is temporary! Maybe abstract into our platform layer, or //choose to load assets outside of WorldTraveller! diff --git a/src/dengine.c b/src/dengine.c index fdc37c7..72a6866 100644 --- a/src/dengine.c +++ b/src/dengine.c @@ -1,9 +1,9 @@ #if 1 -#include -#include -#include +#include "Dengine/AssetManager.h" +#include "Dengine/Renderer.h" +#include "Dengine/Math.h" -#include +#include "WorldTraveller/WorldTraveller.h" void key_callback(GLFWwindow *window, int key, int scancode, int action, int mode) { diff --git a/src/include/Dengine/AssetManager.h b/src/include/Dengine/AssetManager.h index f4fafce..981c5db 100644 --- a/src/include/Dengine/AssetManager.h +++ b/src/include/Dengine/AssetManager.h @@ -1,8 +1,8 @@ #ifndef DENGINE_ASSET_MANAGER_H #define DENGINE_ASSET_MANAGER_H -#include -#include +#include "Dengine/Shader.h" +#include "Dengine/Texture.h" enum TexList { diff --git a/src/include/Dengine/Entity.h b/src/include/Dengine/Entity.h index ff25bcd..2f2e96b 100644 --- a/src/include/Dengine/Entity.h +++ b/src/include/Dengine/Entity.h @@ -1,8 +1,8 @@ #ifndef DENGINE_ENTITY_H #define DENGINE_ENTITY_H -#include -#include +#include "Dengine/Texture.h" +#include "Dengine/Math.h" enum Direction { diff --git a/src/include/Dengine/Math.h b/src/include/Dengine/Math.h index ea14cd4..1096135 100644 --- a/src/include/Dengine/Math.h +++ b/src/include/Dengine/Math.h @@ -1,9 +1,10 @@ #ifndef DENGINE_MATH_H #define DENGINE_MATH_H -#include #include +#include "Dengine/Common.h" + #define squared(x) (x * x) #define absolute(x) ((x) > 0 ? (x) : -(x)) diff --git a/src/include/Dengine/Platform.h b/src/include/Dengine/Platform.h index bd215c6..198b382 100644 --- a/src/include/Dengine/Platform.h +++ b/src/include/Dengine/Platform.h @@ -1,11 +1,11 @@ #ifndef DENGINE_PLATFORM_H #define DENGINE_PLATFORM_H -#include - #include #include +#include "Dengine/Common.h" + typedef struct { void *buffer; diff --git a/src/include/Dengine/Renderer.h b/src/include/Dengine/Renderer.h index 1db4469..c3adb20 100644 --- a/src/include/Dengine/Renderer.h +++ b/src/include/Dengine/Renderer.h @@ -1,9 +1,9 @@ #ifndef DENGINE_RENDERER_H #define DENGINE_RENDERER_H -#include -#include -#include +#include "Dengine/Math.h" +#include "Dengine/Entity.h" +#include "Dengine/Shader.h" typedef struct Renderer { diff --git a/src/include/Dengine/Shader.h b/src/include/Dengine/Shader.h index a4cffc7..0b9d282 100644 --- a/src/include/Dengine/Shader.h +++ b/src/include/Dengine/Shader.h @@ -1,8 +1,8 @@ #ifndef DENGINE_SHADER_H #define DENGINE_SHADER_H -#include -#include +#include "Dengine/OpenGL.h" +#include "Dengine/Math.h" typedef struct Shader { diff --git a/src/include/Dengine/Texture.h b/src/include/Dengine/Texture.h index baaa07e..225faee 100644 --- a/src/include/Dengine/Texture.h +++ b/src/include/Dengine/Texture.h @@ -1,8 +1,8 @@ #ifndef DENGINE_TEXTURE_H #define DENGINE_TEXTURE_H -#include -#include +#include "Dengine/Common.h" +#include "Dengine/OpenGL.h" typedef struct Texture {