yyc12345/stb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'work2' into working

Browse Source
This commit is contained in:
Sean Barrett 2020-02-02 08:26:07 -08:00
commit e80419cd29
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stb_easy_font.h
View File

@ -78,7 +78,8 @@
// //
// CONTRIBUTORS // CONTRIBUTORS
// //
// github:vassvik -- bug report // github:vassvik -- bug report
// github:podsvirov -- fix multiple definition errors
#if 0 #if 0
// SAMPLE CODE: // SAMPLE CODE:
@ -107,7 +108,7 @@ void print_string(float x, float y, char *text, float r, float g, float b)
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
struct stb_easy_font_info_struct { static struct stb_easy_font_info_struct {
unsigned char advance; unsigned char advance;
unsigned char h_seg; unsigned char h_seg;
unsigned char v_seg; unsigned char v_seg;
@ -138,7 +139,7 @@ struct stb_easy_font_info_struct {
{ 3,203,252 }, { 5,203,253 }, { 22,210,253 }, { 0,214,253 }, { 3,203,252 }, { 5,203,253 }, { 22,210,253 }, { 0,214,253 },
}; };
unsigned char stb_easy_font_hseg[214] = { static unsigned char stb_easy_font_hseg[214] = {
97,37,69,84,28,51,2,18,10,49,98,41,65,25,81,105,33,9,97,1,97,37,37,36, 97,37,69,84,28,51,2,18,10,49,98,41,65,25,81,105,33,9,97,1,97,37,37,36,
81,10,98,107,3,100,3,99,58,51,4,99,58,8,73,81,10,50,98,8,73,81,4,10,50, 81,10,98,107,3,100,3,99,58,51,4,99,58,8,73,81,10,50,98,8,73,81,4,10,50,
98,8,25,33,65,81,10,50,17,65,97,25,33,25,49,9,65,20,68,1,65,25,49,41, 98,8,25,33,65,81,10,50,17,65,97,25,33,25,49,9,65,20,68,1,65,25,49,41,
@ -150,7 +151,7 @@ unsigned char stb_easy_font_hseg[214] = {
84,73,57,41,49,25,33,65,81,9,97,1,97,25,33,65,81,57,33,25,41,25, 84,73,57,41,49,25,33,65,81,9,97,1,97,25,33,65,81,57,33,25,41,25,
}; };
unsigned char stb_easy_font_vseg[253] = { static unsigned char stb_easy_font_vseg[253] = {
4,2,8,10,15,8,15,33,8,15,8,73,82,73,57,41,82,10,82,18,66,10,21,29,1,65, 4,2,8,10,15,8,15,33,8,15,8,73,82,73,57,41,82,10,82,18,66,10,21,29,1,65,
27,8,27,9,65,8,10,50,97,74,66,42,10,21,57,41,29,25,14,81,73,57,26,8,8, 27,8,27,9,65,8,10,50,97,74,66,42,10,21,57,41,29,25,14,81,73,57,26,8,8,
26,66,3,8,8,15,19,21,90,58,26,18,66,18,105,89,28,74,17,8,73,57,26,21, 26,66,3,8,8,15,19,21,90,58,26,18,66,18,105,89,28,74,17,8,73,57,26,21,
@ -188,7 +189,7 @@ static int stb_easy_font_draw_segs(float x, float y, unsigned char *segs, int nu
return offset; return offset;
} }
float stb_easy_font_spacing_val = 0; static float stb_easy_font_spacing_val = 0;
static void stb_easy_font_spacing(float spacing) static void stb_easy_font_spacing(float spacing)
{ {
stb_easy_font_spacing_val = spacing; stb_easy_font_spacing_val = spacing;

3
stb_image.h
View File

@ -106,6 +106,7 @@ RECENT REVISION HISTORY:
Julian Raschke Gregory Mullen Baldur Karlsson github:poppolopoppo Julian Raschke Gregory Mullen Baldur Karlsson github:poppolopoppo
Christian Floisand Kevin Schmidt JR Smith github:darealshinji Christian Floisand Kevin Schmidt JR Smith github:darealshinji
Blazej Dariusz Roszkowski github:Michaelangel007 Blazej Dariusz Roszkowski github:Michaelangel007
Matvey Cherevko
*/ */
#ifndef STBI_INCLUDE_STB_IMAGE_H #ifndef STBI_INCLUDE_STB_IMAGE_H
@ -1056,6 +1057,8 @@ static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int re
#endif #endif
#ifndef STBI_NO_PSD #ifndef STBI_NO_PSD
if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc); if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc);
#else
STBI_NOTUSED(bpc);
#endif #endif
#ifndef STBI_NO_PIC #ifndef STBI_NO_PIC
if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp, ri); if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp, ri);

1
stb_perlin.h
View File

@ -78,6 +78,7 @@
extern "C" { extern "C" {
#endif #endif
extern float stb_perlin_noise3(float x, float y, float z, int x_wrap, int y_wrap, int z_wrap); extern float stb_perlin_noise3(float x, float y, float z, int x_wrap, int y_wrap, int z_wrap);
extern float stb_perlin_noise3_seed(float x, float y, float z, int x_wrap, int y_wrap, int z_wrap, int seed);
extern float stb_perlin_ridge_noise3(float x, float y, float z, float lacunarity, float gain, float offset, int octaves); extern float stb_perlin_ridge_noise3(float x, float y, float z, float lacunarity, float gain, float offset, int octaves);
extern float stb_perlin_fbm_noise3(float x, float y, float z, float lacunarity, float gain, int octaves); extern float stb_perlin_fbm_noise3(float x, float y, float z, float lacunarity, float gain, int octaves);
extern float stb_perlin_turbulence_noise3(float x, float y, float z, float lacunarity, float gain, int octaves); extern float stb_perlin_turbulence_noise3(float x, float y, float z, float lacunarity, float gain, int octaves);