bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix invalid image layers handling with NORMAL mode

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-03-05 21:09:15 +01:00
parent c8e2a7faee
commit dabc49d557
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/image/DefaultImageLayer.java
View File

@@ -25,6 +25,7 @@ public class DefaultImageLayer implements ImageLayer {
private float y;
private float scaleX;
private float scaleY;
private float factor;
@NonNull
private ImageLayerMode mode;
@@ -54,13 +55,9 @@ public class DefaultImageLayer implements ImageLayer {
private void recalculate() {
switch (mode) {
case NORMAL -> image.setScale(image.getWidth() * scaleX, image.getHeight() * scaleY);
case NORMAL -> image.setScale(factor * scaleX, factor * scaleY);
case FIT_MAP -> image.setScale(mapWidth / imagePrimaryWidth, mapHeight / imagePrimaryHeight);
}
if (mode == ImageLayerMode.NORMAL) {
System.out.printf("%d * %f, %d * %f", image.getWidth(), scaleX, image.getHeight(), scaleY);
}
}
@Override
@@ -68,6 +65,7 @@ public class DefaultImageLayer implements ImageLayer {
this.image = image;
this.imagePrimaryWidth = image.getPrimaryWidth();
this.imagePrimaryHeight = image.getPrimaryHeight();
this.factor = image.getFactor();
this.image.setPosition(x, y);
@@ -87,6 +85,8 @@ public class DefaultImageLayer implements ImageLayer {
public void setPosition(float x, float y) {
this.x = x;
this.y = y;
this.image.setPosition(x, y);
}
@Override