Merge branch 'enable-bold-text' into 'master'

[FEAT][SDK] Enable bold text

See merge request codingame/game-engine!143

Author: Builder

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

@@ -48,6 +48,7 @@ class Serializer {
         keys.put("strokeColor", "sc");
         keys.put("fontFamily", "ff");
         keys.put("fontSize", "s");
+        keys.put("fontWeight", "fw");
         keys.put("text", "T");
         keys.put("children", "ch");
         keys.put("scaleX", "sx");

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

@@ -7,12 +7,25 @@
  */
 public class Text extends TextureBasedEntity<Text> {
 
+    /**
+     * The list of supported font weights.
+     * 
+     */
+    public static enum FontWeight {
+        NORMAL, BOLD, BOLDER, LIGHTER;
+
+        public String toString() {
+            return name().toLowerCase();
+        }
+    }
+
     private String text = "";
     private int strokeColor = 0;
     private double strokeThickness = 0;
     private int fillColor = 0;
     private int fontSize = 26;
     private String fontFamily = "Lato";
+    private FontWeight fontWeight = FontWeight.NORMAL;
 
     Text() {
         super();
@@ -132,6 +145,29 @@ public Text setStrokeThickness(double strokeThickness, Curve curve) {
         set("strokeThickness", strokeThickness, curve);
         return this;
     }
+    /**
+     * Sets the weight of the font of this <code>Text</code>.
+     * 
+     * @param style
+     *            the FontWeight of the <code>Text</code>.
+     * @return this <code>Text</code>.
+     */
+    public Text setFontWeight(FontWeight weight) {
+        this.fontWeight = weight;
+        set("fontWeight", weight.toString());
+        return this;
+    }
+
+    /**
+     * Returns the weight of the font of this <code>Text</code>.
+     * <p>
+     * Default is NORMAL.
+     * 
+     * @return the weight of the font of this <code>Text</code>.
+     */
+    public FontWeight getFontWeight() {
+        return this.fontWeight;
+    }
 
     /**
      * Returns the color of the fill of this <code>Text</code> as an RGB integer.

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

@@ -24,6 +24,7 @@ const PROPERTY_KEY_MAP = {
   sc: 'strokeColor',
   ff: 'fontFamily',
   s: 'fontSize',
+  fw: 'fontWeight',
   T: 'text',
   ch: 'children',
   sx: 'scaleX',

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

@@ -11,7 +11,8 @@ export class Text extends TextureBasedEntity {
       strokeThickness: 0,
       fillColor: 0,
       fontSize: 26,
-      fontFamily: 'Lato'
+      fontFamily: 'Lato',
+      fontWeight: 'normal'
     })
   }
 
@@ -33,5 +34,6 @@ export class Text extends TextureBasedEntity {
     this.graphics.style.fill = state.fillColor
     this.graphics.style.fontSize = state.fontSize || 1
     this.graphics.style.fontFamily = state.fontFamily
+    this.graphics.style.fontWeight = state.fontWeight
   }
 }

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

@@ -102,6 +102,7 @@ export const PROPERTIES = {
     }
   },
   fontFamily: stringOpts,
+  fontWeight: stringOpts,
   children: {
     ...stringOpts,
     convert (value) {