Merge branch '5140-sdk-shapes-should-have-a-blendmode-property' into 'master'

[FEAT][SDK] sdk shapes should have a blendmode property

See merge request codingame/game-engine!145

Author: Builder

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

@@ -0,0 +1,48 @@
+package com.codingame.gameengine.module.entities;
+
+public abstract class BlendableEntity<T extends Entity<?>> extends Entity<T> {
+    /**
+     * The list of supported PIXI blend modes and their associated constant.
+     * 
+     * @see <a href="http://pixijs.download/dev/docs/PIXI.html#.BLEND_MODES">PIXI BLEND_MODES</a>
+     */
+    public static enum BlendMode {
+        NORMAL(0), ADD(1), MULTIPLY(2), SCREEN(3);
+        private int value;
+
+        private BlendMode(int value) {
+            this.value = value;
+        }
+
+        private int getValue() {
+            return value;
+        }
+    }
+
+    private BlendMode blendMode;
+    
+    /**
+     * Returns the <code>BlendMode</code> this <code>TextureBasedEntity</code> is to be drawn with.
+     * 
+     * @see <a href="http://pixijs.download/dev/docs/PIXI.html#.BLEND_MODES">PIXI BLEND_MODES</a>
+     * @return the <code>BlendMode</code> this <code>TextureBasedEntity</code> is to be drawn with.
+     */
+    public BlendMode getBlendMode() {
+        return blendMode;
+    }
+
+    /**
+     * Sets the blend mode for this <code>TextureBasedEntity</code>.
+     * <p>
+     * The possible values are found in <code>BlendMode</code>.
+     * 
+     * @see <a href="http://pixijs.download/dev/docs/PIXI.html#.BLEND_MODES">PIXI BLEND_MODES</a>
+     * @param blendMode
+     * @return this <code>TextureBasedEntity</code>.
+     */
+    public T setBlendMode(BlendMode blendMode) {
+        this.blendMode = blendMode;
+        set("blendMode", blendMode.getValue(), null);
+        return self();
+    }
+}

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

@@ -7,7 +7,7 @@
  * @param <T>
  *            a subclass inheriting Entity, used in order to return <b>this</b> as a T instead of a Shape.
  */
-public abstract class Shape<T extends Entity<?>> extends Entity<T> implements Mask {
+public abstract class Shape<T extends BlendableEntity<?>> extends BlendableEntity<T> implements Mask {
 
     private int lineColor = 0x0, lineWidth = 0, fillColor = 0xffffff;
     private double fillAlpha = 1, lineAlpha = 1;

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

@@ -5,58 +5,17 @@
  *
  * @param <T> a subclass inheriting Entity, used in order to return <b>this</b> as a T instead of a <code>TextureBasedEntity</code>.
  */
-public abstract class TextureBasedEntity<T extends Entity<?>> extends Entity<T> {
+public abstract class TextureBasedEntity<T extends BlendableEntity<?>> extends BlendableEntity<T> {
 
-    /**
-     * The list of supported PIXI blend modes and their associated constant.
-     * 
-     * @see <a href="http://pixijs.download/dev/docs/PIXI.html#.BLEND_MODES">PIXI BLEND_MODES</a>
-     */
-    public static enum BlendMode {
-        NORMAL(0), ADD(1), MULTIPLY(2), SCREEN(3);
-        private int value;
-
-        private BlendMode(int value) {
-            this.value = value;
-        }
-
-        private int getValue() {
-            return value;
-        }
-    }
-
-    private BlendMode blendMode;
+   
     private double anchorX = 0, anchorY = 0;
     private int tint = 0xFFFFFF;
 
     TextureBasedEntity() {
         super();
     }
 
-    /**
-     * Returns the <code>BlendMode</code> this <code>TextureBasedEntity</code> is to be drawn with.
-     * 
-     * @see <a href="http://pixijs.download/dev/docs/PIXI.html#.BLEND_MODES">PIXI BLEND_MODES</a>
-     * @return the <code>BlendMode</code> this <code>TextureBasedEntity</code> is to be drawn with.
-     */
-    public BlendMode getBlendMode() {
-        return blendMode;
-    }
-
-    /**
-     * Sets the blend mode for this <code>TextureBasedEntity</code>.
-     * <p>
-     * The possible values are found in <code>BlendMode</code>.
-     * 
-     * @see <a href="http://pixijs.download/dev/docs/PIXI.html#.BLEND_MODES">PIXI BLEND_MODES</a>
-     * @param blendMode
-     * @return this <code>TextureBasedEntity</code>.
-     */
-    public T setBlendMode(BlendMode blendMode) {
-        this.blendMode = blendMode;
-        set("blendMode", blendMode.getValue(), null);
-        return self();
-    }
+    
 
     /**
      * Sets both the X and Y anchors of this <code>TextureBasedEntity</code> as a percentage of its width and height.

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

@@ -25,7 +25,8 @@ export class Shape extends Entity {
       lineWidth: Shape.defaultLineWidth(),
       lineColor: Shape.defaultLineColor(),
       fillAlpha: Shape.defaultFillAlpha(),
-      lineAlpha: Shape.defaultLineAlpha()
+      lineAlpha: Shape.defaultLineAlpha(),
+      blendMode: PIXI.BLEND_MODES.NORMAL
     })
   }
 
@@ -40,5 +41,6 @@ export class Shape extends Entity {
 
   updateDisplay (state, changed, globalData) {
     super.updateDisplay(state, changed, globalData)
+    this.graphics.blendMode = state.blendMode
   }
 }