Added "unknown" atlas format and filter enum value.

closes #515
This commit is contained in:
NathanSweet 2016-04-04 22:31:28 +02:00
parent 0ff00c956b
commit 05f544c14d
2 changed files with 6 additions and 2 deletions

View File

@ -39,6 +39,7 @@ extern "C" {
typedef struct spAtlas spAtlas; typedef struct spAtlas spAtlas;
typedef enum { typedef enum {
SP_ATLAS_UNKNOWN_FORMAT,
SP_ATLAS_ALPHA, SP_ATLAS_ALPHA,
SP_ATLAS_INTENSITY, SP_ATLAS_INTENSITY,
SP_ATLAS_LUMINANCE_ALPHA, SP_ATLAS_LUMINANCE_ALPHA,
@ -49,6 +50,7 @@ typedef enum {
} spAtlasFormat; } spAtlasFormat;
typedef enum { typedef enum {
SP_ATLAS_UNKNOWN_FILTER,
SP_ATLAS_NEAREST, SP_ATLAS_NEAREST,
SP_ATLAS_LINEAR, SP_ATLAS_LINEAR,
SP_ATLAS_MIPMAP, SP_ATLAS_MIPMAP,
@ -59,7 +61,9 @@ typedef enum {
} spAtlasFilter; } spAtlasFilter;
typedef enum { typedef enum {
SP_ATLAS_MIRROREDREPEAT, SP_ATLAS_CLAMPTOEDGE, SP_ATLAS_REPEAT SP_ATLAS_MIRROREDREPEAT,
SP_ATLAS_CLAMPTOEDGE,
SP_ATLAS_REPEAT
} spAtlasWrap; } spAtlasWrap;
typedef struct spAtlasPage spAtlasPage; typedef struct spAtlasPage spAtlasPage;

View File

@ -145,7 +145,7 @@ static int indexOf (const char** array, int count, Str* str) {
int i; int i;
for (i = count - 1; i >= 0; i--) for (i = count - 1; i >= 0; i--)
if (strncmp(array[i], str->begin, length) == 0) return i; if (strncmp(array[i], str->begin, length) == 0) return i;
return -1; return 0;
} }
static int equals (Str* str, const char* other) { static int equals (Str* str, const char* other) {