From 4ec67e92faade9859947e412bfb5df82c7e04821 Mon Sep 17 00:00:00 2001 From: Jason Long Date: Fri, 15 Aug 2014 12:50:26 -0700 Subject: [PATCH] TileImages: refactor: ren SourceImage to ScaledSourceImage to allow a non-scaled version soon --- src/micropolisj/build_tool/MakeTiles.java | 2 +- src/micropolisj/graphics/TileImage.java | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/micropolisj/build_tool/MakeTiles.java b/src/micropolisj/build_tool/MakeTiles.java index ba212f6..e856045 100644 --- a/src/micropolisj/build_tool/MakeTiles.java +++ b/src/micropolisj/build_tool/MakeTiles.java @@ -451,7 +451,7 @@ public class MakeTiles throws IOException { BufferedImage bi = ImageIO.read(pngFile); - return new SourceImage( + return new ScaledSourceImage( bi, basisSize, TILE_SIZE); diff --git a/src/micropolisj/graphics/TileImage.java b/src/micropolisj/graphics/TileImage.java index a90b196..def2512 100644 --- a/src/micropolisj/graphics/TileImage.java +++ b/src/micropolisj/graphics/TileImage.java @@ -63,16 +63,25 @@ public abstract class TileImage /** * Supports rescaling of tile images. */ - public static class SourceImage extends TileImage + public static abstract class SourceImage extends TileImage { public final BufferedImage image; public final int basisSize; - public final int targetSize; - public SourceImage(BufferedImage image, int basisSize, int targetSize) + protected SourceImage(BufferedImage image, int basisSize) { this.image = image; this.basisSize = basisSize; + } + } + + public static class ScaledSourceImage extends SourceImage + { + public final int targetSize; + + public ScaledSourceImage(BufferedImage image, int basisSize, int targetSize) + { + super(image, basisSize); this.targetSize = targetSize; }