LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-28 01:55:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed filter bounds

Browse Source
This commit is contained in:
Jindra Petřík
2022-12-24 13:05:44 +01:00
parent 166e8d7298
commit 0c4adb7d1a
5 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
View File

@@ -752,36 +752,20 @@ public class Timeline {
// calculate size after applying the filters
double deltaXMax = 0;
double deltaYMax = 0;
double deltaXMin = Integer.MAX_VALUE;
double deltaYMin = Integer.MAX_VALUE;
for (FILTER filter : filters) {
double x = filter.getDeltaX();
double y = filter.getDeltaY();
deltaXMax = Math.max(x, deltaXMax);
deltaYMax = Math.max(y, deltaYMax);
deltaXMin = Math.min(x, deltaXMin);
deltaYMin = Math.min(y, deltaYMin);
deltaYMax = Math.max(y, deltaYMax);
}
if (deltaXMin > 0) {
deltaXMin = 0;
}
if (deltaYMin > 0) {
deltaYMin = 0;
}
if (deltaXMax < 0) {
deltaXMax = 0;
}
if (deltaYMax < 0) {
deltaYMax = 0;
}
rect.xMin += deltaXMin * unzoom * SWF.unitDivisor;
rect.xMin -= deltaXMax * unzoom * SWF.unitDivisor;
rect.xMax += deltaXMax * unzoom * SWF.unitDivisor;
rect.yMin += deltaYMin * unzoom * SWF.unitDivisor;
rect.yMin -= deltaXMax * unzoom * SWF.unitDivisor;
rect.yMax += deltaYMax * unzoom * SWF.unitDivisor;
viewRect2.xMin -= deltaXMax * SWF.unitDivisor;
viewRect2.xMax += deltaXMax * SWF.unitDivisor;
viewRect2.yMin -= deltaXMax * SWF.unitDivisor;
viewRect2.yMax += deltaXMax * SWF.unitDivisor;
viewRect2.yMin -= deltaYMax * SWF.unitDivisor;
viewRect2.yMax += deltaYMax * SWF.unitDivisor;
}
rect.xMin -= SWF.unitDivisor;

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/filters/BEVELFILTER.java
View File

@@ -114,11 +114,11 @@ public class BEVELFILTER extends FILTER {
@Override
public double getDeltaX() {
return blurX + (distance * Math.cos(angle));
return blurX + Math.abs(distance * Math.cos(angle));
}
@Override
public double getDeltaY() {
return blurY + (distance * Math.sin(angle));
return blurY + Math.abs(distance * Math.sin(angle));
}
}

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/filters/DROPSHADOWFILTER.java
View File

@@ -98,11 +98,11 @@ public class DROPSHADOWFILTER extends FILTER {
@Override
public double getDeltaX() {
return blurX + (distance * Math.cos(angle));
return blurX + Math.abs(distance * Math.cos(angle));
}
@Override
public double getDeltaY() {
return blurY + (distance * Math.sin(angle));
return blurY + Math.abs(distance * Math.sin(angle));
}
}

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/filters/GRADIENTBEVELFILTER.java
View File

@@ -132,11 +132,11 @@ public class GRADIENTBEVELFILTER extends FILTER {
@Override
public double getDeltaX() {
return blurX + (distance * Math.cos(angle));
return blurX + Math.abs(distance * Math.cos(angle));
}
@Override
public double getDeltaY() {
return blurY + (distance * Math.sin(angle));
return blurY + Math.abs(distance * Math.sin(angle));
}
}

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/filters/GRADIENTGLOWFILTER.java
View File

@@ -133,11 +133,11 @@ public class GRADIENTGLOWFILTER extends FILTER {
@Override
public double getDeltaX() {
return blurX + (distance * Math.cos(angle));
return blurX + Math.abs(distance * Math.cos(angle));
}
@Override
public double getDeltaY() {
return blurY + (distance * Math.sin(angle));
return blurY + Math.abs(distance * Math.sin(angle));
}
}