remove *_buffer files and consolidate buffer layouts

mapbox · Oct 1, 2015 · 7adae7a · 7adae7a
1 parent 48210eb
commit 7adae7a
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 206 deletions.
diff --git a/js/data/buffer/buffer_set.js b/js/data/buffer/buffer_set.js
diff --git a/js/data/buffer/circle_vertex_buffer.js b/js/data/buffer/circle_vertex_buffer.js
diff --git a/js/data/buffer/collision_box_vertex_buffer.js b/js/data/buffer/collision_box_vertex_buffer.js
diff --git a/js/data/buffer/fill_vertex_buffer.js b/js/data/buffer/fill_vertex_buffer.js
diff --git a/js/data/buffer/line_vertex_buffer.js b/js/data/buffer/line_vertex_buffer.js
diff --git a/js/data/buffer/outline_element_buffer.js b/js/data/buffer/outline_element_buffer.js
diff --git a/js/data/buffer/symbol_vertex_buffer.js b/js/data/buffer/symbol_vertex_buffer.js
diff --git a/js/data/buffer/triangle_element_buffer.js b/js/data/buffer/triangle_element_buffer.js
diff --git a/js/data/buffer_set.js b/js/data/buffer_set.js
@@ -0,0 +1,60 @@
+'use strict';
+
+var Buffer = require('./buffer');
+
+module.exports = BufferSet;
+
+var fillVertexOptions = {type: Buffer.BufferType.VERTEX, attributes: [
+    {name: 'pos', components: 2, type: Buffer.AttributeType.SHORT}
+]};
+
+var lineVertexOptions = {type: Buffer.BufferType.VERTEX, attributes: [
+    {name: 'pos',  components: 2, type: Buffer.AttributeType.SHORT},
+    {name: 'data', components: 4, type: Buffer.AttributeType.BYTE}
+]};
+
+var symbolVertexOptions = {type: Buffer.BufferType.VERTEX, attributes: [
+    {name: 'pos',    components: 2, type: Buffer.AttributeType.SHORT},
+    {name: 'offset', components: 2, type: Buffer.AttributeType.SHORT},
+    {name: 'data1',  components: 4, type: Buffer.AttributeType.UNSIGNED_BYTE},
+    {name: 'data2',  components: 4, type: Buffer.AttributeType.UNSIGNED_BYTE}
+]};
+
+var collisionBoxVertexOptions = {type: Buffer.BufferType.VERTEX, attributes: [
+    {name: 'pos',     components: 2, type: Buffer.AttributeType.SHORT},
+    {name: 'extrude', components: 2, type: Buffer.AttributeType.SHORT},
+    {name: 'data',    components: 2, type: Buffer.AttributeType.UNSIGNED_BYTE}
+]};
+
+var triangleElementOptions = {type: Buffer.BufferType.ELEMENT, attributes: [
+    {name: 'vertices', components: 3, type: Buffer.AttributeType.ELEMENT_ATTRIBUTE_TYPE}
+]};
+
+var outlineElementOptions = {type: Buffer.BufferType.ELEMENT, attributes: [
+    {name: 'vertices', components: 2, type: Buffer.AttributeType.ELEMENT_ATTRIBUTE_TYPE}
+]};
+
+var bufferOptions = {
+    glyphVertex: symbolVertexOptions,
+    glyphElement: triangleElementOptions,
+    iconVertex: symbolVertexOptions,
+    iconElement: triangleElementOptions,
+    circleVertex: fillVertexOptions,
+    circleElement: triangleElementOptions,
+    fillVertex: fillVertexOptions,
+    fillElement: triangleElementOptions,
+    outlineElement: outlineElementOptions,
+    lineVertex: lineVertexOptions,
+    lineElement: triangleElementOptions,
+    collisionBoxVertex: collisionBoxVertexOptions
+};
+
+function BufferSet(bufferset) {
+    bufferset = bufferset || {};
+
+    for (var id in bufferOptions) {
+        bufferset[id] = bufferset[id] || new Buffer(bufferOptions[id]);
+    }
+
+    return bufferset;
+}
diff --git a/js/source/tile.js b/js/source/tile.js
@@ -4,7 +4,7 @@ var glmatrix = require('gl-matrix');
 var mat2 = glmatrix.mat2;
 var mat4 = glmatrix.mat4;
 var util = require('../util/util');
