asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nanosvg: Sync with upstream 4c8f013

Browse source
This commit is contained in:
Rémi Verschelde 2022-05-17 16:32:20 +02:00
parent c9dda2e3ca
commit 8e12c755d1
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
thirdparty/README.md vendored
View file

@ -392,13 +392,16 @@ Collection of single-file libraries used in Godot components.
## nanosvg ## nanosvg
- Upstream: https://github.com/memononen/nanosvg - Upstream: https://github.com/memononen/nanosvg
- Version: git (ccdb1995134d340a93fb20e3a3d323ccb3838dd0, 2021) - Version: git (4c8f0139b62c6e7faa3b67ce1fbe6e63590ed148, 2022)
- License: zlib - License: zlib
Files extracted from the upstream source: Files extracted from the upstream source:
- All .h files in `src/` - All `.h` files in `src/`
- LICENSE.txt - `LICENSE.txt`
`nanosvg.cc` is a custom file added to configure the build of the header only
library.
## oidn ## oidn

3
thirdparty/nanosvg/nanosvg.cc vendored
View file

@ -1,6 +1,3 @@
#include "stdio.h"
#include "string.h"
#include "math.h"
#define NANOSVG_ALL_COLOR_KEYWORDS #define NANOSVG_ALL_COLOR_KEYWORDS
#define NANOSVG_IMPLEMENTATION #define NANOSVG_IMPLEMENTATION
#include "nanosvg.h" #include "nanosvg.h"

6
thirdparty/nanosvg/nanosvg.h vendored
View file

@ -187,6 +187,7 @@ void nsvgDelete(NSVGimage* image);
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <math.h> #include <math.h>
#define NSVG_PI (3.14159265358979323846264338327f) #define NSVG_PI (3.14159265358979323846264338327f)
@ -1226,10 +1227,11 @@ static unsigned int nsvg__parseColorHex(const char* str)
static unsigned int nsvg__parseColorRGB(const char* str) static unsigned int nsvg__parseColorRGB(const char* str)
{ {
unsigned int r=0, g=0, b=0; unsigned int r=0, g=0, b=0;
float rf=0, gf=0, bf=0;
if (sscanf(str, "rgb(%u, %u, %u)", &r, &g, &b) == 3) // decimal integers if (sscanf(str, "rgb(%u, %u, %u)", &r, &g, &b) == 3) // decimal integers
return NSVG_RGB(r, g, b); return NSVG_RGB(r, g, b);
if (sscanf(str, "rgb(%u%%, %u%%, %u%%)", &r, &g, &b) == 3) // decimal integer percentage if (sscanf(str, "rgb(%f%%, %f%%, %f%%)", &rf, &gf, &bf) == 3) // decimal integer percentage
return NSVG_RGB(r*255/100, g*255/100, b*255/100); return NSVG_RGB(roundf(rf*2.55f), roundf(gf*2.55f), roundf(bf*2.55f)); // (255 / 100.0f)
return NSVG_RGB(128, 128, 128); return NSVG_RGB(128, 128, 128);
} }

6
thirdparty/nanosvg/nanosvgrast.h vendored
View file

@ -77,6 +77,8 @@ void nsvgDeleteRasterizer(NSVGrasterizer*);
#ifdef NANOSVGRAST_IMPLEMENTATION #ifdef NANOSVGRAST_IMPLEMENTATION
#include <math.h> #include <math.h>
#include <stdlib.h>
#include <string.h>
#define NSVG__SUBSAMPLES 5 #define NSVG__SUBSAMPLES 5
#define NSVG__FIXSHIFT 10 #define NSVG__FIXSHIFT 10
@ -956,7 +958,7 @@ static float nsvg__clampf(float a, float mn, float mx) { return a < mn ? mn : (a
static unsigned int nsvg__RGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a) static unsigned int nsvg__RGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
{ {
return (r) | (g << 8) | (b << 16) | (a << 24); return ((unsigned int)r) | ((unsigned int)g << 8) | ((unsigned int)b << 16) | ((unsigned int)a << 24);
} }
static unsigned int nsvg__lerpRGBA(unsigned int c0, unsigned int c1, float u) static unsigned int nsvg__lerpRGBA(unsigned int c0, unsigned int c1, float u)
@ -1406,6 +1408,7 @@ void nsvgRasterize(NSVGrasterizer* r,
} }
// Rasterize edges // Rasterize edges
if (r->nedges != 0)
qsort(r->edges, r->nedges, sizeof(NSVGedge), nsvg__cmpEdge); qsort(r->edges, r->nedges, sizeof(NSVGedge), nsvg__cmpEdge);
// now, traverse the scanlines and find the intersections on each scanline, use non-zero rule // now, traverse the scanlines and find the intersections on each scanline, use non-zero rule
@ -1432,6 +1435,7 @@ void nsvgRasterize(NSVGrasterizer* r,
} }
// Rasterize edges // Rasterize edges
if (r->nedges != 0)
qsort(r->edges, r->nedges, sizeof(NSVGedge), nsvg__cmpEdge); qsort(r->edges, r->nedges, sizeof(NSVGedge), nsvg__cmpEdge);
// now, traverse the scanlines and find the intersections on each scanline, use non-zero rule // now, traverse the scanlines and find the intersections on each scanline, use non-zero rule