Chiebot-Mirror
/
opencv_contrib
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

proper NVGpaint conversion

Browse Source
pull/3471/head
kallaballa 2 years ago
parent 7164d256d1
commit 2d9f526fda
2 changed files with 107 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 83
      src/common/nvg.cpp
  2. 46
      src/common/nvg.hpp

83
src/common/nvg.cpp
Unescape View File

@ -131,15 +131,7 @@ void NVG::strokeColor(const cv::Scalar& bgra) {
} }
void NVG::strokePaint(Paint paint) { void NVG::strokePaint(Paint paint) {
NVGpaint np; NVGpaint np = paint.toNVGpaint();
memcpy(paint.xform, np.xform, 6);
memcpy(paint.extent, np.extent, 2);
np.radius = paint.radius;
np.feather = paint.feather;
np.innerColor = nvgRGBA(paint.innerColor[2],paint.innerColor[1],paint.innerColor[0],paint.innerColor[3]);
np.outerColor = nvgRGBA(paint.outerColor[2],paint.outerColor[1],paint.outerColor[0],paint.outerColor[3]);;
np.image = paint.image;
nvgStrokePaint(getContext(), np); nvgStrokePaint(getContext(), np);
} }
@ -148,15 +140,7 @@ void NVG::fillColor(const cv::Scalar& bgra) {
} }
void NVG::fillPaint(Paint paint) { void NVG::fillPaint(Paint paint) {
NVGpaint np; NVGpaint np = paint.toNVGpaint();
memcpy(paint.xform, np.xform, 6);
memcpy(paint.extent, np.extent, 2);
np.radius = paint.radius;
np.feather = paint.feather;
np.innerColor = nvgRGBA(paint.innerColor[2],paint.innerColor[1],paint.innerColor[0],paint.innerColor[3]);
np.outerColor = nvgRGBA(paint.outerColor[2],paint.outerColor[1],paint.outerColor[0],paint.outerColor[3]);;
np.image = paint.image;
nvgFillPaint(getContext(), np); nvgFillPaint(getContext(), np);
} }
@ -323,7 +307,41 @@ void NVG::fill() {
void NVG::stroke() { void NVG::stroke() {
nvgStroke(getContext()); nvgStroke(getContext());
} }
} //namespace detail
Paint NVG::linearGradient(float sx, float sy, float ex, float ey, const cv::Scalar& icol, const cv::Scalar& ocol) {
NVGpaint np = nvgLinearGradient(getContext(), sx, sy, ex, ey, nvgRGBA(icol[2],icol[1],icol[0],icol[3]), nvgRGBA(ocol[2],ocol[1],ocol[0],ocol[3]));
Paint p(np);
cerr << "paint " << p.innerColor << ":" << p.outerColor << endl;
return p;
}
Paint NVG::boxGradient(float x, float y, float w, float h, float r, float f, const cv::Scalar& icol, const cv::Scalar& ocol) {
NVGpaint np = nvgBoxGradient(getContext(), x, y, w, h, r, f, nvgRGBA(icol[2],icol[1],icol[0],icol[3]), nvgRGBA(ocol[2],ocol[1],ocol[0],ocol[3]));
return Paint(np);
}
Paint NVG::radialGradient(float cx, float cy, float inr, float outr, const cv::Scalar& icol, const cv::Scalar& ocol) {
NVGpaint np = nvgRadialGradient(getContext(), cx, cy, inr, outr, nvgRGBA(icol[2],icol[1],icol[0],icol[3]), nvgRGBA(ocol[2],ocol[1],ocol[0],ocol[3]));
return Paint(np);
}
Paint NVG::imagePattern(float ox, float oy, float ex, float ey, float angle, int image, float alpha) {
NVGpaint np = nvgImagePattern(getContext(), ox, oy, ex, ey, angle, image, alpha);
return Paint(np);
}
void NVG::scissor(float x, float y, float w, float h) {
nvgScissor(getContext(), x, y, w, h);
}
void NVG::intersectScissor(float x, float y, float w, float h) {
nvgIntersectScissor(getContext(), x, y, w, h);
}
void NVG::resetScissor() {
nvgResetScissor(getContext());
}
}
int createFont(const char* name, const char* filename) { int createFont(const char* name, const char* filename) {
return detail::get_current_context()->createFont(name,filename); return detail::get_current_context()->createFont(name,filename);
@ -595,5 +613,32 @@ void stroke() {
detail::get_current_context()->stroke(); detail::get_current_context()->stroke();
} }
Paint linearGradient(float sx, float sy, float ex, float ey, const cv::Scalar& icol, const cv::Scalar& ocol) {
return detail::get_current_context()->linearGradient(sx, sy, ex, ey, icol, ocol);
}
Paint boxGradient(float x, float y, float w, float h, float r, float f, const cv::Scalar& icol, const cv::Scalar& ocol) {
return detail::get_current_context()->boxGradient(x, y, w, h, r, f, icol, ocol);
}
Paint radialGradient(float cx, float cy, float inr, float outr, const cv::Scalar& icol, const cv::Scalar& ocol) {
return detail::get_current_context()->radialGradient(cx, cy, inr, outr, icol, ocol);
}
Paint imagePattern(float ox, float oy, float ex, float ey, float angle, int image, float alpha) {
return detail::get_current_context()->imagePattern(ox, oy, ex, ey, angle, image, alpha);
}
void scissor(float x, float y, float w, float h) {
detail::get_current_context()->scissor(x, y, w, h);
}
void intersectScissor(float x, float y, float w, float h) {
detail::get_current_context()->intersectScissor(x, y, w, h);
}
void resetScissor() {
detail::get_current_context()->resetScissor();
}
} //namespace nvg } //namespace nvg
} //namespace kb } //namespace kb

