From cff0ef7df51a64e23955fad19bae11af968a8445 Mon Sep 17 00:00:00 2001 From: Zukero Date: Wed, 10 Aug 2016 17:57:51 +0200 Subject: [PATCH] New colorfilter values : redtint, greentint, and bluetint. --- .../AndorsTrail/model/map/LayeredTileMap.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java index 784f941f3..3e85fbc98 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java @@ -16,6 +16,9 @@ public final class LayeredTileMap { private static final ColorFilter colorFilterBlack80 = createGrayScaleColorFilter(0.2f); private static final ColorFilter colorFilterInvert = createInvertColorFilter(); private static final ColorFilter colorFilterBW = createBWColorFilter(); + private static final ColorFilter colorFilterRedTint = createRedTintColorFilter(); + private static final ColorFilter colorFilterGreenTint = createGreenTintColorFilter(); + private static final ColorFilter colorFilterBlueTint = createBlueTintColorFilter(); private final Size size; public final MapSection currentLayout; @@ -82,6 +85,9 @@ public final class LayeredTileMap { else if (colorFilter.equals("black80")) return colorFilterBlack80; else if (colorFilter.equals("invert")) return colorFilterInvert; else if (colorFilter.equals("bw")) return colorFilterBW; + else if (colorFilter.equals("redtint")) return colorFilterRedTint; + else if (colorFilter.equals("greentint")) return colorFilterGreenTint; + else if (colorFilter.equals("bluetint")) return colorFilterBlueTint; return null; } @@ -113,6 +119,33 @@ public final class LayeredTileMap { }); } + private static ColorMatrixColorFilter createRedTintColorFilter() { + return new ColorMatrixColorFilter(new float[] { + 1.20f, 0.20f, 0.20f, 0.0f, 25.0f, + 0.00f, 0.80f, 0.00f, 0.0f, 0.0f, + 0.00f, 0.00f, 0.80f, 0.0f, 0.0f, + 0.00f, 0.00f, 0.00f, 1.0f, 0.0f + }); + } + + private static ColorMatrixColorFilter createGreenTintColorFilter() { + return new ColorMatrixColorFilter(new float[] { + 0.85f, 0.00f, 0.00f, 0.0f, 0.0f, + 0.15f, 1.15f, 0.15f, 0.0f, 15.0f, + 0.00f, 0.00f, 0.85f, 0.0f, 0.0f, + 0.00f, 0.00f, 0.00f, 1.0f, 0.0f + }); + } + + private static ColorMatrixColorFilter createBlueTintColorFilter() { + return new ColorMatrixColorFilter(new float[] { + 0.70f, 0.00f, 0.00f, 0.0f, 0.0f, + 0.00f, 0.70f, 0.00f, 0.0f, 0.0f, + 0.30f, 0.30f, 1.30f, 0.0f, 40.0f, + 0.00f, 0.00f, 0.00f, 1.0f, 0.0f + }); + } + public String getCurrentLayoutHash() { return currentLayoutHash; }