mirror of https://github.com/nothings/stb.git
fixes and tests
This commit is contained in:
Sean Barrett
parent
4b590c0a62
commit
816f31e9bc
|
|
@ -1,4 +1,4 @@
|
|||
/* stbhw-v0.01 - public domain - http://nothings.org/stb/stb_herringbone_wang_tile.h
|
||||
/* stbhw-v0.5 - public domain - http://nothings.org/stb/stb_herringbone_wang_tile.h
|
||||
Herringbone Wang Tile Generator - Sean Barrett 2014
|
||||
|
||||
This file is in the public domain. In case that declaration is ineffective,
|
||||
|
|
@ -442,11 +442,10 @@ static void stbhw__get_template_info(stbhw_config *c, int *w, int *h, int *h_cou
|
|||
size_x = horz_x > vert_x ? horz_x : vert_x;
|
||||
size_y = 2 + horz_y + 2 + vert_y;
|
||||
} else {
|
||||
// @TODO: non-corner-tile
|
||||
int horz_w = c->num_color[0] * c->num_color[1] * c->num_color[2] * c->num_vary_x;
|
||||
int horz_h = c->num_color[3] * c->num_color[4] * c->num_color[2] * c->num_vary_y;
|
||||
|
||||
int vert_w = c->num_color[0] * c->num_color[5] * c->num_color[2] * c->num_vary_y;
|
||||
int vert_w = c->num_color[0] * c->num_color[5] * c->num_color[1] * c->num_vary_y;
|
||||
int vert_h = c->num_color[3] * c->num_color[4] * c->num_color[5] * c->num_vary_x;
|
||||
|
||||
int horz_x = horz_w * (2*c->short_side_len + 3);
|
||||
|
|
@ -485,6 +484,9 @@ static int stbhw__process_template(stbhw__process *p)
|
|||
return 0;
|
||||
}
|
||||
|
||||
for (j=0; j < p->h; ++j)
|
||||
memset(p->data + j*p->stride, 255, 3*p->w);
|
||||
|
||||
if (c->is_corner) {
|
||||
ypos = 2;
|
||||
for (k=0; k < c->num_color[2]; ++k) {
|
||||
|
|
@ -922,6 +924,7 @@ STBHW_EXTERN int stbhw_build_tileset_from_image(stbhw_tileset *ts, unsigned char
|
|||
p.process_v_rect = stbhw__parse_v_rect;
|
||||
p.w = w;
|
||||
p.h = h;
|
||||
p.c = &c;
|
||||
|
||||
// load all the tiles out of the image
|
||||
return stbhw__process_template(&p);
|
||||
|
|
@ -1160,8 +1163,6 @@ static void stbhw__corner_process_v_rect(stbhw__process *p, int xpos, int ypos,
|
|||
stbhw__set_pixel(p->data, p->stride, xpos+len+1, ypos+2*len+1, stbhw__corner_colors[3][f]);
|
||||
}
|
||||
|
||||
#endif // STB_HBWANG_IMPLEMENTATION
|
||||
|
||||
// generates a template image, assuming data is 3*w*h bytes long, RGB format
|
||||
STBHW_EXTERN int stbhw_make_template(stbhw_config *c, unsigned char *data, int w, int h, int stride_in_bytes)
|
||||
{
|
||||
|
|
@ -1208,3 +1209,4 @@ STBHW_EXTERN int stbhw_make_template(stbhw_config *c, unsigned char *data, int w
|
|||
|
||||
return 1;
|
||||
}
|
||||
#endif // STB_HBWANG_IMPLEMENTATION
|
||||
|
|
|
|||
|
|
@ -0,0 +1,82 @@
|
|||
#include <stdio.h>
|
||||
|
||||
#define STB_HBWANG_MAX_X 500
|
||||
#define STB_HBWANG_MAX_Y 500
|
||||
|
||||
#define STB_HERRINGBONE_WANG_TILE_IMPLEMENTATION
|
||||
#include "stb_herringbone_wang_tile.h"
|
||||
|
||||
#define STB_IMAGE_IMPLEMENTATION
|
||||
#include "stb_image.h"
|
||||
|
||||
#define STB_IMAGE_WRITE_IMPLEMENTATION
|
||||
#include "stb_image_write.h"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
if (argc < 5) {
|
||||
fprintf(stderr, "Usage: herringbone_map {inputfile} {output-width} {output-height} {outputfile}\n");
|
||||
return 1;
|
||||
} else {
|
||||
char *filename = argv[1];
|
||||
int out_w = atoi(argv[2]);
|
||||
int out_h = atoi(argv[3]);
|
||||
char *outfile = argv[4];
|
||||
|
||||
unsigned char *pixels, *out_pixels;
|
||||
stbhw_tileset ts;
|
||||
int w,h;
|
||||
|
||||
pixels = stbi_load(filename, &w, &h, 0, 3);
|
||||
if (pixels == 0) {
|
||||
fprintf(stderr, "Could open input file '%s'\n", filename);
|
||||
}
|
||||
|
||||
if (!stbhw_build_tileset_from_image(&ts, pixels, w*3, w, h)) {
|
||||
fprintf(stderr, "Error: %s\n", stbhw_get_last_error());
|
||||
return 1;
|
||||
}
|
||||
|
||||
free(pixels);
|
||||
|
||||
#ifdef DEBUG_OUTPUT
|
||||
{
|
||||
int i,j,k;
|
||||
// add blue borders to top-left edges of the tiles
|
||||
int hstride = (ts.short_side_len*2)*3;
|
||||
int vstride = (ts.short_side_len )*3;
|
||||
for (i=0; i < ts.num_h_tiles; ++i) {
|
||||
unsigned char *pix = ts.h_tiles[i]->pixels;
|
||||
for (j=0; j < ts.short_side_len*2; ++j)
|
||||
for (k=0; k < 3; ++k)
|
||||
pix[j*3+k] = (pix[j*3+k]*0.5+100+k*75)/1.5;
|
||||
for (j=1; j < ts.short_side_len; ++j)
|
||||
for (k=0; k < 3; ++k)
|
||||
pix[j*hstride+k] = (pix[j*hstride+k]*0.5+100+k*75)/1.5;
|
||||
}
|
||||
for (i=0; i < ts.num_v_tiles; ++i) {
|
||||
unsigned char *pix = ts.v_tiles[i]->pixels;
|
||||
for (j=0; j < ts.short_side_len; ++j)
|
||||
for (k=0; k < 3; ++k)
|
||||
pix[j*3+k] = (pix[j*3+k]*0.5+100+k*75)/1.5;
|
||||
for (j=1; j < ts.short_side_len*2; ++j)
|
||||
for (k=0; k < 3; ++k)
|
||||
pix[j*vstride+k] = (pix[j*vstride+k]*0.5+100+k*75)/1.5;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
out_pixels = malloc(out_w * out_h * 3);
|
||||
|
||||
if (!stbhw_generate_image(&ts, NULL, out_pixels, out_w*3, out_w, out_h)) {
|
||||
fprintf(stderr, "Error: %s\n", stbhw_get_last_error());
|
||||
return 1;
|
||||
}
|
||||
|
||||
stbi_write_png(argv[4], out_w, out_h, 3, out_pixels, out_w*3);
|
||||
free(out_pixels);
|
||||
|
||||
stbhw_free_tileset(&ts);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
# Microsoft Developer Studio Project File - Name="herringbone_map" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Console Application" 0x0103
|
||||
|
||||
CFG=herringbone_map - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "herringbone_map.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "herringbone_map.mak" CFG="herringbone_map - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "herringbone_map - Win32 Release" (based on "Win32 (x86) Console Application")
|
||||
!MESSAGE "herringbone_map - Win32 Debug" (based on "Win32 (x86) Console Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "herringbone_map - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
||||
|
||||
!ELSEIF "$(CFG)" == "herringbone_map - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "herringbone_map___Win32_Debug"
|
||||
# PROP BASE Intermediate_Dir "herringbone_map___Win32_Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "herringbone_map - Win32 Release"
|
||||
# Name "herringbone_map - Win32 Debug"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\herringbone_map.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\stb_herringbone_wang_tile.h
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
|
|
@ -27,6 +27,18 @@ Package=<4>
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "herringbone_map"=.\herringbone_map.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "image_test"=.\image_test.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@
|
|||
#define STB_C_LEXER_IMPLEMENTATIOn
|
||||
#define STB_DIVIDE_IMPLEMENTATION
|
||||
#define STB_IMAGE_IMPLEMENTATION
|
||||
#define STB_HERRINGBONE_WANG_TILE_IMEPLEMENTATIOn
|
||||
|
||||
#include "stb_herringbone_wang_tile.h"
|
||||
#include "stb_image.h"
|
||||
#include "stb_image_write.h"
|
||||
#include "stb_perlin.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue