simulationjsv2 0.1.9 → 0.1.10

package/dist/graphics.d.ts

@@ -73,9 +73,9 @@ export declare class BezierCurve2d {
 export declare class CubicBezierCurve2d extends BezierCurve2d {
     private detail;
     private colors;
-    constructor(points: [Vector2, Vector2, Vector2, Vector2], detail?: number, colors?: Color[]);
+    constructor(points: [Vector2, Vector2, Vector2, Vector2], detail?: number, colors?: (Color | null)[]);
     getDetail(): number | undefined;
-    getColors(): Color[];
+    getColors(): (Color | null)[];
 }
 export declare class SplinePoint2d {
     private start;
@@ -90,7 +90,7 @@ export declare class SplinePoint2d {
     getControls(): readonly [Vector2 | null, Vector2];
     getRawControls(): [Vector2, Vector2];
     getDetail(): number | undefined;
-    getColors(prevColor?: Color): Color[];
+    getColors(prevColor?: Color | null): (Color | null)[];
     getVectorArray(prevEnd: Vector2 | null, prevControl: Vector2 | null): readonly [Vector2, Vector2, Vector2, Vector2];
 }
 export declare class Spline2d extends SimulationElement {

package/dist/graphics.js

@@ -524,14 +524,18 @@ export class SplinePoint2d {
         return this.detail;
     }
     getColors(prevColor) {
-        const colors = [];
-        if (prevColor)
-            colors.push(prevColor);
+        const colors = [null, null];
         if (this.start && this.start.getColor()) {
-            colors.push(this.start.getColor());
+            colors[0] = this.start.getColor();
         }
         if (this.end.getColor()) {
-            colors.push(this.end.getColor());
+            colors[1] = this.end.getColor();
+        }
+        if (prevColor) {
+            colors.unshift(prevColor);
+        }
+        if (colors.at(-1) === null) {
+            colors.pop();
         }
         return colors;
     }
@@ -566,13 +570,13 @@ export class Spline2d extends SimulationElement {
         this.distance = 0;
         for (let i = 0; i < points.length; i++) {
             let prevControl = null;
-            let prevColor = this.getColor();
+            let prevColor = null;
             if (i > 0) {
                 prevControl = cloneBuf(points[i - 1].getRawControls()[1]);
                 vec2.negate(prevControl, prevControl);
                 const prevColors = points[i - 1].getColors();
                 if (prevColors.at(-1)) {
-                    prevColor = prevColors.at(-1);
+                    prevColor = prevColors.at(-1) || null;
                 }
             }
             const bezierPoints = points[i].getVectorArray(i > 0 ? vector2FromVector3(points[i - 1].getEnd().getPos()) : null, prevControl);
@@ -620,7 +624,8 @@ export class Spline2d extends SimulationElement {
                     const normal = vector2(-slope[1], slope[0]);
                     vec2.normalize(normal, normal);
                     vec2.scale(normal, this.width / 2, normal);
-                    const vertexColor = interpolateColors(this.curves[i].getColors(), currentInterpolation);
+                    const colors = this.curves[i].getColors().map((c) => (c ? c : this.getColor()));
+                    const vertexColor = interpolateColors(colors, currentInterpolation);
                     const vertTop = vertex(point[0] + normal[0], point[1] + normal[1], 0, vertexColor);
                     verticesTop.push(vertTop);
                     const vertBottom = vertex(point[0] - normal[0], point[1] - normal[1], 0, vertexColor);

package/dist/utils.js

@@ -301,6 +301,10 @@ export function continuousSplinePoint2d(end, control, detail) {
     return new SplinePoint2d(null, end, null, control, rawControls, detail);
 }
 export function interpolateColors(colors, t) {
+    if (colors.length === 0)
+        return color();
+    if (colors.length === 1)
+        return colors[0];
     const colorInterval = 1 / colors.length;
     let index = Math.floor(t / colorInterval);
     if (index === colors.length)

package/package.json

@@ -5,7 +5,7 @@
   "types": "./dist/index.d.ts",
   "author": "Jackson Otto",
   "description": "A simple graphics library using WebGPU",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "exports": {
     ".": {
       "import": "./dist/index.js",