mirror of
https://github.com/thorvg/thorvg.git
synced 2025-06-08 13:43:43 +00:00
common: code refactoring.
Merge shape internal bodies to one (ShapePath => ShapeImpl), for keeping less files.
This commit is contained in:
Hermet Park
parent
6365d02a96
commit
56db18fbf1
3 changed files with 133 additions and 165 deletions
|
|
@ -20,7 +20,6 @@ source_file = [
|
||||||
'tvgPictureImpl.h',
|
'tvgPictureImpl.h',
|
||||||
'tvgRender.h',
|
'tvgRender.h',
|
||||||
'tvgSceneImpl.h',
|
'tvgSceneImpl.h',
|
||||||
'tvgShapePath.h',
|
|
||||||
'tvgShapeImpl.h',
|
'tvgShapeImpl.h',
|
||||||
'tvgTaskScheduler.h',
|
'tvgTaskScheduler.h',
|
||||||
'tvgBezier.cpp',
|
'tvgBezier.cpp',
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,8 @@
|
||||||
#ifndef _TVG_SHAPE_IMPL_H_
|
#ifndef _TVG_SHAPE_IMPL_H_
|
||||||
#define _TVG_SHAPE_IMPL_H_
|
#define _TVG_SHAPE_IMPL_H_
|
||||||
|
|
||||||
|
#include <memory.h>
|
||||||
#include "tvgPaint.h"
|
#include "tvgPaint.h"
|
||||||
#include "tvgShapePath.h"
|
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
/* Internal Class Implementation */
|
/* Internal Class Implementation */
|
||||||
|
|
@ -58,6 +58,138 @@ struct ShapeStroke
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
struct ShapePath
|
||||||
|
{
|
||||||
|
PathCommand* cmds = nullptr;
|
||||||
|
uint32_t cmdCnt = 0;
|
||||||
|
uint32_t reservedCmdCnt = 0;
|
||||||
|
|
||||||
|
Point *pts = nullptr;
|
||||||
|
uint32_t ptsCnt = 0;
|
||||||
|
uint32_t reservedPtsCnt = 0;
|
||||||
|
|
||||||
|
~ShapePath()
|
||||||
|
{
|
||||||
|
if (cmds) free(cmds);
|
||||||
|
if (pts) free(pts);
|
||||||
|
}
|
||||||
|
|
||||||
|
ShapePath() {}
|
||||||
|
|
||||||
|
ShapePath(const ShapePath* src)
|
||||||
|
{
|
||||||
|
cmdCnt = src->cmdCnt;
|
||||||
|
reservedCmdCnt = src->reservedCmdCnt;
|
||||||
|
ptsCnt = src->ptsCnt;
|
||||||
|
reservedPtsCnt = src->reservedPtsCnt;
|
||||||
|
|
||||||
|
cmds = static_cast<PathCommand*>(malloc(sizeof(PathCommand) * reservedCmdCnt));
|
||||||
|
if (!cmds) return;
|
||||||
|
memcpy(cmds, src->cmds, sizeof(PathCommand) * cmdCnt);
|
||||||
|
|
||||||
|
pts = static_cast<Point*>(malloc(sizeof(Point) * reservedPtsCnt));
|
||||||
|
if (!pts) {
|
||||||
|
free(cmds);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
memcpy(pts, src->pts, sizeof(Point) * ptsCnt);
|
||||||
|
}
|
||||||
|
|
||||||
|
void reserveCmd(uint32_t cmdCnt)
|
||||||
|
{
|
||||||
|
if (cmdCnt <= reservedCmdCnt) return;
|
||||||
|
reservedCmdCnt = cmdCnt;
|
||||||
|
cmds = static_cast<PathCommand*>(realloc(cmds, sizeof(PathCommand) * reservedCmdCnt));
|
||||||
|
}
|
||||||
|
|
||||||
|
void reservePts(uint32_t ptsCnt)
|
||||||
|
{
|
||||||
|
if (ptsCnt <= reservedPtsCnt) return;
|
||||||
|
reservedPtsCnt = ptsCnt;
|
||||||
|
pts = static_cast<Point*>(realloc(pts, sizeof(Point) * reservedPtsCnt));
|
||||||
|
}
|
||||||
|
|
||||||
|
void grow(uint32_t cmdCnt, uint32_t ptsCnt)
|
||||||
|
{
|
||||||
|
reserveCmd(this->cmdCnt + cmdCnt);
|
||||||
|
reservePts(this->ptsCnt + ptsCnt);
|
||||||
|
}
|
||||||
|
|
||||||
|
void reset()
|
||||||
|
{
|
||||||
|
cmdCnt = 0;
|
||||||
|
ptsCnt = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void append(const PathCommand* cmds, uint32_t cmdCnt, const Point* pts, uint32_t ptsCnt)
|
||||||
|
{
|
||||||
|
memcpy(this->cmds + this->cmdCnt, cmds, sizeof(PathCommand) * cmdCnt);
|
||||||
|
memcpy(this->pts + this->ptsCnt, pts, sizeof(Point) * ptsCnt);
|
||||||
|
this->cmdCnt += cmdCnt;
|
||||||
|
this->ptsCnt += ptsCnt;
|
||||||
|
}
|
||||||
|
|
||||||
|
void moveTo(float x, float y)
|
||||||
|
{
|
||||||
|
if (cmdCnt + 1 > reservedCmdCnt) reserveCmd((cmdCnt + 1) * 2);
|
||||||
|
if (ptsCnt + 2 > reservedPtsCnt) reservePts((ptsCnt + 2) * 2);
|
||||||
|
|
||||||
|
cmds[cmdCnt++] = PathCommand::MoveTo;
|
||||||
|
pts[ptsCnt++] = {x, y};
|
||||||
|
}
|
||||||
|
|
||||||
|
void lineTo(float x, float y)
|
||||||
|
{
|
||||||
|
if (cmdCnt + 1 > reservedCmdCnt) reserveCmd((cmdCnt + 1) * 2);
|
||||||
|
if (ptsCnt + 2 > reservedPtsCnt) reservePts((ptsCnt + 2) * 2);
|
||||||
|
|
||||||
|
cmds[cmdCnt++] = PathCommand::LineTo;
|
||||||
|
pts[ptsCnt++] = {x, y};
|
||||||
|
}
|
||||||
|
|
||||||
|
void cubicTo(float cx1, float cy1, float cx2, float cy2, float x, float y)
|
||||||
|
{
|
||||||
|
if (cmdCnt + 1 > reservedCmdCnt) reserveCmd((cmdCnt + 1) * 2);
|
||||||
|
if (ptsCnt + 3 > reservedPtsCnt) reservePts((ptsCnt + 3) * 2);
|
||||||
|
|
||||||
|
cmds[cmdCnt++] = PathCommand::CubicTo;
|
||||||
|
pts[ptsCnt++] = {cx1, cy1};
|
||||||
|
pts[ptsCnt++] = {cx2, cy2};
|
||||||
|
pts[ptsCnt++] = {x, y};
|
||||||
|
}
|
||||||
|
|
||||||
|
void close()
|
||||||
|
{
|
||||||
|
if (cmdCnt > 0 && cmds[cmdCnt - 1] == PathCommand::Close) return;
|
||||||
|
|
||||||
|
if (cmdCnt + 1 > reservedCmdCnt) reserveCmd((cmdCnt + 1) * 2);
|
||||||
|
cmds[cmdCnt++] = PathCommand::Close;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool bounds(float* x, float* y, float* w, float* h)
|
||||||
|
{
|
||||||
|
if (ptsCnt == 0) return false;
|
||||||
|
|
||||||
|
Point min = { pts[0].x, pts[0].y };
|
||||||
|
Point max = { pts[0].x, pts[0].y };
|
||||||
|
|
||||||
|
for(uint32_t i = 1; i < ptsCnt; ++i) {
|
||||||
|
if (pts[i].x < min.x) min.x = pts[i].x;
|
||||||
|
if (pts[i].y < min.y) min.y = pts[i].y;
|
||||||
|
if (pts[i].x > max.x) max.x = pts[i].x;
|
||||||
|
if (pts[i].y > max.y) max.y = pts[i].y;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (x) *x = min.x;
|
||||||
|
if (y) *y = min.y;
|
||||||
|
if (w) *w = max.x - min.x;
|
||||||
|
if (h) *h = max.y - min.y;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
struct Shape::Impl
|
struct Shape::Impl
|
||||||
{
|
{
|
||||||
ShapePath *path = nullptr;
|
ShapePath *path = nullptr;
|
||||||
|
|
|
||||||
|
|
@ -1,163 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2020 Samsung Electronics Co., Ltd. All rights reserved.
|
|
||||||
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
* The above copyright notice and this permission notice shall be included in all
|
|
||||||
* copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
#ifndef _TVG_SHAPE_PATH_H_
|
|
||||||
#define _TVG_SHAPE_PATH_H_
|
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include "tvgCommon.h"
|
|
||||||
|
|
||||||
/************************************************************************/
|
|
||||||
/* Internal Class Implementation */
|
|
||||||
/************************************************************************/
|
|
||||||
|
|
||||||
struct ShapePath
|
|
||||||
{
|
|
||||||
PathCommand* cmds = nullptr;
|
|
||||||
uint32_t cmdCnt = 0;
|
|
||||||
uint32_t reservedCmdCnt = 0;
|
|
||||||
|
|
||||||
Point *pts = nullptr;
|
|
||||||
uint32_t ptsCnt = 0;
|
|
||||||
uint32_t reservedPtsCnt = 0;
|
|
||||||
|
|
||||||
~ShapePath()
|
|
||||||
{
|
|
||||||
if (cmds) free(cmds);
|
|
||||||
if (pts) free(pts);
|
|
||||||
}
|
|
||||||
|
|
||||||
ShapePath() {}
|
|
||||||
|
|
||||||
ShapePath(const ShapePath* src)
|
|
||||||
{
|
|
||||||
cmdCnt = src->cmdCnt;
|
|
||||||
reservedCmdCnt = src->reservedCmdCnt;
|
|
||||||
ptsCnt = src->ptsCnt;
|
|
||||||
reservedPtsCnt = src->reservedPtsCnt;
|
|
||||||
|
|
||||||
cmds = static_cast<PathCommand*>(malloc(sizeof(PathCommand) * reservedCmdCnt));
|
|
||||||
if (!cmds) return;
|
|
||||||
memcpy(cmds, src->cmds, sizeof(PathCommand) * cmdCnt);
|
|
||||||
|
|
||||||
pts = static_cast<Point*>(malloc(sizeof(Point) * reservedPtsCnt));
|
|
||||||
if (!pts) {
|
|
||||||
free(cmds);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
memcpy(pts, src->pts, sizeof(Point) * ptsCnt);
|
|
||||||
}
|
|
||||||
|
|
||||||
void reserveCmd(uint32_t cmdCnt)
|
|
||||||
{
|
|
||||||
if (cmdCnt <= reservedCmdCnt) return;
|
|
||||||
reservedCmdCnt = cmdCnt;
|
|
||||||
cmds = static_cast<PathCommand*>(realloc(cmds, sizeof(PathCommand) * reservedCmdCnt));
|
|
||||||
}
|
|
||||||
|
|
||||||
void reservePts(uint32_t ptsCnt)
|
|
||||||
{
|
|
||||||
if (ptsCnt <= reservedPtsCnt) return;
|
|
||||||
reservedPtsCnt = ptsCnt;
|
|
||||||
pts = static_cast<Point*>(realloc(pts, sizeof(Point) * reservedPtsCnt));
|
|
||||||
}
|
|
||||||
|
|
||||||
void grow(uint32_t cmdCnt, uint32_t ptsCnt)
|
|
||||||
{
|
|
||||||
reserveCmd(this->cmdCnt + cmdCnt);
|
|
||||||
reservePts(this->ptsCnt + ptsCnt);
|
|
||||||
}
|
|
||||||
|
|
||||||
void reset()
|
|
||||||
{
|
|
||||||
cmdCnt = 0;
|
|
||||||
ptsCnt = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void append(const PathCommand* cmds, uint32_t cmdCnt, const Point* pts, uint32_t ptsCnt)
|
|
||||||
{
|
|
||||||
memcpy(this->cmds + this->cmdCnt, cmds, sizeof(PathCommand) * cmdCnt);
|
|
||||||
memcpy(this->pts + this->ptsCnt, pts, sizeof(Point) * ptsCnt);
|
|
||||||
this->cmdCnt += cmdCnt;
|
|
||||||
this->ptsCnt += ptsCnt;
|
|
||||||
}
|
|
||||||
|
|
||||||
void moveTo(float x, float y)
|
|
||||||
{
|
|
||||||
if (cmdCnt + 1 > reservedCmdCnt) reserveCmd((cmdCnt + 1) * 2);
|
|
||||||
if (ptsCnt + 2 > reservedPtsCnt) reservePts((ptsCnt + 2) * 2);
|
|
||||||
|
|
||||||
cmds[cmdCnt++] = PathCommand::MoveTo;
|
|
||||||
pts[ptsCnt++] = {x, y};
|
|
||||||
}
|
|
||||||
|
|
||||||
void lineTo(float x, float y)
|
|
||||||
{
|
|
||||||
if (cmdCnt + 1 > reservedCmdCnt) reserveCmd((cmdCnt + 1) * 2);
|
|
||||||
if (ptsCnt + 2 > reservedPtsCnt) reservePts((ptsCnt + 2) * 2);
|
|
||||||
|
|
||||||
cmds[cmdCnt++] = PathCommand::LineTo;
|
|
||||||
pts[ptsCnt++] = {x, y};
|
|
||||||
}
|
|
||||||
|
|
||||||
void cubicTo(float cx1, float cy1, float cx2, float cy2, float x, float y)
|
|
||||||
{
|
|
||||||
if (cmdCnt + 1 > reservedCmdCnt) reserveCmd((cmdCnt + 1) * 2);
|
|
||||||
if (ptsCnt + 3 > reservedPtsCnt) reservePts((ptsCnt + 3) * 2);
|
|
||||||
|
|
||||||
cmds[cmdCnt++] = PathCommand::CubicTo;
|
|
||||||
pts[ptsCnt++] = {cx1, cy1};
|
|
||||||
pts[ptsCnt++] = {cx2, cy2};
|
|
||||||
pts[ptsCnt++] = {x, y};
|
|
||||||
}
|
|
||||||
|
|
||||||
void close()
|
|
||||||
{
|
|
||||||
if (cmdCnt > 0 && cmds[cmdCnt - 1] == PathCommand::Close) return;
|
|
||||||
|
|
||||||
if (cmdCnt + 1 > reservedCmdCnt) reserveCmd((cmdCnt + 1) * 2);
|
|
||||||
cmds[cmdCnt++] = PathCommand::Close;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool bounds(float* x, float* y, float* w, float* h)
|
|
||||||
{
|
|
||||||
if (ptsCnt == 0) return false;
|
|
||||||
|
|
||||||
Point min = { pts[0].x, pts[0].y };
|
|
||||||
Point max = { pts[0].x, pts[0].y };
|
|
||||||
|
|
||||||
for(uint32_t i = 1; i < ptsCnt; ++i) {
|
|
||||||
if (pts[i].x < min.x) min.x = pts[i].x;
|
|
||||||
if (pts[i].y < min.y) min.y = pts[i].y;
|
|
||||||
if (pts[i].x > max.x) max.x = pts[i].x;
|
|
||||||
if (pts[i].y > max.y) max.y = pts[i].y;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (x) *x = min.x;
|
|
||||||
if (y) *y = min.y;
|
|
||||||
if (w) *w = max.x - min.x;
|
|
||||||
if (h) *h = max.y - min.y;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif //_TVG_SHAPE_PATH_H_
|
|
||||||
Loading…
Add table
Reference in a new issue