simulationjsv2 0.8.0 → 0.8.2

package/TODO.md

@@ -1,7 +1,7 @@
 # TODO
 
-- [ ] Change render vertices to use index buffer
-- [ ] Add cull modes
+- [x] Change render vertices to use index buffer
+- [x] Add cull modes
 - [x] Fix shaders
 - [x] Clean up polygons
 - [x] Fix transparency

package/dist/geometry.js

@@ -44,15 +44,15 @@ export class CubeGeometry extends Geometry {
     wireframeOrder = [0, 1, 2, 3, 0, 2, 6, 5, 1, 6, 7, 4, 5, 7, 3, 4, 0, 5, 6, 3];
     // prettier-ignore
     triangleOrder = [
-        0, 1, 3, 2,
-        4, 7, 5, 6,
-        0, 3, 4, 7,
-        0, 4, 1, 5,
-        1, 5, 2, 6,
-        2, 6, 3, 7
+        0, 1, 2, 2, 3, 0,
+        6, 5, 4, 7, 6, 4,
+        4, 1, 0, 1, 4, 5,
+        2, 1, 5, 5, 6, 2,
+        0, 3, 4, 7, 4, 3,
+        3, 6, 7, 6, 3, 2
     ];
     constructor(width, height, depth) {
-        super([], 'strip');
+        super();
         this.params = {
             width,
             height,

package/dist/graphics.d.ts

@@ -61,10 +61,8 @@ export declare abstract class SimulationElement3d {
     getRotation(): Vector3;
     getCenterOffset(): Vector3;
     fill(newColor: Color, t?: number, f?: LerpFunc): Promise<void>;
-    private moveChildren;
     move(amount: Vector3, t?: number, f?: LerpFunc, fromDevicePixelRatio?: boolean): Promise<void>;
     moveTo(pos: Vector3, t?: number, f?: LerpFunc, fromDevicePixelRatio?: boolean): Promise<void>;
-    rotateChildrenTo(angle: Vector3): void;
     rotateChildren(angle: Vector3): void;
     rotate(amount: Vector3, t?: number, f?: LerpFunc): Promise<void>;
     rotateTo(rot: Vector3, t?: number, f?: LerpFunc): Promise<void>;

package/dist/graphics.js

@@ -211,18 +211,12 @@ export class SimulationElement3d {
             this.vertexCache.updated();
         }, t, f);
     }
-    moveChildren(amount, t = 0, f) {
-        for (let i = 0; i < this.children.length; i++) {
-            this.children[i].getObj().move(amount, t, f, true);
-        }
-    }
     move(amount, t = 0, f, fromDevicePixelRatio = false) {
         const tempAmount = cloneBuf(amount);
         if (!fromDevicePixelRatio)
             vector3ToPixelRatio(tempAmount);
         const finalPos = cloneBuf(this.pos);
         vec3.add(finalPos, tempAmount, finalPos);
-        this.moveChildren(amount, t, f);
         return internalTransitionValues((p) => {
             this.pos[0] += tempAmount[0] * p;
             this.pos[1] += tempAmount[1] * p;
@@ -237,7 +231,6 @@ export class SimulationElement3d {
             vector3ToPixelRatio(tempPos);
         const diff = vector3();
         vec3.sub(tempPos, this.pos, diff);
-        this.moveChildren(diff, t, f);
         return internalTransitionValues((p) => {
             this.pos[0] += diff[0] * p;
             this.pos[1] += diff[1] * p;
@@ -246,11 +239,6 @@ export class SimulationElement3d {
             this.pos = tempPos;
         }, t, f);
     }
-    rotateChildrenTo(angle) {
-        for (let i = 0; i < this.children.length; i++) {
-            this.children[i].getObj().rotateTo(angle);
-        }
-    }
     rotateChildren(angle) {
         for (let i = 0; i < this.children.length; i++) {
             this.children[i].getObj().rotate(angle);
@@ -375,8 +363,8 @@ export class Square extends SimulationElement2d {
      */
     constructor(pos, width, height, color, rotation) {
         super(pos, vector3(0, 0, rotation), color);
-        this.width = width;
-        this.height = height;
+        this.width = width / devicePixelRatio;
+        this.height = height / devicePixelRatio;
         this.geometry = new SquareGeometry(this.width, this.height);
     }
     getWidth() {

package/dist/internalUtils.js

@@ -34,7 +34,7 @@ export class CachedArray {
     }
     add(index) {
         if (this.length < this.data.length) {
-            this.data[this.length - 1] = index;
+            this.data[this.length] = index;
         }
         else {
             this.data.push(index);

package/dist/simulation.d.ts

@@ -39,6 +39,7 @@ export declare class Simulation extends Settings {
     private indexBuffer;
     constructor(idOrCanvasRef: string | HTMLCanvasElement, sceneCamera?: Camera | null, showFrameRate?: boolean);
     private handleCanvasResize;
+    on<K extends keyof HTMLElementEventMap>(event: K, cb: (this: HTMLCanvasElement, ev: HTMLElementEventMap[K]) => void, options?: boolean | AddEventListenerOptions): void;
     onResize(cb: (width: number, height: number) => void): void;
     getWidth(): number;
     getHeight(): number;

package/dist/simulation.js

@@ -181,8 +181,10 @@ export class Simulation extends Settings {
         this.frameRateView = new FrameRateView(showFrameRate);
         this.frameRateView.updateFrameRate(1);
         this.transparentElements = new CachedArray();
-        this.vertexBuffer = new MemoBuffer(GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST, 0);
-        this.indexBuffer = new MemoBuffer(GPUBufferUsage.INDEX | GPUBufferUsage.COPY_DST, 0);
+        // this.vertexBuffer = new MemoBuffer(GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST, 0);
+        // this.indexBuffer = new MemoBuffer(GPUBufferUsage.INDEX | GPUBufferUsage.COPY_DST, 0);
+        this.vertexBuffer = new MemoBuffer(GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST, 1000);
+        this.indexBuffer = new MemoBuffer(GPUBufferUsage.INDEX | GPUBufferUsage.COPY_DST, 1000);
     }
     handleCanvasResize(parent) {
         if (this.fittingElement) {
@@ -191,6 +193,11 @@ export class Simulation extends Settings {
             this.setCanvasSize(width, height);
         }
     }
+    on(event, cb, options) {
+        if (!this.canvasRef)
+            return;
+        this.canvasRef.addEventListener(event, cb, options);
+    }
     onResize(cb) {
         this.resizeEvents.push(cb);
     }

package/dist/utils.d.ts

@@ -68,7 +68,7 @@ export declare function vector2(x?: number, y?: number): Vector2;
 export declare function matrix4(): Mat4;
 export declare function vector3FromVector2(vec: Vector2): Vector3;
 export declare function vector2FromVector3(vec: Vector3): Vector2;
-export declare function randomInt(range: number, min?: number): number;
+export declare function randomInt(max: number, min?: number): number;
 export declare function randomColor(a?: number): Color;
 export declare function vertex(x?: number, y?: number, z?: number, color?: Color, uv?: Vector2): Vertex;
 export declare function color(r?: number, g?: number, b?: number, a?: number): Color;

package/dist/utils.js

@@ -218,8 +218,8 @@ export function vector3FromVector2(vec) {
 export function vector2FromVector3(vec) {
     return vector2(vec[0], vec[1]);
 }
-export function randomInt(range, min = 0) {
-    return Math.floor(Math.random() * (range - min)) + min;
+export function randomInt(max, min = 0) {
+    return Math.floor(Math.random() * (max - min)) + min;
 }
 export function randomColor(a = 1) {
     return new Color(randomInt(255), randomInt(255), randomInt(255), a);

package/package.json

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