Skip to content

Solve performance issues with SWF exporter #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
m0rkeulv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Solve performance issues with SWF exporter #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 43 additions & 23 deletions src/swf/data/SWFShape.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import openfl.display.LineScaleMode;
import openfl.geom.Matrix;
import openfl.geom.Point;
import openfl.errors.Error;
import haxe.ds.ObjectMap;

class SWFShape
{
Expand Down Expand Up @@ -655,37 +656,56 @@ class SWFShape
var subPath:Array<IEdge> = edgeMap.get(styleIdx);
if (subPath != null && subPath.length > 0)
{
var idx:Int;
var prevEdge:IEdge = null;
var n = subPath.length;
var nextFree = new Array<Int>();
var prevFree = new Array<Int>();
var edgeIndexMap = new ObjectMap<IEdge, Int>();

for (i in 0...n)
{
nextFree.push(i + 1);
prevFree.push(i - 1);
edgeIndexMap.set(subPath[i], i);
}

var tmpPath:Array<IEdge> = new Array<IEdge>();
createCoordMap(subPath);
while (subPath.length > 0)

var head = 0;
var idx = 0;
var remaining = n;
var prevEdge:IEdge = null;

while (remaining > 0)
{
idx = 0;
while (idx < subPath.length)
var cand = subPath[idx];
if (prevEdge == null || prevEdge.to.equals(cand.from))
{
if (prevEdge == null || prevEdge.to.equals(subPath[idx].from))
remaining--;
tmpPath.push(cand);
removeEdgeFromCoordMap(cand);
prevEdge = cand;

var next = nextFree[idx];
var prev = prevFree[idx];

if (prev >= 0) nextFree[prev] = next;
else head = next;

if (next < n) prevFree[next] = prev;
idx = next < n ? next : head;
}
else
{
var edge = findNextEdgeInCoordMap(prevEdge);
if (edge != null)
{
var edge:IEdge = subPath.splice(idx, 1)[0];
tmpPath.push(edge);
removeEdgeFromCoordMap(edge);
prevEdge = edge;
idx = edgeIndexMap.get(edge);
}
else
{
var edge = findNextEdgeInCoordMap(prevEdge);
if (edge != null)
{
for (i in 0...subPath.length)
{
if (subPath[i] == edge) idx = i;
}
}
else
{
idx = 0;
prevEdge = null;
}
idx = head;
prevEdge = null;
}
}
}
Expand Down
152 changes: 74 additions & 78 deletions src/swf/exporters/AnimateLibraryExporter.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,62 +600,60 @@ class AnimateLibraryExporter
}
else
{
commands = commands.concat([
SWFShapeCommandType.LINE_STYLE,
thickness,
color,
alpha,
pixelHinting,
scaleMode,
startCaps,
joints,
miterLimit
]);
commands.push(SWFShapeCommandType.LINE_STYLE);
commands.push(thickness);
commands.push(color);
commands.push(alpha);
commands.push(pixelHinting);
commands.push(scaleMode);
commands.push(startCaps);
commands.push(joints);
commands.push(miterLimit);
}

case BeginFill(color, alpha):
commands = commands.concat([SWFShapeCommandType.BEGIN_FILL, color, alpha]);
commands.push(SWFShapeCommandType.BEGIN_FILL);
commands.push(color);
commands.push(alpha);

case BeginGradientFill(type, colors, alphas, ratios, matrix, spreadMethod, interpolationMethod, focalPointRatio):
commands = commands.concat([
SWFShapeCommandType.BEGIN_GRADIENT_FILL,
type,
colors,
alphas,
ratios,
serializeMatrix(matrix),
spreadMethod,
interpolationMethod,
focalPointRatio
]);
commands.push(SWFShapeCommandType.BEGIN_GRADIENT_FILL);
commands.push(type);
commands.push(colors);
commands.push(alphas);
commands.push(ratios);
commands.push(serializeMatrix(matrix));
commands.push(spreadMethod);
commands.push(interpolationMethod);
commands.push(focalPointRatio);

case BeginBitmapFill(bitmapID, matrix, repeat, smooth):
commands = commands.concat([
SWFShapeCommandType.BEGIN_BITMAP_FILL,
bitmapID,
serializeMatrix(matrix),
repeat,
smooth
]);
commands.push(SWFShapeCommandType.BEGIN_BITMAP_FILL);
commands.push(bitmapID);
commands.push(serializeMatrix(matrix));
commands.push(repeat);
commands.push(smooth);
processTag(cast swfData.getCharacter(bitmapID));

case EndFill:
commands.push(SWFShapeCommandType.END_FILL);

case MoveTo(x, y):
commands = commands.concat([SWFShapeCommandType.MOVE_TO, twip(x), twip(y)]);
commands.push(SWFShapeCommandType.MOVE_TO);
commands.push(twip(x));
commands.push(twip(y));

case LineTo(x, y):
commands = commands.concat([SWFShapeCommandType.LINE_TO, twip(x), twip(y)]);
commands.push(SWFShapeCommandType.LINE_TO);
commands.push(twip(x));
commands.push(twip(y));

case CurveTo(controlX, controlY, anchorX, anchorY):
commands = commands.concat([
SWFShapeCommandType.CURVE_TO,
twip(controlX),
twip(controlY),
twip(anchorX),
twip(anchorY)
]);
commands.push(SWFShapeCommandType.CURVE_TO);
commands.push(twip(controlX));
commands.push(twip(controlY));
commands.push(twip(anchorX));
commands.push(twip(anchorY));

default:
}
Expand Down Expand Up @@ -979,62 +977,60 @@ class AnimateLibraryExporter
}
else
{
commands = commands.concat([
SWFShapeCommandType.LINE_STYLE,
thickness,
color,
alpha,
pixelHinting,
scaleMode,
startCaps,
joints,
miterLimit
]);
commands.push(SWFShapeCommandType.LINE_STYLE);
commands.push(thickness);
commands.push(color);
commands.push(alpha);
commands.push(pixelHinting);
commands.push(scaleMode);
commands.push(startCaps);
commands.push(joints);
commands.push(miterLimit);
}

