@slithy/prim-lib 0.2.1 → 0.3.1

package/dist/index.d.ts

@@ -38,6 +38,7 @@ interface Cfg {
     alpha: number;
     mutateAlpha: boolean;
     shapeTypes: Array<new (w: number, h: number) => ShapeInterface>;
+    shapeWeights?: number[];
     shapes: number;
     mutations: number;
     steps: number;
@@ -74,6 +75,13 @@ type StepData = {
     cy: number;
     rx: number;
     ry: number;
+} | {
+    t: 'c';
+    a: number;
+    c: RGB;
+    cx: number;
+    cy: number;
+    r: number;
 } | {
     t: 's';
     a: number;
@@ -223,6 +231,16 @@ declare class Ellipse extends Shape {
     mutate(_cfg?: Partial<Cfg>): ShapeInterface;
     computeBbox(): this;
 }
+declare class Circle extends Shape {
+    center: Point;
+    r: number;
+    constructor(w: number, h: number);
+    computeBbox(): this;
+    render(ctx: CanvasRenderingContext2D): void;
+    toSVG(): SVGElement;
+    toData(a: number, c: RGB): StepData;
+    mutate(_cfg?: Partial<Cfg>): ShapeInterface;
+}
 declare class Glyph extends Shape {
     center: Point;
     text: string;
@@ -283,4 +301,4 @@ interface ReplayResult {
 }
 declare function replayOutput(data: SerializedOutput): ReplayResult;
 
-export { type Bbox, Canvas, type Cfg, Debug, Ellipse, Glyph, Hexagon, type ImageDataLike, Optimizer, type Point, type PreCfg, type RGB, Rectangle, type ReplayResult, SVGNS, type SerializedOutput, Shape, type ShapeImageData, type ShapeInterface, Square, State, Step, type StepData, Triangle, clamp, clampColor, computeColorAndDifferenceChange, difference, differenceToDistance, distanceToDifference, getFill, parseColor, replayOutput, stepPerf };
+export { type Bbox, Canvas, type Cfg, Circle, Debug, Ellipse, Glyph, Hexagon, type ImageDataLike, Optimizer, type Point, type PreCfg, type RGB, Rectangle, type ReplayResult, SVGNS, type SerializedOutput, Shape, type ShapeImageData, type ShapeInterface, Square, State, Step, type StepData, Triangle, clamp, clampColor, computeColorAndDifferenceChange, difference, differenceToDistance, distanceToDifference, getFill, parseColor, replayOutput, stepPerf };

package/dist/index.js

@@ -349,6 +349,16 @@ var Shape = class {
   }
   static create(cfg) {
     const ctors = cfg.shapeTypes;
+    const weights = cfg.shapeWeights;
+    if (weights && weights.length === ctors.length) {
+      const total = weights.reduce((sum, w) => sum + w, 0);
+      let r = Math.random() * total;
+      for (let i = 0; i < weights.length; i++) {
+        r -= weights[i];
+        if (r <= 0) return new ctors[i](cfg.width, cfg.height);
+      }
+      return new ctors[ctors.length - 1](cfg.width, cfg.height);
+    }
     const index = Math.floor(Math.random() * ctors.length);
     const ctor = ctors[index];
     return new ctor(cfg.width, cfg.height);
@@ -583,6 +593,59 @@ var Ellipse = class _Ellipse extends Shape {
     return this;
   }
 };
+var Circle = class _Circle extends Shape {
+  center;
+  r;
+  constructor(w, h) {
+    super(w, h);
+    this.center = Shape.randomPoint(w, h);
+    this.r = 1 + ~~(Math.random() * 20);
+    this.computeBbox();
+  }
+  computeBbox() {
+    this.bbox = {
+      left: this.center[0] - this.r,
+      top: this.center[1] - this.r,
+      width: 2 * this.r || 1,
+      height: 2 * this.r || 1
+    };
+    return this;
+  }
+  render(ctx) {
+    ctx.beginPath();
+    ctx.arc(this.center[0], this.center[1], this.r, 0, 2 * Math.PI);
+    ctx.fill();
+  }
+  toSVG() {
+    const node = document.createElementNS(SVGNS, "circle");
+    node.setAttribute("cx", String(this.center[0]));
+    node.setAttribute("cy", String(this.center[1]));
+    node.setAttribute("r", String(this.r));
+    return node;
+  }
+  toData(a, c) {
+    return { t: "c", a, c, cx: this.center[0], cy: this.center[1], r: this.r };
+  }
+  mutate(_cfg) {
+    const clone = new _Circle(0, 0);
+    clone.center = [this.center[0], this.center[1]];
+    clone.r = this.r;
+    switch (Math.floor(Math.random() * 2)) {
+      case 0: {
+        const angle = Math.random() * 2 * Math.PI;
+        const radius = Math.random() * 20;
+        clone.center[0] += ~~(radius * Math.cos(angle));
+        clone.center[1] += ~~(radius * Math.sin(angle));
+        break;
+      }
+      case 1:
+        clone.r += (Math.random() - 0.5) * 20;
+        clone.r = Math.max(1, ~~clone.r);
+        break;
+    }
+    return clone.computeBbox();
+  }
+};
 var Glyph = class _Glyph extends Shape {
   center;
   text;
@@ -912,6 +975,12 @@ function renderStep(data, ctx) {
       ctx.fill();
       break;
     }
+    case "c": {
+      ctx.beginPath();
+      ctx.arc(data.cx, data.cy, data.r, 0, 2 * Math.PI);
+      ctx.fill();
+      break;
+    }
     case "s": {
       ctx.fillRect(data.cx - data.r, data.cy - data.r, 2 * data.r, 2 * data.r);
       break;
@@ -953,6 +1022,13 @@ function stepToSVG(data) {
       node.setAttribute("ry", String(data.ry));
       break;
     }
+    case "c": {
+      node = document.createElementNS(SVGNS, "circle");
+      node.setAttribute("cx", String(data.cx));
+      node.setAttribute("cy", String(data.cy));
+      node.setAttribute("r", String(data.r));
+      break;
+    }
     case "s": {
       node = document.createElementNS(SVGNS, "rect");
       node.setAttribute("x", String(data.cx - data.r));
@@ -1002,6 +1078,7 @@ function replayOutput(data) {
 }
 export {
   Canvas,
+  Circle,
   Debug,
   Ellipse,
   Glyph,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slithy/prim-lib",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "Core engine for primitive-based image reconstruction.",
   "type": "module",
   "exports": {