refactor(vector-pools): update AttribPool & VecPool ctors

thi-ng · Feb 1, 2019 · d7ccc88 · d7ccc88
1 parent 6d15686
commit d7ccc88
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 32 deletions.
diff --git a/packages/vector-pools/src/api.ts b/packages/vector-pools/src/api.ts
@@ -1,6 +1,6 @@
-import { IRelease, TypedArray } from "@thi.ng/api";
-import { Type, MemPoolOpts } from "@thi.ng/malloc";
-import { StridedVec, Vec, ReadonlyVec } from "@thi.ng/vectors";
+import { IObjectOf, IRelease, TypedArray } from "@thi.ng/api";
+import { MemPool, MemPoolOpts, Type } from "@thi.ng/malloc";
+import { ReadonlyVec, StridedVec, Vec } from "@thi.ng/vectors";
 
 export interface AttribSpec {
     type: GLType | Type;
@@ -11,8 +11,10 @@ export interface AttribSpec {
 }
 
 export interface AttribPoolOpts {
-    resizable: boolean;
-    mempool: MemPoolOpts;
+    mem: MemPool | Partial<MemPoolOpts>;
+    attribs?: IObjectOf<AttribSpec>;
+    num: number;
+    resizable?: boolean;
 }
 
 export interface IVecPool extends IRelease {

diff --git a/packages/vector-pools/src/attrib-pool.ts b/packages/vector-pools/src/attrib-pool.ts
@@ -29,34 +29,30 @@ export class AttribPool implements
     attribs: IObjectOf<TypedArray>;
     order: string[];
     specs: IObjectOf<AttribSpec>;
-    opts: AttribPoolOpts;
     pool: MemPool;
     addr: number;
     capacity: number;
 
     byteStride: number;
     maxAttribSize: number;
+    resizable: boolean;
 
-    constructor(
-        pool: number | ArrayBuffer | MemPool,
-        capacity: number,
-        specs: IObjectOf<AttribSpec>,
-        opts?: AttribPoolOpts
-    ) {
-        this.opts = <AttribPoolOpts>{
+    constructor(opts?: AttribPoolOpts) {
+        opts = <AttribPoolOpts>{
             resizable: true,
             ...opts
         };
-        this.pool = !(pool instanceof MemPool) ?
-            new MemPool(pool, this.opts.mempool) :
-            pool;
-        this.capacity = capacity;
+        this.pool = !(opts.mem instanceof MemPool) ?
+            new MemPool(opts.mem) :
+            opts.mem;
+        this.capacity = opts.num;
+        this.resizable = opts.resizable;
         this.specs = {};
         this.attribs = {};
         this.order = [];
         this.byteStride = 1;
         this.maxAttribSize = 1;
-        this.addAttribs(specs, true);
+        opts.attribs && this.addAttribs(opts.attribs, true);
     }
 
     bytes() {
@@ -183,7 +179,7 @@ export class AttribPool implements
 
     ensure(newCapacity: number, fill = false) {
         if (newCapacity <= this.capacity) return;
-        assert(this.opts.resizable, `pool resizing disabled`);
+        assert(this.resizable, `pool resizing disabled`);
         const newAddr = this.pool.realloc(this.addr, newCapacity * this.byteStride);
         assert(newAddr > 0, `out of memory`);
         for (let id in this.specs) {
@@ -282,10 +278,10 @@ export class AttribPool implements
         const grow = newByteStride > this.byteStride;
         let newAddr = this.addr;
         if (grow) {
-            assert(this.opts.resizable, `pool resizing disabled`);
+            assert(this.resizable, `pool resizing disabled`);
             newAddr = this.pool.realloc(this.addr, this.capacity * newByteStride);
             assert(newAddr > 0, `out of memory`);
-        } else if (!this.opts.resizable) {
+        } else if (!this.resizable) {
             return;
         }
         const sameBlock = newAddr === this.addr;

diff --git a/packages/vector-pools/src/vec-pool.ts b/packages/vector-pools/src/vec-pool.ts
@@ -16,12 +16,12 @@ export class VecPool implements
 
     pool: MemPool;
 
-    constructor(pool: MemPool);
-    constructor(buf: number | ArrayBuffer, opts?: Partial<MemPoolOpts>);
-    constructor(pool: any, opts?: Partial<MemPoolOpts>) {
-        this.pool = !(pool instanceof MemPool) ?
-            new MemPool(pool, opts) :
-            pool;
+    constructor(pool?: MemPool);
+    constructor(opts?: Partial<MemPoolOpts>);
+    constructor(pool: any) {
+        this.pool = pool instanceof MemPool ?
+            pool :
+            new MemPool(pool);
     }
 
     stats(): MemPoolStats {

diff --git a/packages/vector-pools/test/attribs.ts b/packages/vector-pools/test/attribs.ts
@@ -4,16 +4,16 @@ import { Type } from "@thi.ng/malloc";
 
 describe("vector-pools", () => {
     it("attribs", () => {
-        const pool = new AttribPool(
-            0x100,
-            8,
-            {
+        const pool = new AttribPool({
+            mem: { size: 0x100 },
+            num: 8,
+            attribs: {
                 pos: { type: Type.F32, default: [0, 0], size: 2, byteOffset: 0 },
                 id: { type: Type.U32, default: 0, size: 1, byteOffset: 8 },
                 index: { type: Type.U16, default: 0, size: 1, byteOffset: 12 },
                 col: { type: Type.I8, default: [0, 0, 0, 0], size: 4, byteOffset: 14 },
             }
-        );
+        });
         pool.setAttribValue("pos", 0, [1, 2]);
         pool.setAttribValue("id", 0, 1);
         pool.setAttribValue("index", 0, 10);