From 0a382d10b5d12a8bf1f86553306c5f70b62a98dc Mon Sep 17 00:00:00 2001
From: Collin Smith <collinsmith70@gmail.com>
Date: Mon, 4 Mar 2019 01:16:22 -0800
Subject: [PATCH] Added bordered drawable

---
 .../BorderedPaletteIndexedDrawable.java       | 89 +++++++++++++++++++
 core/src/gdx/diablo/widget/NpcMenu.java       |  6 +-
 2 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 core/src/gdx/diablo/graphics/BorderedPaletteIndexedDrawable.java

diff --git a/core/src/gdx/diablo/graphics/BorderedPaletteIndexedDrawable.java b/core/src/gdx/diablo/graphics/BorderedPaletteIndexedDrawable.java
new file mode 100644
index 00000000..d3218689
--- /dev/null
+++ b/core/src/gdx/diablo/graphics/BorderedPaletteIndexedDrawable.java
@@ -0,0 +1,89 @@
+package gdx.diablo.graphics;
+
+import com.badlogic.gdx.assets.AssetDescriptor;
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+
+import gdx.diablo.Diablo;
+import gdx.diablo.codec.DC6;
+import gdx.diablo.loader.DC6Loader;
+
+public class BorderedPaletteIndexedDrawable extends PaletteIndexedColorDrawable {
+
+  static final AssetDescriptor<DC6> boxpiecesDescriptor = new AssetDescriptor<>("data\\global\\ui\\MENU\\boxpieces.DC6", DC6.class, DC6Loader.DC6Parameters.COMBINE);
+  DC6 boxpieces;
+
+  static final float X_INC = 12;
+  static final float Y_INC = 12;
+
+  //static final int[] LEFT   = { 10, 11, 12 };
+  //static final int[] RIGHT  = { 13, 14, 15 };
+  //static final int[] TOP    = { 2, 3, 4, 5, 6, 7 };
+  //static final int[] BOTTOM = { 16, 17, 18, 19, 20, 21 };
+
+  TextureRegion TOPLEFT, TOPRIGHT, BOTTOMLEFT, BOTTOMRIGHT;
+  TextureRegion LEFT[], RIGHT[], TOP[], BOTTOM[];
+
+  private static final float PADDING = 4;
+
+  public BorderedPaletteIndexedDrawable() {
+    super(Diablo.colors.modal75);
+
+    setLeftWidth(PADDING);
+    setTopHeight(PADDING);
+    setRightWidth(PADDING);
+    setBottomHeight(PADDING);
+
+    // FIXME: memory leak
+    Diablo.assets.load(boxpiecesDescriptor);
+  }
+
+  @Override
+  public void draw(Batch batch, float x, float y, float width, float height) {
+    super.draw(batch, x, y, width, height);
+    if (!(batch instanceof PaletteIndexedBatch)) {
+      return;
+    } else if (boxpieces == null) {
+      if (!Diablo.assets.isLoaded(boxpiecesDescriptor)) return;
+      boxpieces = Diablo.assets.get(boxpiecesDescriptor);
+      TOPLEFT     = boxpieces.getTexture(0);
+      TOPRIGHT    = boxpieces.getTexture(1);
+      BOTTOMLEFT  = boxpieces.getTexture(8);
+      BOTTOMRIGHT = boxpieces.getTexture(9);
+      LEFT   = new TextureRegion[] { boxpieces.getTexture(10), boxpieces.getTexture(11), boxpieces.getTexture(12) };
+      RIGHT  = new TextureRegion[] { boxpieces.getTexture(13), boxpieces.getTexture(14), boxpieces.getTexture(15) };
+      TOP    = new TextureRegion[] { boxpieces.getTexture(2 ), boxpieces.getTexture(3 ), boxpieces.getTexture(4 ),
+                                     boxpieces.getTexture(5 ), boxpieces.getTexture(6 ), boxpieces.getTexture(7 ) };
+      BOTTOM = new TextureRegion[] { boxpieces.getTexture(16), boxpieces.getTexture(17), boxpieces.getTexture(18),
+                                     boxpieces.getTexture(19), boxpieces.getTexture(20), boxpieces.getTexture(21) };
+    }
+
+    PaletteIndexedBatch b = (PaletteIndexedBatch) batch;
+
+    int i = 0, j = 0;
+    float tmpX = x + X_INC;
+    while (tmpX < x + width - TOPRIGHT.getRegionWidth()) {
+      if (i == TOP.length) i = 0;
+      b.draw(TOP[i++], tmpX, y + height - boxpieces.getTexture(0).getRegionHeight());
+      if (j == BOTTOM.length) j = 0;
+      b.draw(BOTTOM[j++], tmpX, y - 9);
+      tmpX += X_INC;
+    }
+
+    i = 0;
+    j = 0;
+    float tmpY = y + Y_INC;
+    while (tmpY < y + height - TOPLEFT.getRegionHeight()) {
+      if (i == LEFT.length) i = 0;
+      b.draw(LEFT[i++], x - 4, tmpY);
+      if (j == RIGHT.length) j = 0;
+      b.draw(RIGHT[j++], x + width - 9, tmpY);
+      tmpY += Y_INC;
+    }
+
+    b.draw(TOPLEFT, x, y + height - TOPLEFT.getRegionHeight());
+    b.draw(TOPRIGHT, x + width - TOPRIGHT.getRegionWidth(), y + height - TOPRIGHT.getRegionHeight());
+    b.draw(BOTTOMLEFT, x, y);
+    b.draw(BOTTOMRIGHT, x + width - BOTTOMRIGHT.getRegionWidth(), y);
+  }
+}
diff --git a/core/src/gdx/diablo/widget/NpcMenu.java b/core/src/gdx/diablo/widget/NpcMenu.java
index d42cb605..7e28c0ee 100644
--- a/core/src/gdx/diablo/widget/NpcMenu.java
+++ b/core/src/gdx/diablo/widget/NpcMenu.java
@@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 
 import gdx.diablo.Diablo;
 import gdx.diablo.entity.Entity;
-import gdx.diablo.graphics.PaletteIndexedColorDrawable;
+import gdx.diablo.graphics.BorderedPaletteIndexedDrawable;
 import gdx.diablo.screen.GameScreen;
 
 public class NpcMenu extends Table {
@@ -24,7 +24,7 @@ public class NpcMenu extends Table {
     parent = null;
     this.owner = owner;
     this.gameScreen = gameScreen;
-    setBackground(new PaletteIndexedColorDrawable(Diablo.colors.modal50));
+    setBackground(new BorderedPaletteIndexedDrawable());
     pad(PADDING);
     add(new Label(header, Diablo.fonts.font16) {{
       setColor(Diablo.colors.gold);
@@ -32,7 +32,7 @@ public class NpcMenu extends Table {
   }
 
   public NpcMenu(int id) {
-    setBackground(new PaletteIndexedColorDrawable(Diablo.colors.modal50));
+    setBackground(new BorderedPaletteIndexedDrawable());
     pad(PADDING);
     add(new Label(id, Diablo.fonts.font16, Diablo.colors.gold)).space(SPACING).row();
   }