simulationjsv2 0.10.2 → 0.10.4

package/TODO.md

@@ -1,5 +1,6 @@
 # TODO
 
+- [ ] hex to color
 - [ ] Materials for planes
 - [ ] Transform vertex colors on material
 - [x] Morph objects into other objects

package/dist/graphics.d.ts

@@ -27,6 +27,8 @@ export declare abstract class SimulationElement3d {
     is3d: boolean;
     isEmpty: boolean;
     constructor(pos: Vector3, rotation: Vector3, color?: Color);
+    emptyShallow(): void;
+    empty(): void;
     getId(): string | null;
     setId(id: string): void;
     getColor(): Color;
@@ -52,7 +54,6 @@ export declare abstract class SimulationElement3d {
     resetCenterOffset(): void;
     getModelMatrix(): Mat4;
     isTransparent(): boolean;
-    setMaterial(material: Material): void;
     getObjectInfo(): string;
     getUniformBuffer(): GPUBuffer;
     getPipeline(): GPURenderPipeline;

package/dist/graphics.js

@@ -44,6 +44,15 @@ export class SimulationElement3d {
         this.cullMode = 'none';
         this.id = null;
     }
+    emptyShallow() {
+        this.children = [];
+    }
+    empty() {
+        for (let i = 0; i < this.children.length; i++) {
+            this.children[i].empty();
+        }
+        this.children = [];
+    }
     getId() {
         return this.id;
     }
@@ -146,9 +155,6 @@ export class SimulationElement3d {
     isTransparent() {
         return this.material.isTransparent();
     }
-    setMaterial(material) {
-        this.material = material;
-    }
     getObjectInfo() {
         const topologyString = this.isWireframe() ? 'line-strip' : 'triangle-' + this.getGeometryTopology();
         return `{ "topology": "${topologyString}", "transparent": ${this.isTransparent()}, "cullMode": "${this.cullMode}" }`;
@@ -267,6 +273,53 @@ export class SimulationElement3d {
             this.vertexCache.updated();
         }, t, f);
     }
+    // setMaterial(material: Material, t = 0, f?: LerpFunc) {
+    //   let colorDiff: Color | Color[];
+    //   if (material.hasVertexColors()) {
+    //     const diffs = material.getVertexColors().map((color) => color.clone());
+    //     const initialColor = this.material.getColor();
+    //     const colorArr = this.material.hasVertexColors()
+    //       ? this.material.getVertexColors()
+    //       : Array(diffs.length).map(() => initialColor.clone());
+    //     if (!this.material.hasVertexColors()) {
+    //       this.material.setVertexColors(colorArr);
+    //       this.material.setHasVertexColors(true);
+    //     }
+    //     colorDiff = diffs.map((diff, index) => diff.diff(colorArr[index]));
+    //   } else if (this.material.hasVertexColors()) {
+    //     const initialColor = material.getColor();
+    //     const currentColors = this.material.getVertexColors();
+    //     const colorArr = Array(currentColors.length).map(() => initialColor.clone());
+    //     colorDiff = colorArr.map((color, index) => color.diff(currentColors[index]));
+    //   } else {
+    //     colorDiff = material.getColor().diff(this.material.getColor());
+    //   }
+    //   // TODO finish this
+    //   return transitionValues(
+    //     (p) => {
+    //       if (Array.isArray(colorDiff)) {
+    //         const colors = this.material.getVertexColors();
+    //         for (let i = 0; i < colors.length; i++) {
+    //           colors[i].r += colorDiff[i].r * p;
+    //           colors[i].g += colorDiff[i].g * p;
+    //           colors[i].b += colorDiff[i].b * p;
+    //           colors[i].a += colorDiff[i].a * p;
+    //         }
+    //       } else {
+    //         const currentColor = this.material.getColor();
+    //         currentColor.r += colorDiff.r * p;
+    //         currentColor.g += colorDiff.g * p;
+    //         currentColor.b += colorDiff.b * p;
+    //         currentColor.a += colorDiff.a * p;
+    //       }
+    //     },
+    //     () => {
+    //       this.material = material;
+    //     },
+    //     t,
+    //     f
+    //   );
+    // }
     move(amount, t = 0, f) {
         const tempAmount = cloneBuf(amount);
         const finalPos = cloneBuf(this.pos);
@@ -552,7 +605,7 @@ export class Polygon extends SimulationElement2d {
         const prevColor = this.getColor();
         this.shader = vertexColorShader;
         this.geometry = new PolygonGeometry(vectors);
-        this.material = new VertexColorMaterial();
+        this.material = new VertexColorMaterial([]);
         this.material.setColor(prevColor);
         const colors = vertices.map((vert) => vert.getColor() ?? this.material.getColor());
         this.material.setVertexColors(colors);
@@ -913,7 +966,7 @@ export class Spline2d extends SimulationElement2d {
         this.interpolateLimit = 1;
         this.length = 0;
         this.geometry = new Spline2dGeometry(points, this.thickness, this.detail);
-        this.material = new VertexColorMaterial();
+        this.material = new VertexColorMaterial([]);
         this.material.setColor(pos.getColor() ?? globalInfo.getDefaultColor());
         this.setVertexColors();
         this.shader = vertexColorShader;
@@ -1153,7 +1206,7 @@ export class TraceLines2d extends SimulationElement2d {
     constructor(color, maxLen) {
         super(vector2(), vector3(), color);
         this.geometry = new TraceLinesGeometry(maxLen);
-        this.material = new VertexColorMaterial();
+        this.material = new VertexColorMaterial([]);
         if (color)
             this.material.setColor(color);
         this.shader = vertexColorShader;

package/dist/materials.d.ts

@@ -5,16 +5,18 @@ export declare class Material {
     protected isVertexColors: boolean;
     constructor();
     hasVertexColors(): boolean;
+    setHasVertexColors(hasColors: boolean): void;
     getVertexColors(): Color[];
     getColor(): Color;
     addVertexColor(color: Color): void;
     setVertexColors(colors: Color[]): void;
     isTransparent(): boolean;
     setColor(color: Color): void;
+    clone(): Material;
 }
 export declare class BasicMaterial extends Material {
     constructor(color: Color);
 }
 export declare class VertexColorMaterial extends Material {
-    constructor();
+    constructor(colors: Color[]);
 }

package/dist/materials.js

@@ -11,6 +11,9 @@ export class Material {
     hasVertexColors() {
         return this.isVertexColors;
     }
+    setHasVertexColors(hasColors) {
+        this.isVertexColors = hasColors;
+    }
     getVertexColors() {
         return this.vertexColors;
     }
@@ -36,6 +39,13 @@ export class Material {
     setColor(color) {
         this.color = color;
     }
+    clone() {
+        const res = new Material();
+        res.setColor(this.color.clone());
+        res.setVertexColors(this.vertexColors.map((color) => color.clone()));
+        res.setHasVertexColors(this.isVertexColors);
+        return res;
+    }
 }
 export class BasicMaterial extends Material {
     constructor(color) {
@@ -44,8 +54,9 @@ export class BasicMaterial extends Material {
     }
 }
 export class VertexColorMaterial extends Material {
-    constructor() {
+    constructor(colors) {
         super();
+        this.vertexColors = colors;
         this.isVertexColors = true;
     }
 }

package/dist/simulation.d.ts

@@ -45,6 +45,7 @@ export declare class Simulation extends Settings {
     add(el: SimulationElement3d, id?: string): void;
     remove(el: SimulationElement3d): void;
     removeId(id: string): void;
+    empty(): void;
     private applyCanvasSize;
     setCanvasSize(width: number, height: number): void;
     start(): void;

package/dist/simulation.js

@@ -214,6 +214,12 @@ export class Simulation extends Settings {
     removeId(id) {
         removeSceneId(this.scene, id);
     }
+    empty() {
+        for (let i = 0; i < this.scene.length; i++) {
+            this.scene[i].empty();
+        }
+        this.scene = [];
+    }
     applyCanvasSize(width, height) {
         if (this.canvasRef === null)
             return;

package/package.json

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