LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-17 19:08:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added: #1826 Extending fill area by half pixel to fix antialias conflation artifacts

Browse Source
This commit is contained in:
Jindra Petřík
2025-04-20 23:24:31 +02:00
parent d5ff99490c
commit 0913af7520
15 changed files with 38 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
View File

@@ -836,7 +836,7 @@ public final class Configuration {
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> playFrameSounds = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationDefaultBoolean(true)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> fixAntialiasConflation = null;

29
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java
View File

@@ -17,6 +17,7 @@
package com.jpexs.decompiler.flash.exporters.shape;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.exporters.ImageTagBufferedImage;
import com.jpexs.decompiler.flash.exporters.commonshape.ExportRectangle;
import com.jpexs.decompiler.flash.exporters.commonshape.Matrix;
@@ -76,8 +77,6 @@ public class BitmapExporter extends ShapeExporterBase {
private final GeneralPath path;
private Shape aliasedShape;
private Paint fillPaint;
private boolean fillRepeat;
@@ -108,13 +107,6 @@ public class BitmapExporter extends ShapeExporterBase {
private boolean scaleStrokes;
private boolean aliasedFill = false;
@Override
public void beginAliasedFills() {
aliasedFill = true;
}
private class TransformedStroke implements Stroke {
/**
@@ -241,8 +233,7 @@ public class BitmapExporter extends ShapeExporterBase {
}
@Override
public void beginFills() {
aliasedFill = false;
public void beginFills() {
}
@Override
@@ -553,21 +544,13 @@ public class BitmapExporter extends ShapeExporterBase {
public void curveTo(double controlX, double controlY, double anchorX, double anchorY) {
path.quadTo(controlX, controlY, anchorX, anchorY);
}
/**
* Finalizes the path.
*/
protected void finalizePath() {
if (fillPaint != null) {
Shape shp = path;
if (aliasedFill) {
aliasedShape = new BasicStroke((float) (SWF.unitDivisor / unzoom / 2), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND).createStrokedShape(shp);
return;
} else if (aliasedShape != null) {
Area a = new Area(shp);
a.add(new Area(aliasedShape));
shp = a;
}
graphics.setComposite(AlphaComposite.SrcOver);
if (fillPaint instanceof MultipleGradientPaint) {
AffineTransform oldAf = graphics.getTransform();
@@ -704,7 +687,11 @@ public class BitmapExporter extends ShapeExporterBase {
} else {
graphics.setPaint(fillPaint);
graphics.fill(shp);
}
if (Configuration.fixAntialiasConflation.get()) {
Shape strokeShape = new BasicStroke((float) (1 * SWF.unitDivisor / unzoom), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND).createStrokedShape(shp);
graphics.fill(strokeShape);
}
}
}
if (linePaint != null && lineStroke != null) {
if (true) {

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java
View File

@@ -650,9 +650,4 @@ public class CanvasShapeExporter extends ShapeExporterBase {
fillWidth = 0;
fillHeight = 0;
}
@Override
public void beginAliasedFills() {
aliasedFill = true;
}
}

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/DefaultSVGShapeExporter.java
View File

@@ -193,10 +193,4 @@ public abstract class DefaultSVGShapeExporter extends ShapeExporterBase {
protected double roundPixels20(double pixels) {
return Math.round(pixels * 100) / 100.0;
}
@Override
public void beginAliasedFills() {
aliasedFill = true;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/IShapeExporter.java
View File

@@ -38,11 +38,6 @@ public interface IShapeExporter {
*/
public void endShape();
/**
* Begins aliased fills.
*/
public void beginAliasedFills();
/**
* Begins fills.
*/

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/PathExporter.java
View File

@@ -182,9 +182,4 @@ public class PathExporter extends ShapeExporterBase {
paths.add(path);
path = new GeneralPath(GeneralPath.WIND_EVEN_ODD); //For correct intersections display
}
@Override
public void beginAliasedFills() {
aliasedFill = true;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExportData.java
View File

@@ -42,11 +42,6 @@ public class ShapeExportData {
*/
public List<List<IEdge>> fillPaths;
/**
* Aliased fill paths
*/
public List<List<IEdge>> aliasedFillPaths;
/**
* Line paths
*/

77
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExporterBase.java
View File

@@ -17,7 +17,6 @@
package com.jpexs.decompiler.flash.exporters.shape;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.exporters.commonshape.FillStyle;
import com.jpexs.decompiler.flash.exporters.commonshape.LineStyle;
import com.jpexs.decompiler.flash.types.ColorTransform;
@@ -58,8 +57,6 @@ public abstract class ShapeExporterBase implements IShapeExporter {
private final List<List<IEdge>> _fillPaths;
private final List<List<IEdge>> _aliasedFillPaths;
private final List<List<IEdge>> _linePaths;
private final ColorTransform colorTransform;
@@ -109,26 +106,22 @@ public abstract class ShapeExporterBase implements IShapeExporter {
// Create edge maps
List<Map<Integer, List<IEdge>>> fillEdgeMaps = new ArrayList<>();
List<Map<Integer, List<IEdge>>> aliasedFillEdgeMaps = new ArrayList<>();
List<Map<Integer, List<IEdge>>> lineEdgeMaps = new ArrayList<>();
try {
createEdgeMaps(shapeNum, shape, fillStyles, lineStyles, fillEdgeMaps, aliasedFillEdgeMaps, lineEdgeMaps);
createEdgeMaps(shapeNum, shape, fillStyles, lineStyles, fillEdgeMaps, lineEdgeMaps);
} catch (Throwable t) {
t.printStackTrace();
}
int count = lineEdgeMaps.size();
List<List<IEdge>> fillPaths = new ArrayList<>(count);
List<List<IEdge>> aliasedFillPaths = new ArrayList<>(count);
List<List<IEdge>> linePaths = new ArrayList<>(count);
for (int i = 0; i < count; i++) {
fillPaths.add(createPathFromEdgeMap(fillEdgeMaps.get(i)));
aliasedFillPaths.add(createPathFromEdgeMap(aliasedFillEdgeMaps.get(i)));
linePaths.add(createPathFromEdgeMap(lineEdgeMaps.get(i)));
}
cachedData = new ShapeExportData();
cachedData.fillPaths = fillPaths;
cachedData.aliasedFillPaths = aliasedFillPaths;
cachedData.linePaths = linePaths;
cachedData.fillStyles = fillStyles;
cachedData.lineStyles = lineStyles;
@@ -138,7 +131,6 @@ public abstract class ShapeExporterBase implements IShapeExporter {
_fillStyles = cachedData.fillStyles;
_lineStyles = cachedData.lineStyles;
_fillPaths = cachedData.fillPaths;
_aliasedFillPaths = cachedData.aliasedFillPaths;
_linePaths = cachedData.linePaths;
}
@@ -158,12 +150,8 @@ public abstract class ShapeExporterBase implements IShapeExporter {
beginShape();
// Export fills and strokes for each group separately
for (int i = 0; i < _linePaths.size(); i++) {
if (Configuration.fixAntialiasConflation.get()) {
exportFillPath(_aliasedFillPaths.get(i), true);
}
// Export fills first
exportFillPath(_fillPaths.get(i), false);
exportFillPath(_fillPaths.get(i));
// Export strokes last
exportLinePath(_linePaths.get(i));
}
@@ -172,7 +160,7 @@ public abstract class ShapeExporterBase implements IShapeExporter {
}
private void createEdgeMaps(int shapeNum, SHAPE shape, List<FillStyle> fillStyles, List<LineStyle> lineStyles,
List<Map<Integer, List<IEdge>>> fillEdgeMaps, List<Map<Integer, List<IEdge>>> aliasedFillEdgeMaps, List<Map<Integer, List<IEdge>>> lineEdgeMaps) {
List<Map<Integer, List<IEdge>>> fillEdgeMaps, List<Map<Integer, List<IEdge>>> lineEdgeMaps) {
int xPos = 0;
int yPos = 0;
int fillStyleIdxOffset = 0;
@@ -183,14 +171,13 @@ public abstract class ShapeExporterBase implements IShapeExporter {
List<IEdge> subPath = new ArrayList<>();
Map<Integer, List<IEdge>> currentFillEdgeMap = new HashMap<>();
Map<Integer, List<IEdge>> currentLineEdgeMap = new HashMap<>();
Map<Integer, List<IEdge>> currentAliasedFillEdgeMap = new HashMap<>();
List<SHAPERECORD> records = shape.shapeRecords;
for (int i = 0; i < records.size(); i++) {
SHAPERECORD shapeRecord = records.get(i);
if (shapeRecord instanceof StyleChangeRecord) {
StyleChangeRecord styleChangeRecord = (StyleChangeRecord) shapeRecord;
if (styleChangeRecord.stateLineStyle || styleChangeRecord.stateFillStyle0 || styleChangeRecord.stateFillStyle1) {
processSubPath(subPath, currentLineStyleIdx, currentFillStyleIdx0, currentFillStyleIdx1, currentFillEdgeMap, currentLineEdgeMap, currentAliasedFillEdgeMap);
processSubPath(subPath, currentLineStyleIdx, currentFillStyleIdx0, currentFillStyleIdx1, currentFillEdgeMap, currentLineEdgeMap);
subPath = new ArrayList<>();
}
if (styleChangeRecord.stateNewStyles) {
@@ -209,13 +196,10 @@ public abstract class ShapeExporterBase implements IShapeExporter {
&& styleChangeRecord.stateFillStyle0 && styleChangeRecord.fillStyle0 == 0
&& styleChangeRecord.stateFillStyle1 && styleChangeRecord.fillStyle1 == 0) {
cleanEdgeMap(currentFillEdgeMap);
cleanEdgeMap(currentAliasedFillEdgeMap);
cleanEdgeMap(currentLineEdgeMap);
fillEdgeMaps.add(currentFillEdgeMap);
aliasedFillEdgeMaps.add(currentAliasedFillEdgeMap);
lineEdgeMaps.add(currentLineEdgeMap);
currentFillEdgeMap = new HashMap<>();
currentAliasedFillEdgeMap = new HashMap<>();
currentLineEdgeMap = new HashMap<>();
currentLineStyleIdx = 0;
currentFillStyleIdx0 = 0;
@@ -268,62 +252,37 @@ public abstract class ShapeExporterBase implements IShapeExporter {
subPath.add(new CurvedEdge(xPosFrom, yPosFrom, xPosControl, yPosControl, xPos, yPos, currentLineStyleIdx, currentFillStyleIdx1));
} else if (shapeRecord instanceof EndShapeRecord) {
// We're done. Process the last subpath, if any
processSubPath(subPath, currentLineStyleIdx, currentFillStyleIdx0, currentFillStyleIdx1, currentFillEdgeMap, currentLineEdgeMap, currentAliasedFillEdgeMap);
processSubPath(subPath, currentLineStyleIdx, currentFillStyleIdx0, currentFillStyleIdx1, currentFillEdgeMap, currentLineEdgeMap);
cleanEdgeMap(currentFillEdgeMap);
cleanEdgeMap(currentAliasedFillEdgeMap);
cleanEdgeMap(currentLineEdgeMap);
fillEdgeMaps.add(currentFillEdgeMap);
aliasedFillEdgeMaps.add(currentAliasedFillEdgeMap);
lineEdgeMaps.add(currentLineEdgeMap);
}
}
}
private void processSubPath(List<IEdge> subPath, int lineStyleIdx, int fillStyleIdx0, int fillStyleIdx1,
Map<Integer, List<IEdge>> currentFillEdgeMap, Map<Integer, List<IEdge>> currentLineEdgeMap, Map<Integer, List<IEdge>> currentAliasedFillEdgeMap) {
Map<Integer, List<IEdge>> currentFillEdgeMap, Map<Integer, List<IEdge>> currentLineEdgeMap) {
List<IEdge> path;
List<IEdge> apath = null;
boolean bothFillStyles = fillStyleIdx0 != 0 && fillStyleIdx1 != 0;
if (fillStyleIdx0 != 0) {
path = currentFillEdgeMap.get(fillStyleIdx0);
if (bothFillStyles) {
apath = currentAliasedFillEdgeMap.get(fillStyleIdx0);
}
path = currentFillEdgeMap.get(fillStyleIdx0);
if (path == null) {
path = new ArrayList<>();
currentFillEdgeMap.put(fillStyleIdx0, path);
}
if (bothFillStyles && apath == null) {
apath = new ArrayList<>();
currentAliasedFillEdgeMap.put(fillStyleIdx0, apath);
}
for (int j = subPath.size() - 1; j >= 0; j--) {
IEdge rev = subPath.get(j).reverseWithNewFillStyle(fillStyleIdx0);
//System.err.println("appending reversed " + rev);
path.add(rev);
if (bothFillStyles) {
apath.add(rev);
}
}
}
if (fillStyleIdx1 != 0) {
/*if (bothFillStyles) {
apath = currentAliasedFillEdgeMap.get(fillStyleIdx1);
}*/
path = currentFillEdgeMap.get(fillStyleIdx1);
if (path == null) {
path = new ArrayList<>();
currentFillEdgeMap.put(fillStyleIdx1, path);
}
/*if (bothFillStyles && apath == null) {
apath = new ArrayList<>();
currentAliasedFillEdgeMap.put(fillStyleIdx1, apath);
}*/
appendEdges(path, subPath);
/*if (bothFillStyles) {
appendEdges(apath, subPath);
}*/
appendEdges(path, subPath);
}
if (lineStyleIdx != 0) {
path = currentLineEdgeMap.get(lineStyleIdx);
@@ -335,16 +294,12 @@ public abstract class ShapeExporterBase implements IShapeExporter {
}
}
private void exportFillPath(List<IEdge> path, boolean aliased) {
private void exportFillPath(List<IEdge> path) {
int posX = Integer.MAX_VALUE;
int posY = Integer.MAX_VALUE;
int fillStyleIdx = Integer.MAX_VALUE;
if (path.size() > 0) {
if (aliased) {
beginAliasedFills();
} else {
beginFills();
}
if (!path.isEmpty()) {
beginFills();
for (int i = 0; i < path.size(); i++) {
IEdge e = path.get(i);
if (fillStyleIdx != e.getFillStyleIdx()) {
@@ -419,7 +374,7 @@ public abstract class ShapeExporterBase implements IShapeExporter {
int lastMoveToX = posX;
int lastMoveToY = posY;
int lineStyleIdx = Integer.MAX_VALUE;
if (path.size() > 0) {
if (!path.isEmpty()) {
boolean autoClose = true;
beginLines();
for (int i = 0; i < path.size(); i++) {
@@ -544,13 +499,13 @@ public abstract class ShapeExporterBase implements IShapeExporter {
private void cleanEdgeMap(Map<Integer, List<IEdge>> edgeMap) {
for (Integer styleIdx : edgeMap.keySet()) {
List<IEdge> subPath = edgeMap.get(styleIdx);
if (subPath != null && subPath.size() > 0) {
if (subPath != null && !subPath.isEmpty()) {
int idx;
IEdge prevEdge = null;
List<IEdge> tmpPath = new ArrayList<>();
Map<Long, List<IEdge>> coordMap = createCoordMap(subPath);
Map<Long, List<IEdge>> reverseCoordMap = createReverseCoordMap(subPath);
while (subPath.size() > 0) {
while (!subPath.isEmpty()) {
idx = 0;
while (idx < subPath.size()) {
if (prevEdge != null) {
@@ -661,7 +616,7 @@ public abstract class ShapeExporterBase implements IShapeExporter {
private IEdge findNextEdgeInCoordMap(Map<Long, List<IEdge>> coordMap, IEdge edge) {
long toLong = (((long) edge.getToX()) << 32) | (edge.getToY() & 0xffffffffL);
List<IEdge> coordMapArray = coordMap.get(toLong);
if (coordMapArray != null && coordMapArray.size() > 0) {
if (coordMapArray != null && !coordMapArray.isEmpty()) {
return coordMapArray.get(0);
}
return null;

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/morphshape/ShapeForMorphExporter.java
View File

@@ -225,11 +225,6 @@ public class ShapeForMorphExporter extends ShapeExporterBase {
}
}
@Override
public void beginAliasedFills() {
}
@Override
public void beginFills() {