Merge pull request #1 from plepers/develop

pull plepers

Author: FlorentinMonteil

.jshintrc

@@ -1,2 +1,5 @@
 test
-docs
+docs
+src
+tsconfig.json
+.travis.yml

.npmignore

@@ -1,10 +1,6 @@
 language: node_js
 node_js:
-- '0.12'
-env:
-  global:
-  - secure: "fEoC5yuauEgf0kDqAyHwjwgRE9q8+oO4oL5mt1z4ju7CB5uZOCMhtd9kLsJPY8gN8FRK7jM+qcpedJ7uiFu1go6nmE4ks3/UyQXlUvQtWKwJVqK8qOgWZiBpIxUOOZ2mm27aXsjWLWdi6u8Z/DLAqmNfm5e5iHDUJM6aNqkCUElcjPkitSPu1jaHdZcH5RcviWDbCoWbTbW7+1yn2OLIv+ONCqq2Ywmvc/n+tN8y8NZiesJOgWMPbtpKjOwclJoQifnBAdZrUnlKZ/crSzKODb7/cLhJ5tRsEXKHyUbLZxD/ldZl3HSmdR2v9FtJjYDuMa7KpL1WrCJGPYzs/o0w7BBWi9o4OB0uAiSF8yYQOhazN1fLijrb+4HwV/t1DEzi3LrhwaJIh5QUezKz9i0ZtMkoyIdzvjySQU4JpNGfWnqXKeEVWjL8GPDaLeVqmmuIht0dVlM+Nb//B3KdpOmmTH8/aKrHROdFyWvV+0wp2OvamFjewNBnsU3sEhHwWharas0Em6tpFQ8G1EBglavmmBB1UlB4KRe/DbFWW26LvSSq0AzAsHpNT6fwD2JtzzFabHF8ZSdx2SM5sf4PR7yuROsejBNc6uhoW5lEFrdkHpfUfsMk8DQ4r/rS4pI7vPtrSbzjj41+q6mjhDxiyU0oKsN5R70hGdiDbg/nr572xRY="
-  - secure: "pj8rEQm5ArtdYOr60O/pmNwJlvBVOlEjzcbRgDcSVJ8tl6ySDS5QPKZoAEbUub1CIxEqTg/XyD8FBxikIeS3VnVGwtBKFolLfYvrj21tn4EKpxxYW2qbCXOVBpn71H3UVMu7JCq1ftKqERSY4zYRGgU9lKUxa4+fMySYOgpfS+AJ5AHe09nHzHZXxWca5Ih8oDqio6+RJwwrBOnUopWBbeUllo7457HV3cqIwnamb8FxUiY6XouRkmv0S++eXAyTrkMtOysTmwe0HnsmodjqUtBOVf31cHQRnDiVmE35mOfJEHvN2M6nJ5t6UaQHvEGcBqClOsOxrkYy88xCMKMmxcyex28O84Ge+iE6XcvrFOW35f08KND7EE2WguV96H3xYjrtGByH3xwImI+u7XwDeo/Tx7/PcrRi0ygYFi5MwQCl8zhPEjtg5D4Qv7NxJfBIkV7bMTHSyEAr/OS8aeD9+un1EVwiIar0rblAZ50H8TQPB2Ez79NbAlHp9etFI93ZWLjYQLdEcsKnM+gwmJeZ+zLhpCAkR1ONgajI8Z6S5An/OHWFotcUpPgUHmINBCUMdSKiyPjpV0IPmPPXruIXrxjTasPgHlpO1BPZ1zNTtax1/luNMj7ChCpb6kQ26tDH1Rn8oQDMY0PNjYkLo0C4+1KyjNQp7ID05C6MoEgHzCk="
+- 9.5.0
 branches:
   only:
   - develop
@@ -14,9 +10,8 @@ cache:
   - node_modules
 deploy:
   provider: npm
