feat(geom): add IAttributed impls for all shape types

thi-ng · Jun 24, 2022 · ccb40f1 · ccb40f1
1 parent 35799db
commit ccb40f1
Show file tree

Hide file tree

Showing 22 changed files with 125 additions and 11 deletions.
diff --git a/packages/geom/src/api/aabb.ts b/packages/geom/src/api/aabb.ts
@@ -30,6 +30,10 @@ export class AABB implements AABBLike {
         );
     }
 
+    withAttribs(attribs: Attribs): AABB {
+        return new AABB(this.pos, this.size, attribs);
+    }
+
     max() {
         return add3([], this.pos, this.size);
     }

diff --git a/packages/geom/src/api/apc.ts b/packages/geom/src/api/apc.ts
@@ -1,11 +1,14 @@
-import type { Attribs, IShape, PCLike } from "@thi.ng/geom-api";
+import type { Attribs, PCLike } from "@thi.ng/geom-api";
 import type { Vec } from "@thi.ng/vectors";
 
 export abstract class APC implements PCLike {
     constructor(public points: Vec[] = [], public attribs?: Attribs) {}
 
     abstract get type(): number | string;
-    abstract copy(): IShape;
+
+    abstract copy(): APC;
+
+    abstract withAttribs(attribs: Attribs): APC;
 
     *[Symbol.iterator]() {
         yield* this.points;

diff --git a/packages/geom/src/api/arc.ts b/packages/geom/src/api/arc.ts
@@ -41,6 +41,19 @@ export class Arc implements IHiccupShape, IHiccupPathSegment {
         );
     }
 
+    withAttribs(attribs: Attribs): Arc {
+        return new Arc(
+            this.pos,
+            this.r,
+            this.axis,
+            this.start,
+            this.end,
+            this.xl,
+            this.cw,
+            attribs
+        );
+    }
+
     equiv(o: any) {
         return (
             o instanceof Arc &&

diff --git a/packages/geom/src/api/bpatch.ts b/packages/geom/src/api/bpatch.ts
@@ -45,6 +45,10 @@ export class BPatch extends APC implements IHiccupShape {
         return <BPatch>__copyShape(BPatch, this);
     }
 
+    withAttribs(attribs: Attribs): BPatch {
+        return new BPatch(this.points, attribs);
+    }
+
     edges() {
         const p = this.points;
         return [

diff --git a/packages/geom/src/api/circle.ts b/packages/geom/src/api/circle.ts
@@ -18,6 +18,10 @@ export class Circle implements IHiccupShape {
         return new Circle(set([], this.pos), this.r, __copyAttribs(this));
     }
 
+    withAttribs(attribs: Attribs): Circle {
+        return new Circle(this.pos, this.r, attribs);
+    }
+
     toHiccup() {
         return ["circle", this.attribs, this.pos, this.r];
     }

diff --git a/packages/geom/src/api/cubic.ts b/packages/geom/src/api/cubic.ts
@@ -1,4 +1,4 @@
-import type { IHiccupPathSegment } from "@thi.ng/geom-api";
+import type { Attribs, IHiccupPathSegment } from "@thi.ng/geom-api";
 import { __copyShape } from "../internal/copy.js";
 import { APC } from "./apc.js";
 
@@ -11,6 +11,10 @@ export class Cubic extends APC implements IHiccupPathSegment {
         return <Cubic>__copyShape(Cubic, this);
     }
 
+    withAttribs(attribs: Attribs): Cubic {
+        return new Cubic(this.points, attribs);
+    }
+
     toHiccup() {
         return [
             "path",

diff --git a/packages/geom/src/api/ellipse.ts b/packages/geom/src/api/ellipse.ts
@@ -27,6 +27,10 @@ export class Ellipse implements IHiccupShape {
         );
     }
 
+    withAttribs(attribs: Attribs): Ellipse {
+        return new Ellipse(this.pos, this.r, attribs);
+    }
+
     toHiccup() {
         return ["ellipse", this.attribs, this.pos, this.r];
     }

diff --git a/packages/geom/src/api/group.ts b/packages/geom/src/api/group.ts
@@ -25,6 +25,10 @@ export class Group implements IHiccupShape {
         return new Group(__copyAttribs(this), this.children.map(fn));
     }
 
+    withAttribs(attribs: Attribs): Group {
+        return new Group(attribs, this.children);
+    }
+
     equiv(o: any) {
         return o instanceof Group && equiv(this.children, o.children);
     }

diff --git a/packages/geom/src/api/line.ts b/packages/geom/src/api/line.ts
@@ -1,4 +1,8 @@
-import type { IHiccupPathSegment, IHiccupShape } from "@thi.ng/geom-api";
+import type {
+    Attribs,
+    IHiccupPathSegment,
+    IHiccupShape,
+} from "@thi.ng/geom-api";
 import { __copyShape } from "../internal/copy.js";
 import { APC } from "./apc.js";
 
@@ -11,6 +15,10 @@ export class Line extends APC implements IHiccupShape, IHiccupPathSegment {
         return <Line>__copyShape(Line, this);
     }
 
+    withAttribs(attribs: Attribs): Line {
+        return new Line(this.points, attribs);
+    }
+
     toHiccup() {
         return ["line", this.attribs, this.points[0], this.points[1]];
     }

diff --git a/packages/geom/src/api/path.ts b/packages/geom/src/api/path.ts
@@ -34,6 +34,12 @@ export class Path implements IHiccupShape {
         return p;
     }
 
+    withAttribs(attribs: Attribs): Path {
+        const res = new Path(this.segments, attribs);
+        res.closed = true;
+        return res;
+    }
+
     equiv(o: any) {
         return o instanceof Path && equiv(this.segments, o.segments);
     }

diff --git a/packages/geom/src/api/plane.ts b/packages/geom/src/api/plane.ts
@@ -18,6 +18,10 @@ export class Plane implements IHiccupShape {
         return new Plane(set3([], this.normal), this.w, __copyAttribs(this));
     }
 
+    withAttribs(attribs: Attribs): Plane {
+        return new Plane(this.normal, this.w, attribs);
+    }
+
     toHiccup() {
         return ["plane", this.attribs, this.normal, this.w];
     }

diff --git a/packages/geom/src/api/points.ts b/packages/geom/src/api/points.ts
@@ -1,4 +1,4 @@
-import type { IHiccupShape } from "@thi.ng/geom-api";
+import type { Attribs, IHiccupShape } from "@thi.ng/geom-api";
 import { __copyShape } from "../internal/copy.js";
 import { APC } from "./apc.js";
 
@@ -11,6 +11,10 @@ export class Points extends APC implements IHiccupShape {
         return <Points>__copyShape(Points, this);
     }
 
+    withAttribs(attribs: Attribs): Points {
+        return new Points(this.points, attribs);
+    }
+
     toHiccup() {
         return ["points", this.attribs, this.points];
     }
@@ -25,6 +29,10 @@ export class Points3 extends APC implements IHiccupShape {
         return <Points3>__copyShape(Points3, this);
     }
 
+    withAttribs(attribs: Attribs): Points3 {
+        return new Points3(this.points, attribs);
+    }
+
     toHiccup() {
         return ["points3", this.attribs, this.points];
     }

diff --git a/packages/geom/src/api/polygon.ts b/packages/geom/src/api/polygon.ts
@@ -1,4 +1,4 @@
-import type { IHiccupShape } from "@thi.ng/geom-api";
+import type { Attribs, IHiccupShape } from "@thi.ng/geom-api";
 import { __copyShape } from "../internal/copy.js";
 import { APC } from "./apc.js";
 
@@ -11,6 +11,10 @@ export class Polygon extends APC implements IHiccupShape {
         return <Polygon>__copyShape(Polygon, this);
     }
 
+    withAttribs(attribs: Attribs): Polygon {
+        return new Polygon(this.points, attribs);
+    }
+
     toHiccup() {
         return ["polygon", this.attribs, this.points];
     }

diff --git a/packages/geom/src/api/polyline.ts b/packages/geom/src/api/polyline.ts
@@ -1,4 +1,8 @@
-import type { IHiccupPathSegment, IHiccupShape } from "@thi.ng/geom-api";
+import type {
+    Attribs,
+    IHiccupPathSegment,
+    IHiccupShape,
+} from "@thi.ng/geom-api";
 import { __copyShape } from "../internal/copy.js";
 import { APC } from "./apc.js";
 
@@ -11,6 +15,10 @@ export class Polyline extends APC implements IHiccupShape, IHiccupPathSegment {
         return <Polyline>__copyShape(Polyline, this);
     }
 
+    withAttribs(attribs: Attribs): Polyline {
+        return new Polyline(this.points, attribs);
+    }
+
     toHiccup() {
         return ["polyline", { ...this.attribs, fill: "none" }, this.points];
     }

diff --git a/packages/geom/src/api/quad.ts b/packages/geom/src/api/quad.ts
@@ -1,4 +1,4 @@
-import type { IHiccupShape } from "@thi.ng/geom-api";
+import type { Attribs, IHiccupShape } from "@thi.ng/geom-api";
 import { __copyShape } from "../internal/copy.js";
 import { APC } from "./apc.js";
 
@@ -11,6 +11,10 @@ export class Quad extends APC implements IHiccupShape {
         return <Quad>__copyShape(Quad, this);
     }
 
+    withAttribs(attribs: Attribs): Quad {
+        return new Quad(this.points, attribs);
+    }
+
     toHiccup() {
         return ["polygon", this.attribs, this.points];
     }

diff --git a/packages/geom/src/api/quad3.ts b/packages/geom/src/api/quad3.ts
@@ -1,4 +1,4 @@
-import type { IHiccupShape } from "@thi.ng/geom-api";
+import type { Attribs, IHiccupShape } from "@thi.ng/geom-api";
 import { __copyShape } from "../internal/copy.js";
 import { APC } from "./apc.js";
 
@@ -11,6 +11,10 @@ export class Quad3 extends APC implements IHiccupShape {
         return <Quad3>__copyShape(Quad3, this);
     }
 
+    withAttribs(attribs: Attribs): Quad3 {
+        return new Quad3(this.points, attribs);
+    }
+
     toHiccup() {
         return ["polygon", this.attribs, this.points];
     }

diff --git a/packages/geom/src/api/quadratic.ts b/packages/geom/src/api/quadratic.ts
@@ -1,4 +1,8 @@
-import type { IHiccupPathSegment, IHiccupShape } from "@thi.ng/geom-api";
+import type {
+    Attribs,
+    IHiccupPathSegment,
+    IHiccupShape,
+} from "@thi.ng/geom-api";
 import { __copyShape } from "../internal/copy.js";
 import { APC } from "./apc.js";
 
@@ -11,6 +15,10 @@ export class Quadratic extends APC implements IHiccupShape, IHiccupPathSegment {
         return <Quadratic>__copyShape(Quadratic, this);
     }
 
+    withAttribs(attribs: Attribs): Quadratic {
+        return new Quadratic(this.points, attribs);
+    }
+
     toHiccup() {
         return [
             "path",

diff --git a/packages/geom/src/api/ray.ts b/packages/geom/src/api/ray.ts
@@ -19,6 +19,10 @@ export class Ray implements IHiccupShape {
         );
     }
 
+    withAttribs(attribs: Attribs): Ray {
+        return new Ray(this.pos, this.dir, attribs);
+    }
+
     toHiccup() {
         return [
             "line",

diff --git a/packages/geom/src/api/rect.ts b/packages/geom/src/api/rect.ts
@@ -30,6 +30,10 @@ export class Rect implements AABBLike, IHiccupShape {
         );
     }
 
+    withAttribs(attribs: Attribs): Rect {
+        return new Rect(this.pos, this.size, attribs);
+    }
+
     max() {
         return add2([], this.pos, this.size);
     }

diff --git a/packages/geom/src/api/sphere.ts b/packages/geom/src/api/sphere.ts
@@ -18,6 +18,10 @@ export class Sphere implements IHiccupShape {
         return new Sphere(set3([], this.pos), this.r, __copyAttribs(this));
     }
 
+    withAttribs(attribs: Attribs): Sphere {
+        return new Sphere(this.pos, this.r, attribs);
+    }
+
     toHiccup() {
         return ["sphere", this.attribs, this.pos, this.r];
     }

diff --git a/packages/geom/src/api/text.ts b/packages/geom/src/api/text.ts
@@ -20,6 +20,10 @@ export class Text implements IHiccupShape {
         return new Text(set([], this.pos), this.body, __copyAttribs(this));
     }
 
+    withAttribs(attribs: Attribs): Text {
+        return new Text(this.pos, this.body, attribs);
+    }
+
     toHiccup() {
         return ["text", this.attribs, this.pos, this.body];
     }

diff --git a/packages/geom/src/api/triangle.ts b/packages/geom/src/api/triangle.ts
@@ -1,4 +1,4 @@
-import type { IHiccupShape } from "@thi.ng/geom-api";
+import type { Attribs, IHiccupShape } from "@thi.ng/geom-api";
 import { __copyShape } from "../internal/copy.js";
 import { APC } from "./apc.js";
 
@@ -11,6 +11,10 @@ export class Triangle extends APC implements IHiccupShape {
         return <Triangle>__copyShape(Triangle, this);
     }
 
+    withAttribs(attribs: Attribs): Triangle {
+        return new Triangle(this.points, attribs);
+    }
+
     toHiccup() {
         return ["polygon", this.attribs, this.points];
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,10 @@ export class AABB implements AABBLike { @@
             );
         }
+        withAttribs(attribs: Attribs): AABB {
+            return new AABB(this.pos, this.size, attribs);
+        }
         max() {
             return add3([], this.pos, this.size);
         }
@@ Expand Down @@