Merge branch 'polygons' into 'master'

feat(sdk): New Shape: Polygons

See merge request codingame/game-engine!189

Author: Builder

.gitignore

@@ -1,3 +1,4 @@
+.factorypath
 target/
 .settings
 .classpath

engine/modules/entities/src/main/java/com/codingame/gameengine/module/entities/Entity.java

@@ -23,7 +23,7 @@ public abstract class Entity<T extends Entity<?>> {
     Mask mask;
 
     static enum Type {
-        CIRCLE, LINE, RECTANGLE, SPRITE, TEXT, BITMAPTEXT, GROUP, BUFFERED_GROUP, SPRITEANIMATION, ROUNDED_RECTANGLE
+        CIRCLE, LINE, RECTANGLE, SPRITE, TEXT, BITMAPTEXT, GROUP, BUFFERED_GROUP, SPRITEANIMATION, ROUNDED_RECTANGLE, POLYGON
     }
 
     Entity() {

engine/modules/entities/src/main/java/com/codingame/gameengine/module/entities/GraphicEntityModule.java

@@ -26,8 +26,6 @@
 @Singleton
 public class GraphicEntityModule implements Module {
 
-    //JAVA
-    //TODO: masks
     //TODO: extra properties for Texts (text wrapping, alignement, ...)
 
     static int ENTITY_COUNT = 0;
@@ -276,6 +274,17 @@ public RoundedRectangle createRoundedRectangle() {
         newEntity(c);
         return c;
     }
+    
+    /**
+     * Creates a new Polygon entity, its graphical counterpart will be created on the frame currently being computed.
+     * 
+     * @return the entity. Modify its properties to animate the graphical counterpart.
+     */
+    public Polygon createPolygon() {
+        Polygon c = new Polygon();
+        newEntity(c);
+        return c;
+    }
 
     /**
      * Creates a new Text entity, its graphical counterpart will be created on the frame currently being computed.

engine/modules/entities/src/main/java/com/codingame/gameengine/module/entities/Polygon.java

@@ -0,0 +1,76 @@
+package com.codingame.gameengine.module.entities;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * A Polygon specifies an area in a the <code>world</code> defined by a sequence of points.
+ * </p>
+ * The coordinates of each point are in world units.
+ */
+public class Polygon extends Shape<Polygon> {
+
+    private static class Point {
+        int x, y;
+
+        public Point(int x, int y) {
+            this.x = x;
+            this.y = y;
+        }
+
+    }
+
+    private List<Point> points = new ArrayList<>();
+
+    Polygon() {
+        super();
+    }
+
+    /**
+     * Adds a point to the path of this <code>Polygon</code>.
+     * 
+     * @param x
+     *            the x coordinate in world units
+     * @param y
+     *            the x coordinate in world units
+     * @return this <code>Polygon</code>
+     */
+    public Polygon addPoint(int x, int y) {
+        points.add(new Point(x, y));
+        set("points", asString(points));
+        return this;
+    }
+
+    /**
+     * Clears the path of this <code>Polygon</code>.
+     * 
+     * @return this <code>Polygon</code>
+     */
+    public Polygon clearPoints() {
+        points.clear();
+        set("points", asString(points));
+        return this;
+    }
+
+    /**
+     * Sets the transition used to animate the positions of each point. Only used if the path has the same number of points.
+     * @param curve
+     *            the transition to animate between coordinates of each point in the path.
+     * @return this <code>Polygon</code>
+     */
+    public Polygon setPointsInterpolationCurve(Curve curve) {
+        set("points", asString(points), curve);
+        return this;
+    }
+
+    private String asString(List<Point> points) {
+        return points.stream().map(p -> p.x + "," + p.y).collect(Collectors.joining(","));
+    }
+
+    @Override
+    Entity.Type getType() {
+        return Entity.Type.POLYGON;
+    }
+}

engine/modules/entities/src/main/java/com/codingame/gameengine/module/entities/Serializer.java

@@ -65,6 +65,7 @@ class Serializer {
         keys.put("duration", "d");
         keys.put("baseWidth", "bw");
         keys.put("baseHeight", "bh");
+        keys.put("points", "ps");
 
         commands = new HashMap<>();
         commands.put("CREATE", "C");
@@ -96,6 +97,7 @@ class Serializer {
         types.put(Type.TEXT, "T");
         types.put(Type.BITMAPTEXT, "X");
         types.put(Type.SPRITEANIMATION, "A");
+        types.put(Type.POLYGON, "P");
 
         if (keys.values().stream().distinct().count() != keys.values().size()) {
             throw new RuntimeException("Duplicate keys");

engine/modules/entities/src/main/resources/view/entity-module/Command.js

@@ -40,7 +40,8 @@ const PROPERTY_KEY_MAP = {
   l: 'loop',
   d: 'duration',
   bw: 'baseWidth',
-  bh: 'baseHeight'
+  bh: 'baseHeight',
+  ps: 'points'
 }
 
 export class CreateCommand {

engine/modules/entities/src/main/resources/view/entity-module/EntityFactory.js

@@ -8,6 +8,7 @@ import { Group } from './Group.js'
 import { BufferedGroup } from './BufferedGroup.js'
 import { SpriteAnimation } from './SpriteAnimation.js'
 import { RoundedRectangle } from './RoundedRectangle.js';
+import { Polygon } from './Polygon.js';
 
 export class EntityFactory {
   static create (type) {
@@ -21,7 +22,8 @@ export class EntityFactory {
       G: Group,
       B: BufferedGroup,
       A: SpriteAnimation,
-      K: RoundedRectangle
+      K: RoundedRectangle,
+      P: Polygon
     }[type]
     if (!EntityClass) {
       throw new Error('Exception: entity type not found: ' + type)

engine/modules/entities/src/main/resources/view/entity-module/Polygon.js

@@ -0,0 +1,35 @@
+import { Shape } from './Shape.js'
+
+export class Polygon extends Shape {
+  constructor () {
+    super()
+    Object.assign(this.defaultState, {
+      points: []
+    })
+  }
+
+  initDisplay () {
+    super.initDisplay()
+    this.graphics.endFill()
+  }
+
+  updateDisplay (state, changed, globalData) {
+    super.updateDisplay(state, changed, globalData)
+    if (changed.lineWidth ||
+      changed.lineColor ||
+      changed.lineAlpha ||
+      changed.fillColor ||
+      changed.points) {
+      this.graphics.clear()
+      if (state.fillColor !== null) {
+        this.graphics.beginFill(state.fillColor, state.fillAlpha)
+      }
+
+      this.graphics.lineStyle(globalData.atLeastOnePixel(state.lineWidth), state.lineColor, state.lineAlpha)
+      this.graphics.drawPolygon(state.points.map(coord => coord * globalData.toWorldUnits))
+      if (state.fillColor !== null) {
+        this.graphics.endFill()
+      }
+    }
+  }
+}

engine/modules/entities/src/main/resources/view/entity-module/Rectangle.js

@@ -25,7 +25,6 @@ export class Rectangle extends Shape {
       changed.width ||
       changed.height ||
       changed.lineAlpha ||
-      changed.fillColor ||
       changed.fillColor) {
       this.graphics.clear()
       if (state.fillColor !== null) {

engine/modules/entities/src/main/resources/view/entity-module/RoundedRectangle.js

@@ -37,8 +37,8 @@ export class RoundedRectangle extends Shape {
       }
 
       this.graphics.lineStyle(globalData.atLeastOnePixel(state.lineWidth), state.lineColor, state.lineAlpha)
-      this.graphics.drawRoundedRect(0, 0, 
-        state.width * globalData.toWorldUnits, 
+      this.graphics.drawRoundedRect(0, 0,
+        state.width * globalData.toWorldUnits,
         state.height * globalData.toWorldUnits,
         state.radius * globalData.toWorldUnits)
       if (state.fillColor !== null) {