-  email: [email protected]
-  api_key:
-    secure: tKdp4/Xvu83IwtTahMHj8To2u9qa45MLco29i6tu9H2mjwyPHMjj4tUJYySdpBnPUSpFT3e+nlUS7H+pWPbLhqIG5ZYmtaM08EdT09mkv/IrT6IRNAyj1IAN6E6wtTQzHLgh0U8e+sjjdndLz8NbfYc4h+oc09RSeufLTjs5FFtOoCZQPieFRGiksZbuchNAkCS6h8Es0jCNFJdrzhUh9Ws1sR816O9lAY4NjoZuv4Gq8Jhv6bFl9h+KPOy0S4DXxlcde2tMZ1u+vuznw4gpP3FhUV9AXOAYnuyPT2XkCtPnZNVj+i/E6EwZeVbnpc6HRcWxA7qmNIfGLaKeCZL8MuWO4hMc/kqLHAhJPSb5/mpj4nwkEZhUnxKCERw2OJcbHQHp1MVLB39Q7L9WiQWBXTePwd92KYzMXb3J0aHRPl6V7ZNSjdk1AKw8Y8J72tb2icDQ+0k4eepZohFduC+hWB9ISPg+67ndXfM/zW18ynIqyyyKJM5zCzJbD/MGVYPgbz+Dl9U6zFuQgcKRO+CBcFZQVfU0uD4MUY7KnCyxTErLKyv5oqIr0Us/fCdtDcYS9RqAZFbB/gU+hICGc4jITEJ+FX4GaAh5AKAypvZ3FBiAWuYKCQeMEpuVtLdvU7Vn4KZ/w4Eifuz53qQjHpvfQm6UJeD9bjKXIhYaVnu6YFA=
+  email: $NPM_EMAIL
+  api_key: $NPM_TOKEN
   on:
     branch: master
     repo: plepers/nanogl

.travis.yml

@@ -0,0 +1,30 @@
+import Program from './program';
+import BaseBuffer from './basebuffer';
+import { GLContext } from './types';
+interface AttributeDef {
+    name: string;
+    type: GLenum;
+    size: number;
+    offset: number;
+    normalize: boolean;
+    stride: number;
+}
+declare class ArrayBuffer extends BaseBuffer {
+    readonly gl: GLContext;
+    readonly buffer: WebGLBuffer;
+    usage: GLenum;
+    stride: number;
+    byteLength: number;
+    length: number;
+    attribs: AttributeDef[];
+    constructor(gl: GLContext, data?: GLsizeiptr | BufferSource, usage?: GLenum, glbuffer?: WebGLBuffer);
+    bind(): void;
+    attrib(name: string, size: number, type: GLenum, normalize?: boolean): this;
+    data(array: BufferSource | GLsizeiptr): void;
+    subData(array: BufferSource, offset: number): void;
+    attribPointer(program: Program): void;
+    draw(mode: GLenum, count?: number, offset?: number): void;
+    dispose(): void;
+    _computeLength(): void;
+}
+export default ArrayBuffer;

arraybuffer.d.ts

