v0.2.3

IcculusC · Oct 18, 2018 · 4cf9ad3 · 4cf9ad3
1 parent ba7a90a
commit 4cf9ad3
Show file tree

Hide file tree

Showing 5 changed files with 270 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-hex-engine",
   "description": "Hexagon Map Editor and Game Engine",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "main": "lib/index.js",
   "author": "IcculusC",
   "repository": "IcculusC/react-hex-engine",

diff --git a/src/HexUtils.js b/src/HexUtils.js
@@ -3,12 +3,12 @@ import Point from "./models/Point";
 
 class HexUtils {
   static DIRECTIONS = [
-    new Hex(1, 0, -1),
-    new Hex(1, -1, 0),
-    new Hex(0, -1, 1),
-    new Hex(-1, 0, 1),
-    new Hex(-1, 1, 0),
-    new Hex(0, 1, -1)
+    new Hex(1, 0),
+    new Hex(1, -1),
+    new Hex(0, -1),
+    new Hex(-1, 0),
+    new Hex(-1, 1),
+    new Hex(0, 1)
   ];
 
   static equals(a, b) {

diff --git a/src/Hexagon.js b/src/Hexagon.js
@@ -69,8 +69,8 @@ class Hexagon extends Component {
 
   static getDerivedStateFromProps(nextProps, prevState) {
     if (prevState.points !== nextProps.points) {
-      const { layout, points, q, r, s } = nextProps;
-      const hex = new Hex(q, r, s);
+      const { layout, points, q, r } = nextProps;
+      const hex = new Hex(q, r);
       const pixel = HexUtils.hexToPixel(hex, nextProps.layout);
       return { hex, pixel, layout, points };
     }
@@ -87,7 +87,7 @@ class Hexagon extends Component {
 
   constructor(props) {
     super(props);
-    const hex = new Hex(props.q, props.r, props.s);
+    const hex = new Hex(props.q, props.r);
     const pixel = HexUtils.hexToPixel(hex, props.layout);
     this.state = {
       ...this.state,

diff --git a/src/models/Hex.js b/src/models/Hex.js
@@ -2,8 +2,18 @@ class Hex {
   constructor(q, r, s, meta = {}) {
     this.q = q;
     this.r = r;
-    this.s = s;
-    this.meta = {};
+    if (s !== undefined) {
+      if (typeof s === "number") {
+        this.s = s;
+        this.meta = meta;
+      } else if (typeof s === "object") {
+        this.s = -q - r;
+        this.meta = s;
+      }
+    } else {
+      this.s = -q - r;
+      this.meta = {};
+    }
   }
 
   toString() {
@@ -17,8 +27,8 @@ class Hex {
   }
 
   static fromJSON(obj) {
-    const { meta, q, r, s } = obj;
-    return new Hex(q, r, s, meta);
+    const { meta, q, r } = obj;
+    return new Hex(q, r, meta);
   }
 }
 

diff --git a/test/src/HexUtils.test.js b/test/src/HexUtils.test.js
@@ -1,4 +1,6 @@
 import HexUtils from "../../src/HexUtils";
+import Hex from "../../src/models/Hex";
+import Orientation from "../../src/models/Orientation";
 
 const hex1 = { q: 0, r: 0, s: 0 };
 const hex2 = { q: 0, r: -2, s: 2 };
@@ -26,6 +28,250 @@ const layout = {
   }
 };
 
+const map = {
+  "-2,0,2": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: -2,
+    r: 0,
+    s: 2,
+    tile: "empty"
+  },
+  "-2,1,1": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: true
+    },
+    q: -2,
+    r: 1,
+    s: 1,
+    tile: "empty"
+  },
+  "-2,2,0": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: -2,
+    r: 2,
+    s: 0,
+    tile: "empty"
+  },
+  "-1,-1,2": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: -1,
+    r: -1,
+    s: 2,
+    tile: "empty"
+  },
+  "-1,0,1": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: -1,
+    r: 0,
+    s: 1,
+    tile: "empty"
+  },
+  "-1,1,0": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: -1,
+    r: 1,
+    s: 0,
+    tile: "empty"
+  },
+  "-1,2,-1": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: -1,
+    r: 2,
+    s: -1,
+    tile: "empty"
+  },
+  "0,-2,2": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: 0,
+    r: -2,
+    s: 2,
+    tile: "empty"
+  },
+  "0,-1,1": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: 0,
+    r: -1,
+    s: 1,
+    tile: "empty"
+  },
+  "0,0,0": {
+    meta: {
+      hoverable: false,
+      replaceable: false,
+      selectable: false,
+      selected: false
+    },
+    q: 0,
+    r: 0,
+    s: 0,
+    tile: "colony"
+  },
+  "0,1,-1": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: 0,
+    r: 1,
+    s: -1,
+    tile: "empty"
+  },
+  "0,2,-2": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: 0,
+    r: 2,
+    s: -2,
+    tile: "empty"
+  },
+  "1,-2,1": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: 1,
+    r: -2,
+    s: 1,
+    tile: "empty"
+  },
+  "1,-1,0": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: 1,
+    r: -1,
+    s: 0,
+    tile: "empty"
+  },
+  "1,0,-1": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: 1,
+    r: 0,
+    s: -1,
+    tile: "empty"
+  },
+  "1,1,-2": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: 1,
+    r: 1,
+    s: -2,
+    tile: "empty"
+  },
+  "2,-2,0": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: 2,
+    r: -2,
+    s: 0,
+    tile: "empty"
+  },
+  "2,-1,-1": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: 2,
+    r: -1,
+    s: -1,
+    tile: "empty"
+  },
+  "2,0,-2": {
+    meta: {
+      hoverable: true,
+      replaceable: true,
+      selectable: true,
+      selected: false
+    },
+    q: 2,
+    r: 0,
+    s: -2,
+    tile: "empty"
+  }
+};
+
+const checkLayout = {
+  spacing: 1.05,
+  orientation: Orientation.Pointy,
+  size: {
+    x: 10,
+    y: 10
+  },
+  origin: {
+    x: 0,
+    y: 0
+  }
+};
+
 test("HexUtils.equals should work", () => {
   expect(HexUtils.equals(hex1, hex1)).toBe(true);
   expect(HexUtils.equals(hex1, hex2)).toBe(false);