From aefc9a6104341c1c9d8f033f37ce649312d2e269 Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Thu, 19 Jun 2014 17:40:53 -0700 Subject: [PATCH] use -1 as the 'no scissor' value, rather than 0, so that 0 width still scissors --- src/nanovg.c | 4 ++-- src/nanovg_gl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nanovg.c b/src/nanovg.c index 939d801..b07e560 100644 --- a/src/nanovg.c +++ b/src/nanovg.c @@ -828,8 +828,8 @@ void nvgResetScissor(struct NVGcontext* ctx) { struct NVGstate* state = nvg__getState(ctx); memset(state->scissor.xform, 0, sizeof(state->scissor.xform)); - state->scissor.extent[0] = 0; - state->scissor.extent[1] = 0; + state->scissor.extent[0] = -1.f; + state->scissor.extent[1] = -1.f; } static int nvg__ptEquals(float x1, float y1, float x2, float y2, float tol) diff --git a/src/nanovg_gl.h b/src/nanovg_gl.h index 6b03595..2c13228 100644 --- a/src/nanovg_gl.h +++ b/src/nanovg_gl.h @@ -750,7 +750,7 @@ static int glnvg__convertPaint(struct GLNVGcontext* gl, struct GLNVGfragUniforms frag->innerCol = glnvg__premulColor(paint->innerColor); frag->outerCol = glnvg__premulColor(paint->outerColor); - if (scissor->extent[0] < 0.5f || scissor->extent[1] < 0.5f) { + if (scissor->extent[0] < -0.5f || scissor->extent[1] < -0.5f) { memset(frag->scissorMat, 0, sizeof(frag->scissorMat)); frag->scissorExt[0] = 1.0f; frag->scissorExt[1] = 1.0f;