Merge branch 'master' into working

This commit is contained in:
Sean Barrett
2015-04-13 11:58:26 -07:00
6 changed files with 323 additions and 171 deletions

View File

@ -7,6 +7,7 @@
#define STB_HERRINGBONE_WANG_TILE_IMEPLEMENTATIOn
#define STB_IMAGE_RESIZE_IMPLEMENTATION
#define STB_RECT_PACK_IMPLEMENTATION
#define STB_VOXEL_RENDER_IMPLEMENTATION
#include "stb_herringbone_wang_tile.h"
#include "stb_image.h"
@ -18,6 +19,9 @@
#include "stb_image_resize.h"
#include "stb_rect_pack.h"
#define STBVOX_CONFIG_MODE 1
#include "stb_voxel_render.h"
#define STBTE_DRAW_RECT(x0,y0,x1,y1,color) 0
#define STBTE_DRAW_TILE(x,y,id,highlight,data) 0
#define STB_TILEMAP_EDITOR_IMPLEMENTATION