Merge branch 'develop'

AbstractPlay · Apr 21, 2024 · cf899da · cf899da
2 parents 9abf5ce + 0a0a7f9
commit cf899da
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/renderers/_base.ts b/src/renderers/_base.ts
@@ -5019,7 +5019,10 @@ export abstract class RendererBase {
                             colour = marker.colour as string;
                         }
                     }
-                    const opacity = baseOpacity + ((1 - baseOpacity) / 2);
+                    let opacity = baseOpacity + ((1 - baseOpacity) / 2);
+                    if ( ("opacity" in marker) && (marker.opacity !== undefined) ) {
+                        opacity = marker.opacity as number;
+                    }
                     const style = this.json.board.style;
                     if ( (style === "vertex") || (style === "vertex-cross") || (style === "go") || (style.startsWith("conhex")) ) {
                         let xFrom = 0; let yFrom = 0;

diff --git a/src/schemas/schema.d.ts b/src/schemas/schema.d.ts
@@ -537,6 +537,7 @@ export interface APRenderRep {
                * The colour of the shaded area. Can be either a number (which will be interpreted as a built-in player colour) or a hexadecimal colour string.
                */
               colour: PositiveInteger | Colourstrings;
+              opacity?: number;
             }
           | {
               /**

diff --git a/src/schemas/schema.json b/src/schemas/schema.json
@@ -903,6 +903,12 @@
                                                     {"$ref": "#/definitions/positiveInteger"},
                                                     {"$ref": "#/definitions/colourstrings"}
                                                 ]
+                                            },
+                                            "opacity": {
+                                                "type": "number",
+                                                "minimum": 0,
+                                                "maximum": 1,
+                                                "default": 1
                                             }
                                         },
                                         "required": ["type", "edge", "colour"],
-Original file line number
+Diff line change
@@ Expand Up / @@ -537,6 +537,7 @@ export interface APRenderRep { @@
                    * The colour of the shaded area. Can be either a number (which will be interpreted as a built-in player colour) or a hexadecimal colour string.
                    */
                   colour: PositiveInteger | Colourstrings;
+                  opacity?: number;
                 }
               | {
                   /**
@@ Expand Down @@