@@ -1,150 +1,72 @@
-var BufferUtils = require( './bufferutils' );
-
-/*
- * GL_ARRAY_BUFFER */
-var TGT = 0x8892;
-
-
-
-/**
- * @class
- * @implements {Drawable}
- * @param {WebGLRenderingContext} gl      then webgl context this ArrayBuffer belongs to
- * @param {TypedArray|uint} [data]   optional data to copy to buffer, or the size (in bytes)
- * @param {GLenum} [usage=GL_STATIC_DRAW] the usage hint for this buffer.
- *
- */
-function ArrayBuffer( gl, data, usage ){
-  this.gl         = gl;
-  this.usage      = usage || gl.STATIC_DRAW;
-  this.buffer     = gl.createBuffer();
-  this.attribs    = [];
-  this.stride     = 0;
-  this.byteLength = 0;
-  this.length     = 0;
-
-  if( data ){
-    this.data( data );
-  }
-}
-
-
-ArrayBuffer.prototype = {
-
-  /**
-   * Bind the underlying webgl buffer.
-   */
-  bind: function(){
-    this.gl.bindBuffer( TGT, this.buffer );
-  },
-
-  /**
-   * Add attribute declaration for this buffer. Once attributes declared, the buffer can be linked to
-   * programs attributes using {@link ArrayBuffer#attribPointer}
-   *  @param {string} name the name of the program's attribute
-   *  @param {uint} size the size of the attribute (3 for a vec3)
-   *  @param {GLenum} type the type of data (GL_FLOAT, GL_SHORT etc)
-   *  @param {boolean} [normalize=false] indicate if the data must be normalized
-   */
-  attrib: function( name, size, type, normalize ){
-    this.attribs.push({
-      name      : name       ,
-      type      : 0|type     ,
-      size      : 0|size     ,
-      normalize : !!normalize,
-      offset    : this.stride
-    });
-    this.stride += BufferUtils.getComponentSize( type ) * size;
-    this._computeLength();
-    return this;
-  },
-
-  /**
-   * Fill webgl buffer with the given data. You can also pass a uint  to allocate the buffer to the given size.
-   *   @param {TypedArray|uint} array the data to send to the buffer, or a size.
-   */
-  data: function( array ){
-    var gl = this.gl;
-    gl.bindBuffer( TGT, this.buffer );
-    gl.bufferData( TGT, array, this.usage );
-    gl.bindBuffer( TGT, null );
-
-    this.byteLength = ( array.byteLength === undefined ) ? array : array.byteLength;
-    this._computeLength();
-  },
-
-  /**
-   * Set a part of the buffer with the given data, starting a offset (in bytes)
-   *  @param {typedArray} array the data to send to buffer
-   *  @param {uint} offset the offset in byte where the data will be written
-   */
-  subData: function( array, offset ){
-    var gl = this.gl;
-    gl.bindBuffer(    TGT, this.buffer );
-    gl.bufferSubData( TGT, offset, array );
-    gl.bindBuffer(    TGT, null );
-  },
-
-  /**
-   * Link given program attributes to this buffer. You should first declare attributes using {@link ArrayBuffer#attrib}
-   * before calling this method.
-   *   @param {Program} program the nanogl Program
-   */
-  attribPointer: function( program ){
-    var gl = this.gl;
-    gl.bindBuffer( TGT, this.buffer );
-
-    for (var i = 0; i < this.attribs.length; i++) {
-      var attrib = this.attribs[i];
-
-      if( program[attrib.name] !== undefined ){
-        var aLocation = program[attrib.name]();
-        gl.enableVertexAttribArray( aLocation );
-        gl.vertexAttribPointer( aLocation,
-                                attrib.size,
-                                attrib.type,
-                                attrib.normalize,
-                                this.stride,
-                                attrib.offset
-                              );
-      }
-
+import BaseBuffer from './basebuffer';
+import { getComponentSize, isBufferSource } from './utils';
+const GL_ARRAY_BUFFER = 0x8892;
+class ArrayBuffer extends BaseBuffer {
+    constructor(gl, data, usage = gl.STATIC_DRAW, glbuffer) {
+        super();
+        this.gl = gl;
+        this.usage = usage;
+        this.buffer = (glbuffer !== undefined) ? glbuffer : gl.createBuffer();
+        this.attribs = [];
+        this.stride = 0;
+        this.byteLength = 0;
+        this.length = 0;
+        if (data) {
+            this.data(data);
+        }
+    }
+    bind() {
+        this.gl.bindBuffer(GL_ARRAY_BUFFER, this.buffer);
+    }
+    attrib(name, size, type, normalize = false) {
+        this.attribs.push({
+            name,
+            type: 0 | type,
+            size: 0 | size,
+            normalize,
+            offset: this.stride,
+            stride: 0
+        });
+        this.stride += getComponentSize(type) * size;
+        this._computeLength();
+        return this;
+    }
+    data(array) {
+        const gl = this.gl;
+        gl.bindBuffer(GL_ARRAY_BUFFER, this.buffer);
+        gl.bufferData(GL_ARRAY_BUFFER, array, this.usage);
+        gl.bindBuffer(GL_ARRAY_BUFFER, null);
+        this.byteLength = isBufferSource(array) ? array.byteLength : array;
+        this._computeLength();
+    }
+    subData(array, offset) {
+        const gl = this.gl;
+        gl.bindBuffer(GL_ARRAY_BUFFER, this.buffer);
+        gl.bufferSubData(GL_ARRAY_BUFFER, offset, array);
+        gl.bindBuffer(GL_ARRAY_BUFFER, null);
     }
-  },
-
-  /**
-   * Shortcut to gl.drawArrays
-   *   @param {GLenum} mode the type of primitive to draw (GL_TRIANGLE, GL_POINTS etc)
-   *   @param {uint} [count] the number of vertices to draw (full buffer is used if omited)
-   *   @param {uint} [offset=0] the position of the first vertex to draw
-   */
-  draw: function( mode, count, offset ){
-    count  = ( count === undefined  ) ? this.length : count;
-    this.gl.drawArrays( mode, offset, 0|count );
-  },
-
-  /**
-   * Delete underlying webgl objects
-   */
-  dispose: function(){
-    this.gl.deleteBuffer( this.buffer );
-    this.buffer = null;
-    this.gl = null;
-  },
-
-
-  _computeLength: function(){
-    if( this.stride > 0 ) {
-      this.length = this.byteLength / this.stride;
+    attribPointer(program) {
+        const gl = this.gl;
+        gl.bindBuffer(GL_ARRAY_BUFFER, this.buffer);
+        for (var i = 0; i < this.attribs.length; i++) {
+            var attrib = this.attribs[i];
+            if (program[attrib.name] !== undefined) {
+                var aLocation = program[attrib.name]();
+                gl.enableVertexAttribArray(aLocation);
+                gl.vertexAttribPointer(aLocation, attrib.size, attrib.type, attrib.normalize, attrib.stride || this.stride, attrib.offset);
+            }
+        }
     }
-  }
-
-};
-
-/*
- * Implement Drawable
- */
-BufferUtils.Drawable( ArrayBuffer.prototype );
-
-
-module.exports = ArrayBuffer;
+    draw(mode, count = this.length, offset = 0) {
+        this.gl.drawArrays(mode, offset, 0 | count);
+    }
+    dispose() {
+        this.gl.deleteBuffer(this.buffer);
+    }
+    _computeLength() {
+        if (this.stride > 0) {
+            this.length = this.byteLength / this.stride;
+        }
+    }
+}
+export default ArrayBuffer;

arraybuffer.js

@@ -0,0 +1,15 @@
+declare abstract class BaseBuffer {
+    abstract bind(): void;
+    abstract dispose(): void;
+    abstract data(array: BufferSource | GLsizeiptr): void;
+    abstract subData(array: BufferSource, offset: number): void;
+    abstract draw(mode: GLenum, count?: number, offset?: number): void;
+    drawPoints(count?: number, offset?: number): void;
+    drawLines(count?: number, offset?: number): void;
+    drawLineLoop(count?: number, offset?: number): void;
+    drawLineStrip(count?: number, offset?: number): void;
+    drawTriangles(count?: number, offset?: number): void;
+    drawTriangleStrip(count?: number, offset?: number): void;
+    drawTriangleFan(count?: number, offset?: number): void;
+}
+export default BaseBuffer;

basebuffer.d.ts

@@ -0,0 +1,24 @@
+class BaseBuffer {
+    drawPoints(count, offset) {
+        this.draw(0, count, offset);
+    }
+    drawLines(count, offset) {
+        this.draw(1, count, offset);
+    }
+    drawLineLoop(count, offset) {
+        this.draw(2, count, offset);
+    }
+    drawLineStrip(count, offset) {
+        this.draw(3, count, offset);
+    }
+    drawTriangles(count, offset) {
+        this.draw(4, count, offset);
+    }
+    drawTriangleStrip(count, offset) {
+        this.draw(5, count, offset);
+    }
+    drawTriangleFan(count, offset) {
+        this.draw(6, count, offset);
+    }
+}
+export default BaseBuffer;