ttpg-darrell 1.0.3 → 1.0.4

package/build/cjs/layout/layout-objects.d.ts

@@ -1,4 +1,5 @@
 import { StaticObject, Vector } from "@tabletop-playground/api";
+import { TriggerableMulticastDelegate } from "../triggerable-multicast-delegate/triggerable-multicast-delegate";
 export type LayoutObjectsSize = {
     w: number;
     h: number;
@@ -12,6 +13,7 @@ export declare class LayoutObjects {
     private _overrideHeight;
     private _overrideWidth;
     private _layoutCenter;
+    readonly afterLayout: TriggerableMulticastDelegate<unknown>;
     constructor();
     setChildDistanace(value: number): this;
     setHorizontalAlignment(value: number): this;
@@ -20,6 +22,7 @@ export declare class LayoutObjects {
     setOverrideHeight(value: number): this;
     setOverrideWidth(value: number): this;
     add(item: StaticObject | LayoutObjects): this;
+    flip(flipH: boolean, flipV: boolean): this;
     /**
      * Get size of self, applying any overrides.
      *

package/build/cjs/layout/layout-objects.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayoutObjects = void 0;
 const api_1 = require("@tabletop-playground/api");
+const triggerable_multicast_delegate_1 = require("../triggerable-multicast-delegate/triggerable-multicast-delegate");
 class LayoutObjects {
     constructor() {
         this._children = [];
@@ -12,6 +13,7 @@ class LayoutObjects {
         this._overrideHeight = 0;
         this._overrideWidth = 0;
         this._layoutCenter = new api_1.Vector(0, 0, 0);
+        this.afterLayout = new triggerable_multicast_delegate_1.TriggerableMulticastDelegate();
     }
     setChildDistanace(value) {
         this._childDistance = value;
@@ -42,6 +44,36 @@ class LayoutObjects {
         this._children.push(item);
         return this;
     }
+    flip(flipH, flipV) {
+        // Children.
+        if ((flipH && !this._isVertical) || (flipV && this._isVertical)) {
+            this._children.reverse();
+        }
+        // Layout.
+        if (flipH) {
+            if (this._horizontalAlignment === api_1.HorizontalAlignment.Left) {
+                this._horizontalAlignment = api_1.HorizontalAlignment.Right;
+            }
+            else if (this._horizontalAlignment === api_1.HorizontalAlignment.Right) {
+                this._horizontalAlignment = api_1.HorizontalAlignment.Left;
+            }
+        }
+        if (flipV) {
+            if (this._verticalAlignment === api_1.VerticalAlignment.Top) {
+                this._verticalAlignment = api_1.VerticalAlignment.Bottom;
+            }
+            else if (this._verticalAlignment === api_1.VerticalAlignment.Bottom) {
+                this._verticalAlignment = api_1.VerticalAlignment.Top;
+            }
+        }
+        // Recurse.
+        for (const child of this._children) {
+            if (child instanceof LayoutObjects) {
+                child.flip(flipH, flipV);
+            }
+        }
+        return this;
+    }
     /**
      * Get size of self, applying any overrides.
      *
@@ -101,34 +133,60 @@ class LayoutObjects {
     }
     doLayoutAtPoint(center, yaw) {
         this._layoutCenter = center;
-        const size = this.calculateSize();
+        const overrideSize = this.calculateSize();
         const childrenSize = this.calculateChildrenSize();
+        // Position accounting for override size.
         let padLeft;
+        let padTop;
         if (this._horizontalAlignment === api_1.HorizontalAlignment.Left) {
             padLeft = 0;
         }
         else if (this._horizontalAlignment === api_1.HorizontalAlignment.Right) {
-            padLeft = size.w - childrenSize.w;
+            padLeft = overrideSize.w - childrenSize.w;
         }
         else {
-            padLeft = (size.w - childrenSize.w) / 2; // center (even if "Fill")
+            padLeft = (overrideSize.w - childrenSize.w) / 2; // center (even if "Fill")
         }
-        let padTop;
         if (this._verticalAlignment === api_1.VerticalAlignment.Top) {
             padTop = 0;
         }
         else if (this._verticalAlignment === api_1.VerticalAlignment.Bottom) {
-            padTop = size.w - childrenSize.w;
+            padTop = overrideSize.h - childrenSize.h;
         }
         else {
-            padTop = (size.w - childrenSize.w) / 2; // center (even if "Fill")
+            padTop = (overrideSize.h - childrenSize.h) / 2; // center (even if "Fill")
         }
-        let left = -size.w / 2 + padLeft;
-        let top = -size.h / 2 + padTop;
+        let left = -overrideSize.w / 2 + padLeft;
+        let top = overrideSize.h / 2 - padTop;
         for (const child of this._children) {
             const childSize = LayoutObjects._calculateChildSize(child);
+            // Apply layout in row/col.
+            padLeft = 0;
+            padTop = 0;
+            if (this._isVertical) {
+                if (this._horizontalAlignment === api_1.HorizontalAlignment.Left) {
+                    padLeft = 0;
+                }
+                else if (this._horizontalAlignment === api_1.HorizontalAlignment.Right) {
+                    padLeft = childrenSize.w - childSize.w;
+                }
+                else {
+                    padLeft = (childrenSize.w - childSize.w) / 2; // center (even if "Fill")
+                }
+            }
+            else {
+                if (this._verticalAlignment === api_1.VerticalAlignment.Top) {
+                    padTop = 0;
+                }
+                else if (this._verticalAlignment === api_1.VerticalAlignment.Bottom) {
+                    padTop = childrenSize.h - childSize.h;
+                }
+                else {
+                    padTop = (childrenSize.h - childSize.h) / 2; // center (even if "Fill")
+                }
+            }
             // Calculate child center (world).
-            const childCenter = new api_1.Vector(top + childSize.h / 2, left + childSize.w / 2, 0)
+            const childCenter = new api_1.Vector(top - childSize.h / 2 - padTop, left + childSize.w / 2 + padLeft, 0)
                 .rotateAngleAxis(yaw, [0, 0, 1])
                 .add(center);
             // Position child.
@@ -141,12 +199,13 @@ class LayoutObjects {
             }
             // Move "cursor" to next open spot top-left.
             if (this._isVertical) {
-                top += childSize.h + this._childDistance;
+                top -= childSize.h + this._childDistance;
             }
             else {
                 left += childSize.w + this._childDistance;
             }
         }
+        this.afterLayout.trigger();
         return this;
     }
     getCenter() {

package/build/esm/layout/layout-objects.d.ts

@@ -1,4 +1,5 @@
 import { StaticObject, Vector } from "@tabletop-playground/api";
+import { TriggerableMulticastDelegate } from "../triggerable-multicast-delegate/triggerable-multicast-delegate";
 export type LayoutObjectsSize = {
     w: number;
     h: number;
@@ -12,6 +13,7 @@ export declare class LayoutObjects {
     private _overrideHeight;
     private _overrideWidth;
     private _layoutCenter;
+    readonly afterLayout: TriggerableMulticastDelegate<unknown>;
     constructor();
     setChildDistanace(value: number): this;
     setHorizontalAlignment(value: number): this;
@@ -20,6 +22,7 @@ export declare class LayoutObjects {
     setOverrideHeight(value: number): this;
     setOverrideWidth(value: number): this;
     add(item: StaticObject | LayoutObjects): this;
+    flip(flipH: boolean, flipV: boolean): this;
     /**
      * Get size of self, applying any overrides.
      *

package/build/esm/layout/layout-objects.js

@@ -1,4 +1,5 @@
 import { HorizontalAlignment, StaticObject, Vector, VerticalAlignment, } from "@tabletop-playground/api";
+import { TriggerableMulticastDelegate } from "../triggerable-multicast-delegate/triggerable-multicast-delegate";
 export class LayoutObjects {
     constructor() {
         this._children = [];
@@ -9,6 +10,7 @@ export class LayoutObjects {
         this._overrideHeight = 0;
         this._overrideWidth = 0;
         this._layoutCenter = new Vector(0, 0, 0);
+        this.afterLayout = new TriggerableMulticastDelegate();
     }
     setChildDistanace(value) {
         this._childDistance = value;
@@ -39,6 +41,36 @@ export class LayoutObjects {
         this._children.push(item);
         return this;
     }
+    flip(flipH, flipV) {
+        // Children.
+        if ((flipH && !this._isVertical) || (flipV && this._isVertical)) {
+            this._children.reverse();
+        }
+        // Layout.
+        if (flipH) {
+            if (this._horizontalAlignment === HorizontalAlignment.Left) {
+                this._horizontalAlignment = HorizontalAlignment.Right;
+            }
+            else if (this._horizontalAlignment === HorizontalAlignment.Right) {
+                this._horizontalAlignment = HorizontalAlignment.Left;
+            }
+        }
+        if (flipV) {
+            if (this._verticalAlignment === VerticalAlignment.Top) {
+                this._verticalAlignment = VerticalAlignment.Bottom;
+            }
+            else if (this._verticalAlignment === VerticalAlignment.Bottom) {
+                this._verticalAlignment = VerticalAlignment.Top;
+            }
+        }
+        // Recurse.
+        for (const child of this._children) {
+            if (child instanceof LayoutObjects) {
+                child.flip(flipH, flipV);
+            }
+        }
+        return this;
+    }
     /**
      * Get size of self, applying any overrides.
      *
@@ -98,34 +130,60 @@ export class LayoutObjects {
     }
     doLayoutAtPoint(center, yaw) {
         this._layoutCenter = center;
-        const size = this.calculateSize();
+        const overrideSize = this.calculateSize();
         const childrenSize = this.calculateChildrenSize();
+        // Position accounting for override size.
         let padLeft;
+        let padTop;
         if (this._horizontalAlignment === HorizontalAlignment.Left) {
             padLeft = 0;
         }
         else if (this._horizontalAlignment === HorizontalAlignment.Right) {
-            padLeft = size.w - childrenSize.w;
+            padLeft = overrideSize.w - childrenSize.w;
         }
         else {
-            padLeft = (size.w - childrenSize.w) / 2; // center (even if "Fill")
+            padLeft = (overrideSize.w - childrenSize.w) / 2; // center (even if "Fill")
         }
-        let padTop;
         if (this._verticalAlignment === VerticalAlignment.Top) {
             padTop = 0;
         }
         else if (this._verticalAlignment === VerticalAlignment.Bottom) {
-            padTop = size.w - childrenSize.w;
+            padTop = overrideSize.h - childrenSize.h;
         }
         else {
-            padTop = (size.w - childrenSize.w) / 2; // center (even if "Fill")
+            padTop = (overrideSize.h - childrenSize.h) / 2; // center (even if "Fill")
         }
-        let left = -size.w / 2 + padLeft;
-        let top = -size.h / 2 + padTop;
+        let left = -overrideSize.w / 2 + padLeft;
+        let top = overrideSize.h / 2 - padTop;
         for (const child of this._children) {
             const childSize = LayoutObjects._calculateChildSize(child);
+            // Apply layout in row/col.
+            padLeft = 0;
+            padTop = 0;
+            if (this._isVertical) {
+                if (this._horizontalAlignment === HorizontalAlignment.Left) {
+                    padLeft = 0;
+                }
+                else if (this._horizontalAlignment === HorizontalAlignment.Right) {
+                    padLeft = childrenSize.w - childSize.w;
+                }
+                else {
+                    padLeft = (childrenSize.w - childSize.w) / 2; // center (even if "Fill")
+                }
+            }
+            else {
+                if (this._verticalAlignment === VerticalAlignment.Top) {
+                    padTop = 0;
+                }
+                else if (this._verticalAlignment === VerticalAlignment.Bottom) {
+                    padTop = childrenSize.h - childSize.h;
+                }
+                else {
+                    padTop = (childrenSize.h - childSize.h) / 2; // center (even if "Fill")
+                }
+            }
             // Calculate child center (world).
-            const childCenter = new Vector(top + childSize.h / 2, left + childSize.w / 2, 0)
+            const childCenter = new Vector(top - childSize.h / 2 - padTop, left + childSize.w / 2 + padLeft, 0)
                 .rotateAngleAxis(yaw, [0, 0, 1])
                 .add(center);
             // Position child.
@@ -138,12 +196,13 @@ export class LayoutObjects {
             }
             // Move "cursor" to next open spot top-left.
             if (this._isVertical) {
-                top += childSize.h + this._childDistance;
+                top -= childSize.h + this._childDistance;
             }
             else {
                 left += childSize.w + this._childDistance;
             }
         }
+        this.afterLayout.trigger();
         return this;
     }
     getCenter() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ttpg-darrell",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "TTPG TypeScript library",
   "main": "./build/cjs/index.js",
   "module": "./build/esm/index.js",