LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 17:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added #2123 FLA export - show some progress info (which symbols are exported)

Browse Source 
Fixed #2123 FLA export - IndexOutOfBounds in shape fixer
Removed #2123 FLA export - Using shape fixer for morphshapes (needs something better)
This commit is contained in:
Jindra Petřík
2023-12-30 18:06:08 +01:00
parent d6c6d30776
commit fa03866191
9 changed files with 121 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/math/BezierEdge.java
+6 -4
View File
@@ -481,14 +481,16 @@ public class BezierEdge implements Serializable {
//Error Y values of bounds must be of opposite sign
BezierEdge qi = new BezierEdge(6369.0, 13040.0, 6380.0, 13030.0, 6427.0, 13018.0);
BezierEdge qj = new BezierEdge(6338.0, 13099.0, 6358.0, 13050.0, 6369.0, 13040.0);
//Error Y values of bounds must be of opposite sign
BezierEdge qk = new BezierEdge(45334.0, 2421.0, 45348.0, 2373.0, 45348.0, 2330.0);
BezierEdge ql = new BezierEdge(45348.0, 2330.0, 45348.0, 2263.0, 45314.0, 2223.0);
BezierEdge qm = new BezierEdge(-1957, 2676, -1957, 2676.5, -1957.5, 2676.5);
BezierEdge qn = new BezierEdge(-1957, 2675.5, -1957, 2676, -1957, 2676);
List<Point2D> ps = new ArrayList<>();
qk.intersects(ql, t1, t2, ps);
qm.intersects(qn, t1, t2, ps);
System.err.println("t1 is " + t1);
System.err.println("t2 is " + t2);
System.err.println("intersections is " + ps);
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/math/Intersections.java
+4 -1
View File
@@ -247,7 +247,10 @@ public class Intersections {
if (0 <= xRoot && xRoot <= 1) {
for (int k = 0; k < yRoots.size(); k++) {
if (Math.abs(xRoot - yRoots.get(k)) < TOLERANCE) {
result.add(add(multiply(c22, s * s), (add(multiply(c21, s), c20))));
Point2D res = add(multiply(c22, s * s), (add(multiply(c21, s), c20)));
if (!result.contains(res)) {
result.add(res);
}
break checkRoots;
}
}