diff --git a/include/twn_texture_modes.h b/include/twn_texture_modes.h deleted file mode 100644 index 505fbad..0000000 --- a/include/twn_texture_modes.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef TWN_TEXTURES_MODES_H -#define TWN_TEXTURES_MODES_H - -/* TODO: rename, as it doesn't have to be about textures only, but blending */ -/* TODO: move from public /include/ tree */ - -/* alpha channel information */ -typedef enum TextureMode { - TEXTURE_MODE_OPAQUE, /* all pixels are solid */ - TEXTURE_MODE_SEETHROUGH, /* some pixels are alpha zero */ - TEXTURE_MODE_GHOSTLY, /* arbitrary alpha values */ - TEXTURE_MODE_COUNT, - TEXTURE_MODE_UNKNOWN = -1, /* a sentinel */ -} TextureMode; - -#endif diff --git a/src/twn_textures_c.h b/src/twn_textures_c.h index 14e95fb..37b58df 100644 --- a/src/twn_textures_c.h +++ b/src/twn_textures_c.h @@ -2,7 +2,6 @@ #define TWN_TEXTURES_C_H #include "twn_types.h" -#include "twn_texture_modes.h" #include "rendering/twn_gpu_texture_c.h" #include @@ -16,6 +15,16 @@ #define TEXTURE_ATLAS_FORMAT SDL_PIXELFORMAT_RGBA32 +/* alpha channel information */ +typedef enum TextureMode { + TEXTURE_MODE_OPAQUE, /* all pixels are solid */ + TEXTURE_MODE_SEETHROUGH, /* some pixels are alpha zero */ + TEXTURE_MODE_GHOSTLY, /* arbitrary alpha values */ + TEXTURE_MODE_COUNT, + TEXTURE_MODE_UNKNOWN = -1, /* a sentinel */ +} TextureMode; + + typedef struct Texture { Rect srcrect; /* position in atlas */ SDL_Surface *data; /* original image data */