diff options
| -rw-r--r-- | include/worldgen.h | 2 | ||||
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | state_mainstate/include/states/mainstate.h | 12 | ||||
| -rw-r--r-- | state_mainstate/src/mainstate.c | 10 |
4 files changed, 12 insertions, 16 deletions
diff --git a/include/worldgen.h b/include/worldgen.h index 5e3601e..4cac9bf 100644 --- a/include/worldgen.h +++ b/include/worldgen.h @@ -4,7 +4,7 @@ extern "C" { #endif -#include <engine/core/types.h> +#include <daw/types.h> // first 4 bits for material type #define BLOCK_none 0 @@ -1,5 +1,5 @@ -#include <engine/engine.h> -#include <engine/core/logging.h> +#include <daw/daw.h> +#include <daw/logging.h> #define MEMORY_SIZE 65536 diff --git a/state_mainstate/include/states/mainstate.h b/state_mainstate/include/states/mainstate.h index f29c7b9..dc1cb7c 100644 --- a/state_mainstate/include/states/mainstate.h +++ b/state_mainstate/include/states/mainstate.h @@ -2,14 +2,10 @@ #define STATE_TITLESCREEN_H #include <stdbool.h> -#include <engine/core/types.h> -#include <engine/rendering/rendering.h> -#include <engine/resources.h> -#include <engine/ctrl/input.h> -//#include <engine/state.h> -//#include <engine/engine.h> -//#include <engine/ui.h> -//#include <engine/input.h> +#include <daw/types.h> +#include <daw/rendering.h> +#include <daw/resources.h> +#include <daw/input.h> #include <cglm/cglm.h> diff --git a/state_mainstate/src/mainstate.c b/state_mainstate/src/mainstate.c index 276f0e1..2b12d9c 100644 --- a/state_mainstate/src/mainstate.c +++ b/state_mainstate/src/mainstate.c @@ -1,9 +1,9 @@ -#include <engine/engine.h> -#include <engine/utils.h> -#include <engine/core/logging.h> -#include <engine/rendering/rendering.h> +#include <daw/daw.h> +#include <daw/utils.h> +#include <daw/logging.h> +#include <daw/rendering.h> #include <states/mainstate.h> -#include <engine/core/state.h> +#include <daw/state.h> #include <worldgen.h> #define FOV_ORTHO 1 |