WIP

js/data/buffer/buffer.js

@@ -74,5 +74,12 @@ Buffer.prototype = {
 
             this.setupViews();
         }
+    },
+
+    serialize: function() {
+        return {
+            serialized: this,
+            transferables: [this.array]
+        };
     }
 };

js/data/buffer/triangle_element_buffer.js

@@ -1,27 +1,21 @@
 'use strict';
 
-var util = require('../../util/util');
-var Buffer = require('./buffer');
-
-module.exports = TriangleElementBuffer;
-
-function TriangleElementBuffer(buffer) {
-    Buffer.call(this, buffer);
-}
-
-TriangleElementBuffer.prototype = util.inherit(Buffer, {
-    itemSize: 6, // bytes per triangle (3 * unsigned short == 6 bytes)
-    arrayType: 'ELEMENT_ARRAY_BUFFER',
-
-    add: function(a, b, c) {
-        var pos2 = this.pos / 2;
-
-        this.resize();
-
-        this.ushorts[pos2 + 0] = a;
-        this.ushorts[pos2 + 1] = b;
-        this.ushorts[pos2 + 2] = c;
-
-        this.pos += this.itemSize;
+var createBuffer2Shim = require('../buffer2_shim');
+var Buffer2 = require('../buffer2');
+
+module.exports = createBuffer2Shim({
+    buffer2: {
+        type: Buffer2.BufferType.ELEMENT,
+        attributes: {
+            verticies: {
+                components: 3,
+                type: Buffer2.AttributeType.UNSIGNED_SHORT
+            }
+        }
+    },
+    methods: {
+        add: function(a, b, c) {
+            this.buffer2.push([a, b, c]);
+        }
     }
 });

js/data/buffer2_shim.js

@@ -0,0 +1,25 @@
+'use strict';
+
+var Buffer1 = require('./buffer/buffer');
+var Buffer2 = require('./buffer2');
+var util = require('../util/util');
+
+module.exports = function createBuffer2Shim(options) {
+
+    function Klass(instanceOptions) {
+        this.buffer2 = new Buffer2(instanceOptions || options.buffer2);
+    }
+
+    Klass.prototype = util.inherit(Klass, util.extend({
+        get pos() { return this.buffer2.length * this.itemSize; },
+        get itemSize() { return this.buffer2.itemSize; },
+        get array() { return this.buffer2.arrayBuffer; },
+        get arrayType() { return this.buffer2.type; },
+        bind: Buffer1.prototype.bind,
+        destroy: Buffer1.prototype.destroy,
+        serialize: function() { return this.buffer2.serialize(); }
+    }, options.methods));
+
+    return Klass;
+
+};

js/source/worker_tile.js

@@ -211,11 +211,14 @@ WorkerTile.prototype.parse = function(data, layers, actor, callback) {
             buffers.collisionBoxVertex = result.buffers.collisionBoxVertex;
         }
 
-        var transferables = [],
-            elementGroups = {};
+        var transferables = [];
+        var serializedBuffers = [];
+        var elementGroups = {};
 
         for (k in buffers) {
-            transferables.push(buffers[k].array);
+            var buffer = buffers[k];
+            serializedBuffers.push(buffer.serialized);
+            transferables = transferables.concat(buffer.transferables);
         }
 
         for (k in buckets) {
@@ -239,7 +242,6 @@ WorkerTile.prototype.redoPlacement = function(angle, pitch, collisionDebug) {
     }
 
     var buffers = new BufferSet();
-    var transferables = [];
     var elementGroups = {};
     var collisionTile = new CollisionTile(angle, pitch);
 
@@ -253,8 +255,13 @@ WorkerTile.prototype.redoPlacement = function(angle, pitch, collisionDebug) {
         }
     }
 
+    var serializedBuffers = [];
+    var transferables = [];
+
     for (var k in buffers) {
-        transferables.push(buffers[k].array);
+        var buffer = buffers[k].serialize();
+        transferables = transferables.concat(buffer.transferables);
+        serializedBuffers.push(buffer.serialized);
     }
 
     return {

test/js/buffer/triangle_element_buffer.test.js

@@ -1,14 +1,12 @@
 'use strict';
 
 var test = require('prova');
-var Buffer = require('../../../js/data/buffer/buffer');
 var TriangleElementBuffer = require('../../../js/data/buffer/triangle_element_buffer');
 
 test('TriangleElementBuffer', function(t) {
-    var buf = new Buffer();
-    t.ok(new TriangleElementBuffer(buf), 'default buffer');
-    var triangleElems = new TriangleElementBuffer(buf);
-    triangleElems.setupViews();
+    var serialized = (new TriangleElementBuffer()).serialize().serialized;
+    t.ok(new TriangleElementBuffer(serialized), 'default buffer');
+    var triangleElems = new TriangleElementBuffer(serialized);
     t.equal(triangleElems.itemSize, 6);
     t.equal(triangleElems.arrayType, 'ELEMENT_ARRAY_BUFFER');
     t.equal(triangleElems.add(0, 0, 0), undefined);