-var BufferSet = require('../data/buffer/buffer_set');
+var BufferSet = require('../data/buffer_set');
 
 module.exports = Tile;
 

diff --git a/js/source/worker_tile.js b/js/source/worker_tile.js
@@ -2,7 +2,7 @@
 
 var FeatureTree = require('../data/feature_tree');
 var CollisionTile = require('../symbol/collision_tile');
-var BufferSet = require('../data/buffer/buffer_set');
+var BufferSet = require('../data/buffer_set');
 var createBucket = require('../data/create_bucket');
 
 module.exports = WorkerTile;

diff --git a/test/js/data/create_bucket.test.js b/test/js/data/create_bucket.test.js
@@ -2,7 +2,7 @@
 
 var test = require('prova');
 var createBucket = require('../../../js/data/create_bucket');
-var BufferSet = require('../../../js/data/buffer/buffer_set');
+var BufferSet = require('../../../js/data/buffer_set');
 var LineBucket = require('../../../js/data/line_bucket');
 var FillBucket = require('../../../js/data/fill_bucket');
 var SymbolBucket = require('../../../js/data/symbol_bucket');

diff --git a/test/js/data/fill_bucket.test.js b/test/js/data/fill_bucket.test.js
@@ -6,7 +6,7 @@ var Protobuf = require('pbf');
 var VectorTile = require('vector-tile').VectorTile;
 var Point = require('point-geometry');
 var FillBucket = require('../../../js/data/fill_bucket');
-var BufferSet = require('../../../js/data/buffer/buffer_set');
+var BufferSet = require('../../../js/data/buffer_set');
 var path = require('path');
 
 // Load a fill feature from fixture tile.

diff --git a/test/js/data/line_bucket.test.js b/test/js/data/line_bucket.test.js
@@ -7,7 +7,7 @@ var Protobuf = require('pbf');
 var VectorTile = require('vector-tile').VectorTile;
 var Point = require('point-geometry');
 var LineBucket = require('../../../js/data/line_bucket');
-var BufferSet = require('../../../js/data/buffer/buffer_set');
+var BufferSet = require('../../../js/data/buffer_set');
 
 // Load a line feature from fixture tile.
 var vt = new VectorTile(new Protobuf(new Uint8Array(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf')))));

diff --git a/test/js/data/symbol_bucket.test.js b/test/js/data/symbol_bucket.test.js
@@ -6,7 +6,7 @@ var path = require('path');
 var Protobuf = require('pbf');
 var VectorTile = require('vector-tile').VectorTile;
 var SymbolBucket = require('../../../js/data/symbol_bucket');
-var BufferSet = require('../../../js/data/buffer/buffer_set');
+var BufferSet = require('../../../js/data/buffer_set');
 var Collision = require('../../../js/symbol/collision_tile');
 var GlyphAtlas = require('../../../js/symbol/glyph_atlas');
 var LayoutProperties = require('../../../js/style/layout_properties');

diff --git a/test/js/geo/transform.test.js b/test/js/geo/transform.test.js
@@ -4,7 +4,6 @@ var test = require('prova');
 var Point = require('point-geometry');
 var Transform = require('../../../js/geo/transform');
 var LngLat = require('../../../js/geo/lng_lat');
-var VertexBuffer = require('../../../js/data/buffer/line_vertex_buffer');
 
 var fixed = require('../../testutil/fixed');
 var fixedLngLat = fixed.LngLat;
@@ -136,12 +135,3 @@ test('transform', function(t) {
         t.end();
     });
 });
-
-test('vertex buffer', function(t) {
-    t.test('is initialized', function(t) {
-        var buf = new VertexBuffer();
-        t.deepEqual(buf.length, 0);
-        t.deepEqual(buf.capacity, 8192);
-        t.end();
-    });
-});