46
src/common/nvg.hpp
Unescape View File

@ -23,13 +23,37 @@ struct GlyphPosition {
}; };
struct Paint { struct Paint {
Paint() {
}
Paint(const NVGpaint& np) {
memcpy(this->xform, np.xform, sizeof(this->xform));
memcpy(this->extent, np.extent, sizeof(this->extent));
this->radius = np.radius;
this->feather = np.feather;
this->innerColor = cv::Scalar(np.innerColor.rgba[2] * 255, np.innerColor.rgba[1] * 255, np.innerColor.rgba[0] * 255, np.innerColor.rgba[3] * 255);
this->outerColor = cv::Scalar(np.outerColor.rgba[2] * 255, np.outerColor.rgba[1] * 255, np.outerColor.rgba[0] * 255, np.outerColor.rgba[3] * 255);
this->image = np.image;
}
NVGpaint toNVGpaint() {
NVGpaint np;
memcpy(np.xform, this->xform, sizeof(this->xform));
memcpy(np.extent, this->extent, sizeof(this->extent));
np.radius = this->radius;
np.feather = this->feather;
np.innerColor = nvgRGBA(this->innerColor[2], this->innerColor[1], this->innerColor[0], this->innerColor[3]);
np.outerColor = nvgRGBA(this->outerColor[2], this->outerColor[1], this->outerColor[0], this->outerColor[3]);
np.image = this->image;
return np;
}
float xform[6]; float xform[6];
float extent[2]; float extent[2];
float radius; float radius = 0;
float feather; float feather = 0;
cv::Scalar innerColor; cv::Scalar innerColor;
cv::Scalar outerColor; cv::Scalar outerColor;
int image; int image = 0;
}; };
namespace detail { namespace detail {
@ -119,6 +143,14 @@ void ellipse(float cx, float cy, float rx, float ry);
void circle(float cx, float cy, float r); void circle(float cx, float cy, float r);
void fill(); void fill();
void stroke(); void stroke();
Paint linearGradient(float sx, float sy, float ex, float ey, const cv::Scalar& icol, const cv::Scalar& ocol);
Paint boxGradient(float x, float y, float w, float h, float r, float f, const cv::Scalar& icol, const cv::Scalar& ocol);
Paint radialGradient(float cx, float cy, float inr, float outr, const cv::Scalar& icol, const cv::Scalar& ocol);
Paint imagePattern(float ox, float oy, float ex, float ey, float angle, int image, float alpha);
void scissor(float x, float y, float w, float h);
void intersectScissor(float x, float y, float w, float h);
void resetScissor();
}; };
static NVG* nvg_instance; static NVG* nvg_instance;
@ -200,6 +232,14 @@ void ellipse(float cx, float cy, float rx, float ry);
void circle(float cx, float cy, float r); void circle(float cx, float cy, float r);
void fill(); void fill();
void stroke(); void stroke();
Paint linearGradient(float sx, float sy, float ex, float ey, const cv::Scalar& icol, const cv::Scalar& ocol);
Paint boxGradient(float x, float y, float w, float h, float r, float f, const cv::Scalar& icol, const cv::Scalar& ocol);
Paint radialGradient(float cx, float cy, float inr, float outr, const cv::Scalar& icol, const cv::Scalar& ocol);
Paint imagePattern(float ox, float oy, float ex, float ey, float angle, int image, float alpha);
void scissor(float x, float y, float w, float h);
void intersectScissor(float x, float y, float w, float h);
void resetScissor();
} // namespace nvg } // namespace nvg
} // namespace kb } // namespace kb

Write Preview
Loading…
Cancel
Save