case BeginFill(color, alpha):
commands = commands.concat([SWFShapeCommandType.BEGIN_FILL, color, alpha]);
commands.push(SWFShapeCommandType.BEGIN_FILL);
commands.push(color);
commands.push(alpha);

case BeginGradientFill(type, colors, alphas, ratios, matrix, spreadMethod, interpolationMethod, focalPointRatio):
commands = commands.concat([
SWFShapeCommandType.BEGIN_GRADIENT_FILL,
type,
colors,
alphas,
ratios,
serializeMatrix(matrix),
spreadMethod,
interpolationMethod,
focalPointRatio
]);
commands.push(SWFShapeCommandType.BEGIN_GRADIENT_FILL);
commands.push(type);
commands.push(colors);
commands.push(alphas);
commands.push(ratios);
commands.push(serializeMatrix(matrix));
commands.push(spreadMethod);
commands.push(interpolationMethod);
commands.push(focalPointRatio);

case BeginBitmapFill(bitmapID, matrix, repeat, smooth):
commands = commands.concat([
SWFShapeCommandType.BEGIN_BITMAP_FILL,
bitmapID,
serializeMatrix(matrix),
repeat,
smooth
]);
commands.push(SWFShapeCommandType.BEGIN_BITMAP_FILL);
commands.push(bitmapID);
commands.push(serializeMatrix(matrix));
commands.push(repeat);
commands.push(smooth);
processTag(cast swfData.getCharacter(bitmapID));

case EndFill:
commands.push(SWFShapeCommandType.END_FILL);

case MoveTo(x, y):
commands = commands.concat([SWFShapeCommandType.MOVE_TO, twip(x), twip(y)]);
commands.push(SWFShapeCommandType.MOVE_TO);
commands.push(twip(x));
commands.push(twip(y));

case LineTo(x, y):
commands = commands.concat([SWFShapeCommandType.LINE_TO, twip(x), twip(y)]);
commands.push(SWFShapeCommandType.LINE_TO);
commands.push(twip(x));
commands.push(twip(y));

case CurveTo(controlX, controlY, anchorX, anchorY):
commands = commands.concat([
SWFShapeCommandType.CURVE_TO,
twip(controlX),
twip(controlY),
twip(anchorX),
twip(anchorY)
]);
commands.push(SWFShapeCommandType.CURVE_TO);
commands.push(twip(controlX));
commands.push(twip(controlY));
commands.push(twip(anchorX));
commands.push(twip(anchorY));

default:
}
Expand Down
Loading