Merge branch 'update-line-width-api' into 'master'

[FIX][SDK] remove method that tried to keep all lines at least 1 pixel wide

See merge request codingame/game-engine!262

Author: CodinGameCommunity

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

@@ -9,8 +9,8 @@
  */
 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;
+    private int lineColor = 0x0, fillColor = 0xffffff;
+    private double fillAlpha = 1, lineAlpha = 1, lineWidth = 0;
 
     Shape() {
         super();
@@ -150,7 +150,7 @@ public double getLineAlpha() {
      *            the width for the border of this <code>Shape</code>.
      * @return this <code>Shape</code>.
      */
-    public T setLineWidth(int lineWidth) {
+    public T setLineWidth(double lineWidth) {
         return setLineWidth(lineWidth, null);
     }
 
@@ -166,7 +166,7 @@ public T setLineWidth(int lineWidth) {
      *            the transition to animate between values of this property.
      * @return this <code>Shape</code>.
      */
-    public T setLineWidth(int lineWidth, Curve curve) {
+    public T setLineWidth(double lineWidth, Curve curve) {
         this.lineWidth = lineWidth;
         set("lineWidth", lineWidth, curve);
         return self();
@@ -175,11 +175,11 @@ public T setLineWidth(int lineWidth, Curve curve) {
     /**
      * Returns the width of the border of this <code>Shape</code> in world units.
      * <p>
-     * Default is 1.
+     * Default is 0.
      * 
      * @return the width of the border of this <code>Shape</code>.
      */
-    public int getLineWidth() {
+    public double getLineWidth() {
         return lineWidth;
     }
 

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

@@ -32,7 +32,7 @@ export class Circle extends Shape {
       if (state.fillColor !== null) {
         this.graphics.beginFill(state.fillColor, state.fillAlpha)
       }
-      this.graphics.lineStyle(globalData.atLeastOnePixel(state.lineWidth), state.lineColor)
+      this.graphics.lineStyle(state.lineWidth, state.lineColor)
       this.graphics.drawCircle(0, 0, state.radius * globalData.toWorldUnits)
       if (state.fillColor !== null) {
         this.graphics.endFill()

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

@@ -19,13 +19,7 @@ export class GraphicEntityModule {
       maskUpdates: {},
       updatedBuffers: [],
       players: [],
-      instanceCount: 0,
-      atLeastOnePixel: function (width) {
-        if (width > 0 && width < this.toPixel) {
-          return this.toPixel
-        }
-        return width
-      }
+      instanceCount: 0
     }
 
     api.entities = this.entities

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

@@ -24,7 +24,7 @@ export default class Line extends Shape {
       changed.x2 ||
       changed.y2) {
       this.graphics.clear()
-      this.graphics.lineStyle(globalData.atLeastOnePixel(state.lineWidth), state.lineColor, state.lineAlpha)
+      this.graphics.lineStyle(state.lineWidth, state.lineColor, state.lineAlpha)
       this.graphics.moveTo(0, 0)
       this.graphics.lineTo(-this.container.x + state.x2 * globalData.toWorldUnits, -this.container.y + state.y2 * globalData.toWorldUnits)
     }

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

@@ -25,7 +25,7 @@ export class Polygon extends Shape {
         this.graphics.beginFill(state.fillColor, state.fillAlpha)
       }
 
-      this.graphics.lineStyle(globalData.atLeastOnePixel(state.lineWidth), state.lineColor, state.lineAlpha)
+      this.graphics.lineStyle(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

@@ -32,7 +32,7 @@ export class Rectangle extends Shape {
         this.graphics.beginFill(state.fillColor, state.fillAlpha)
       }
 
-      this.graphics.lineStyle(globalData.atLeastOnePixel(state.lineWidth), state.lineColor, state.lineAlpha)
+      this.graphics.lineStyle(state.lineWidth, state.lineColor, state.lineAlpha)
       this.graphics.drawRect(0, 0, state.width * globalData.toWorldUnits, state.height * globalData.toWorldUnits)
       if (state.fillColor !== null) {
         this.graphics.endFill()

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

@@ -38,7 +38,7 @@ export class RoundedRectangle extends Shape {
         this.graphics.beginFill(state.fillColor, state.fillAlpha)
       }
 
-      this.graphics.lineStyle(globalData.atLeastOnePixel(state.lineWidth), state.lineColor, state.lineAlpha)
+      this.graphics.lineStyle(state.lineWidth, state.lineColor, state.lineAlpha)
       this.graphics.drawRoundedRect(0, 0,
         state.width * globalData.toWorldUnits,
         state.height * globalData.toWorldUnits,

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

@@ -33,7 +33,7 @@ export class Text extends TextureBasedEntity {
     this.graphics.text = state.text
     this.graphics.style.align = state.textAlign
     this.graphics.style.stroke = state.strokeColor
-    this.graphics.style.strokeThickness = globalData.atLeastOnePixel(state.strokeThickness)
+    this.graphics.style.strokeThickness = state.strokeThickness
     this.graphics.style.fill = state.fillColor
     this.graphics.style.fontSize = state.fontSize || 1
     this.graphics.style.fontFamily = state.fontFamily

playground/misc/misc-3-release-notes.md

@@ -8,6 +8,7 @@ The CodinGame SDK is regularly updated and improved. This document lets you know
 
 - Fixed choppy animation when launching games with a `stepByStepAnimateSpeed`
 - Fixed situations in which stepping through a game with a `stepByStepAnimateSpeed` would not be animated.
+- Remove faulty code that was supposed to ensure all lines were at least 1 pixel thick. User now has greater control over line thickness.
 
 ## 3.11.0