forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nanovega/blendish/svg fixes (small)

This commit is contained in:
Ketmar Dark 2018-03-12 23:30:07 +02:00 committed by Adam D. Ruppe
parent 89e9886b97
commit 577489bf96
3 changed files with 51 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
blendish.d
View File

@ -1702,31 +1702,30 @@ public void bndJoinAreaOverlay (NVGContext ctx, float x, float y, float w, float
/// returns the ideal width for a label with given icon and text /// returns the ideal width for a label with given icon and text
public float bndLabelWidth(T=char) (NVGContext ctx, int iconid, const(T)[] label) if (isAnyCharType!T) { public float bndLabelWidth(T=char) (NVGContext ctx, int iconid, const(T)[] label) if (isAnyCharType!T) {
int w = BND_PAD_LEFT+BND_PAD_RIGHT; float w = BND_PAD_LEFT+BND_PAD_RIGHT;
if (iconid >= 0) w += BND_ICON_SHEET_RES; if (iconid >= 0) w += BND_ICON_SHEET_RES;
if (label && bndFont >= 0) { if (label.length && bndFont >= 0) {
ctx.fontFaceId(bndFont); ctx.fontFaceId(bndFont);
ctx.fontSize(BND_LABEL_FONT_SIZE); ctx.fontSize(BND_LABEL_FONT_SIZE);
w += cast(int)ctx.textBounds(1, 1, label, null); w += ctx.textBounds(1, 1, label, null);
} }
//{ import core.stdc.stdio : printf; printf("len=%u; w=%d\n", cast(uint)label.length, cast(int)w); } return cast(float)cast(int)(w+0.5);
return w;
} }
/// returns the height for a label with given icon, text and width; this function is primarily useful in conjunction with multiline labels and textboxes /// returns the height for a label with given icon, text and width; this function is primarily useful in conjunction with multiline labels and textboxes
public float bndLabelHeight(T=char) (NVGContext ctx, int iconid, const(T)[] label, float width) if (isAnyCharType!T) { public float bndLabelHeight(T=char) (NVGContext ctx, int iconid, const(T)[] label, float width) if (isAnyCharType!T) {
int h = BND_WIDGET_HEIGHT; float h = BND_WIDGET_HEIGHT;
width -= BND_TEXT_RADIUS*2; width -= BND_TEXT_RADIUS*2;
if (iconid >= 0) width -= BND_ICON_SHEET_RES; if (iconid >= 0) width -= BND_ICON_SHEET_RES;
if (label && (bndFont >= 0)) { if (label.length && bndFont >= 0) {
ctx.fontFaceId(bndFont); ctx.fontFaceId(bndFont);
ctx.fontSize(BND_LABEL_FONT_SIZE); ctx.fontSize(BND_LABEL_FONT_SIZE);
float[4] bounds = void; float[4] bounds = void;
ctx.textBoxBounds(1, 1, width, label, bounds[]); ctx.textBoxBounds(1, 1, width, label, bounds[]);
int bh = cast(int)(bounds[3]-bounds[1])+BND_TEXT_PAD_DOWN; float bh = (bounds[3]-bounds[1])+BND_TEXT_PAD_DOWN;
if (bh > h) h = bh; if (bh > h) h = bh;
} }
return h; return cast(float)cast(int)(h+0.5);
} }

87
nanovega.d
View File

@ -1559,7 +1559,11 @@ public int height (NVGContext ctx) pure nothrow @trusted @nogc { pragma(inline,
/// valid only inside [beginFrame]/[endFrame] /// valid only inside [beginFrame]/[endFrame]
/// Group: context_management /// Group: context_management
public float devicePixelRatio (NVGContext ctx) pure nothrow @trusted @nogc { pragma(inline, true); return (ctx !is null ? ctx.mDeviceRatio : float.nan); } public float devicePixelRatio (NVGContext ctx) pure nothrow @trusted @nogc { pragma(inline, true); return (ctx !is null ? ctx.devicePxRatio : float.nan); }
/// Returns `true` if [beginFrame] was called, and neither [endFrame], nor [cancelFrame] were.
/// Group: context_management
public bool inFrame (NVGContext ctx) pure nothrow @trusted @nogc { pragma(inline, true); return (ctx !is null && ctx.contextAlive ? ctx.nstates > 0 : false); }
// path autoregistration // path autoregistration
@ -1629,7 +1633,6 @@ private:
// internals // internals
NVGMatrix gpuAffine; NVGMatrix gpuAffine;
int mWidth, mHeight; int mWidth, mHeight;
float mDeviceRatio;
// image manager // image manager
int imageCount; // number of alive images in this context int imageCount; // number of alive images in this context
bool contextAlive; // context can be dead, but still contain some images bool contextAlive; // context can be dead, but still contain some images
@ -1824,7 +1827,7 @@ NVGCompositeOperationState nvg__compositeOperationState (NVGCompositeOperation o
NVGstate* nvg__getState (NVGContext ctx) pure nothrow @trusted @nogc { NVGstate* nvg__getState (NVGContext ctx) pure nothrow @trusted @nogc {
pragma(inline, true); pragma(inline, true);
return &ctx.states.ptr[ctx.nstates-1]; return &ctx.states.ptr[ctx.nstates-(ctx.nstates > 0 ? 1 : 0)];
} }
// Constructor called by the render back-end. // Constructor called by the render back-end.
@ -1854,6 +1857,7 @@ NVGContext createInternal (NVGparams* params) nothrow @trusted @nogc {
ctx.reset(); ctx.reset();
nvg__setDevicePixelRatio(ctx, 1.0f); nvg__setDevicePixelRatio(ctx, 1.0f);
ctx.mWidth = ctx.mHeight = 0;
if (!ctx.params.renderCreate(ctx.params.userPtr)) goto error; if (!ctx.params.renderCreate(ctx.params.userPtr)) goto error;
@ -1965,6 +1969,7 @@ public void beginFrame (NVGContext ctx, int windowWidth, int windowHeight, float
ctx.drawCallCount, ctx.fillTriCount, ctx.strokeTriCount, ctx.textTriCount, ctx.drawCallCount, ctx.fillTriCount, ctx.strokeTriCount, ctx.textTriCount,
ctx.fillTriCount+ctx.strokeTriCount+ctx.textTriCount); ctx.fillTriCount+ctx.strokeTriCount+ctx.textTriCount);
*/ */
if (ctx.nstates > 0) ctx.cancelFrame();
if (windowWidth < 1) windowWidth = 1; if (windowWidth < 1) windowWidth = 1;
if (windowHeight < 1) windowHeight = 1; if (windowHeight < 1) windowHeight = 1;
@ -1981,7 +1986,6 @@ public void beginFrame (NVGContext ctx, int windowWidth, int windowHeight, float
ctx.params.renderViewport(ctx.params.userPtr, windowWidth, windowHeight); ctx.params.renderViewport(ctx.params.userPtr, windowWidth, windowHeight);
ctx.mWidth = windowWidth; ctx.mWidth = windowWidth;
ctx.mHeight = windowHeight; ctx.mHeight = windowHeight;
ctx.mDeviceRatio = devicePixelRatio;
ctx.recset = null; ctx.recset = null;
ctx.recstart = -1; ctx.recstart = -1;
@ -2003,9 +2007,8 @@ public void beginFrame (NVGContext ctx, int windowWidth, int windowHeight, float
/// Group: frame_management /// Group: frame_management
public void cancelFrame (NVGContext ctx) nothrow @trusted @nogc { public void cancelFrame (NVGContext ctx) nothrow @trusted @nogc {
ctx.cancelRecording(); ctx.cancelRecording();
ctx.mWidth = 0; //ctx.mWidth = 0;
ctx.mHeight = 0; //ctx.mHeight = 0;
ctx.mDeviceRatio = 0;
// cancel render queue // cancel render queue
ctx.params.renderCancel(ctx.params.userPtr); ctx.params.renderCancel(ctx.params.userPtr);
// clear saved states (this may free some textures) // clear saved states (this may free some textures)
@ -2018,9 +2021,8 @@ public void cancelFrame (NVGContext ctx) nothrow @trusted @nogc {
public void endFrame (NVGContext ctx) nothrow @trusted @nogc { public void endFrame (NVGContext ctx) nothrow @trusted @nogc {
if (ctx.recset !is null) ctx.recset.takeCurrentPickScene(ctx); if (ctx.recset !is null) ctx.recset.takeCurrentPickScene(ctx);
ctx.stopRecording(); ctx.stopRecording();
ctx.mWidth = 0; //ctx.mWidth = 0;
ctx.mHeight = 0; //ctx.mHeight = 0;
ctx.mDeviceRatio = 0;
// flush render queue // flush render queue
NVGstate* state = nvg__getState(ctx); NVGstate* state = nvg__getState(ctx);
ctx.params.renderFlush(ctx.params.userPtr); ctx.params.renderFlush(ctx.params.userPtr);
@ -8392,15 +8394,13 @@ public float textBounds(T) (NVGContext ctx, float x, float y, const(T)[] str, fl
if (isAnyCharType!T) if (isAnyCharType!T)
{ {
NVGstate* state = nvg__getState(ctx); NVGstate* state = nvg__getState(ctx);
float scale = nvg__getFontScale(state)*ctx.devicePxRatio;
float invscale = 1.0f/scale;
float width;
if (state.fontId == FONS_INVALID) { if (state.fontId == FONS_INVALID) {
bounds[] = 0; bounds[] = 0;
return 0; return 0;
} }
immutable float scale = nvg__getFontScale(state)*ctx.devicePxRatio;
fonsSetSize(ctx.fs, state.fontSize*scale); fonsSetSize(ctx.fs, state.fontSize*scale);
fonsSetSpacing(ctx.fs, state.letterSpacing*scale); fonsSetSpacing(ctx.fs, state.letterSpacing*scale);
fonsSetBlur(ctx.fs, state.fontBlur*scale); fonsSetBlur(ctx.fs, state.fontBlur*scale);
@ -8408,7 +8408,8 @@ if (isAnyCharType!T)
fonsSetFont(ctx.fs, state.fontId); fonsSetFont(ctx.fs, state.fontId);
float[4] b = void; float[4] b = void;
width = fonsTextBounds(ctx.fs, x*scale, y*scale, str, b[]); immutable float width = fonsTextBounds(ctx.fs, x*scale, y*scale, str, b[]);
immutable float invscale = 1.0f/scale;
if (bounds.length) { if (bounds.length) {
// use line bounds for height // use line bounds for height
fonsLineBounds(ctx.fs, y*scale, b.ptr+1, b.ptr+3); fonsLineBounds(ctx.fs, y*scale, b.ptr+1, b.ptr+3);
@ -11180,54 +11181,40 @@ if (isAnyCharType!T)
miny = maxy = y; miny = maxy = y;
startx = x; startx = x;
static if (is(T == char)) { foreach (T ch; str) {
foreach (char ch; str) { static if (T.sizeof == 1) {
//if (fons__decutf8(&utf8state, &codepoint, *cast(const(ubyte)*)str)) continue; //if (fons__decutf8(&utf8state, &codepoint, *cast(const(ubyte)*)str)) continue;
mixin(DecUtfMixin!("utf8state", "codepoint", "(cast(ubyte)ch)")); mixin(DecUtfMixin!("utf8state", "codepoint", "(cast(ubyte)ch)"));
if (utf8state) continue; if (utf8state) continue;
glyph = fons__getGlyph(stash, font, codepoint, isize, iblur, FONS_GLYPH_BITMAP_OPTIONAL); } else {
if (glyph !is null) { static if (T.sizeof == 4) {
fons__getQuad(stash, font, prevGlyphIndex, glyph, isize/10.0f, scale, state.spacing, &x, &y, &q);
if (q.x0 < minx) minx = q.x0;
if (q.x1 > maxx) maxx = q.x1;
if (stash.params.flags&FONS_ZERO_TOPLEFT) {
if (q.y0 < miny) miny = q.y0;
if (q.y1 > maxy) maxy = q.y1;
} else {
if (q.y1 < miny) miny = q.y1;
if (q.y0 > maxy) maxy = q.y0;
}
prevGlyphIndex = glyph.index;
} else {
prevGlyphIndex = -1;
}
}
} else {
foreach (T ch; str) {
static if (is(T == dchar)) {
if (ch > dchar.max) ch = 0xFFFD; if (ch > dchar.max) ch = 0xFFFD;
} }
codepoint = cast(uint)ch; codepoint = cast(uint)ch;
glyph = fons__getGlyph(stash, font, codepoint, isize, iblur, FONS_GLYPH_BITMAP_OPTIONAL); }
if (glyph !is null) { glyph = fons__getGlyph(stash, font, codepoint, isize, iblur, FONS_GLYPH_BITMAP_OPTIONAL);
fons__getQuad(stash, font, prevGlyphIndex, glyph, isize/10.0f, scale, state.spacing, &x, &y, &q); if (glyph !is null) {
if (q.x0 < minx) minx = q.x0; //{ import core.stdc.stdio; printf("0: x=%g; y=%g\n", cast(double)x, cast(double)y); }
if (q.x1 > maxx) maxx = q.x1; fons__getQuad(stash, font, prevGlyphIndex, glyph, isize/10.0f, scale, state.spacing, &x, &y, &q);
if (stash.params.flags&FONS_ZERO_TOPLEFT) { //{ import core.stdc.stdio; printf("1: x=%g; y=%g\n", cast(double)x, cast(double)y); }
if (q.y0 < miny) miny = q.y0; if (q.x0 < minx) minx = q.x0;
if (q.y1 > maxy) maxy = q.y1; if (q.x1 > maxx) maxx = q.x1;
} else { if (stash.params.flags&FONS_ZERO_TOPLEFT) {
if (q.y1 < miny) miny = q.y1; if (q.y0 < miny) miny = q.y0;
if (q.y0 > maxy) maxy = q.y0; if (q.y1 > maxy) maxy = q.y1;
}
prevGlyphIndex = glyph.index;
} else { } else {
prevGlyphIndex = -1; if (q.y1 < miny) miny = q.y1;
if (q.y0 > maxy) maxy = q.y0;
} }
prevGlyphIndex = glyph.index;
} else {
//{ import core.stdc.stdio; printf("NO GLYPH FOR 0x%04x\n", cast(uint)codepoint); }
prevGlyphIndex = -1;
} }
} }
advance = x-startx; advance = x-startx;
//{ import core.stdc.stdio; printf("***: x=%g; startx=%g; advance=%g\n", cast(double)x, cast(double)startx, cast(double)advance); }
// Align horizontally // Align horizontally
if (state.talign.left) { if (state.talign.left) {

6
svg.d
View File

@ -4029,6 +4029,12 @@ void nsvg__flattenCubicBez (NSVGrasterizer r, in float x1, in float y1, in float
immutable x1234 = (x123+x234)*0.5f; immutable x1234 = (x123+x234)*0.5f;
immutable y1234 = (y123+y234)*0.5f; immutable y1234 = (y123+y234)*0.5f;
// "taxicab" / "manhattan" check for flat curves
if (fabsf(x1+x3-x2-x2)+fabsf(y1+y3-y2-y2)+fabsf(x2+x4-x3-x3)+fabsf(y2+y4-y3-y3) < r.tessTol/4) {
nsvg__addPathPoint(r, x1234, y1234, type);
return;
}
nsvg__flattenCubicBez(r, x1, y1, x12, y12, x123, y123, x1234, y1234, level+1, 0); nsvg__flattenCubicBez(r, x1, y1, x12, y12, x123, y123, x1234, y1234, level+1, 0);
nsvg__flattenCubicBez(r, x1234, y1234, x234, y234, x34, y34, x4, y4, level+1, type); nsvg__flattenCubicBez(r, x1234, y1234, x234, y234, x34, y34, x4, y4, level+1, type);
} }