Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/core/PathProxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,9 @@ export default class PathProxy {
}

setData(data: Float32Array | number[]) {
if (!this._saveData) {
return;
}

const len = data.length;

Expand All @@ -380,6 +383,9 @@ export default class PathProxy {
}

appendPath(path: PathProxy | PathProxy[]) {
if (!this._saveData) {
return;
}
if (!(path instanceof Array)) {
path = [path];
}
Expand All @@ -389,8 +395,14 @@ export default class PathProxy {
for (let i = 0; i < len; i++) {
appendSize += path[i].len();
}
if (hasTypedArray && (this.data instanceof Float32Array)) {
const oldData = this.data;
if (hasTypedArray && (oldData instanceof Float32Array || !oldData)) {
this.data = new Float32Array(offset + appendSize);
if (offset > 0 && oldData) {
for (let k = 0; k < offset; k++) {
this.data[k] = oldData[k];
}
}
}
for (let i = 0; i < len; i++) {
const appendPathData = path[i].data;
Expand Down Expand Up @@ -970,6 +982,10 @@ export default class PathProxy {
return newProxy;
}

canSave(): boolean {
return !!this._saveData;
}

private static initDefaultProps = (function () {
const proto = PathProxy.prototype;
proto._saveData = true;
Expand Down
13 changes: 9 additions & 4 deletions src/tool/path.ts
Original file line number Diff line number Diff line change
Expand Up @@ -383,22 +383,27 @@ class SVGPath extends Path {
function isPathProxy(path: PathProxy | CanvasRenderingContext2D): path is PathProxy {
return (path as PathProxy).setData != null;
}

// TODO Optimize double memory cost problem
function createPathOptions(str: string, opts: SVGPathOption): InnerSVGPathOption {
const pathProxy = createPathProxyFromString(str);
const innerOpts: InnerSVGPathOption = extend({}, opts);
innerOpts.buildPath = function (path: PathProxy | CanvasRenderingContext2D) {
if (isPathProxy(path)) {
path.setData(pathProxy.data);
const beProxy = isPathProxy(path);
if (beProxy && path.canSave()) {
// path.setData(pathProxy.data);
path.appendPath(pathProxy);
// Svg and vml renderer don't have context
const ctx = path.getContext();
if (ctx) {
path.rebuildPath(ctx, 1);
}
}
else {
const ctx = path;
pathProxy.rebuildPath(ctx, 1);
const ctx = beProxy ? path.getContext() : path;
if (ctx) {
pathProxy.rebuildPath(ctx, 1);
}
}
};

Expand Down