Upgrade shelf-pack and shrink atlases to final size

mapbox · Aug 29, 2017 · 363fc47 · 363fc47
1 parent 4919476
commit 363fc47
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/flow-typed/shelf-pack.js b/flow-typed/shelf-pack.js
@@ -15,6 +15,7 @@ declare module "@mapbox/shelf-pack" {
 
         pack(bins: Array<{w: number, h: number}>, options?: {inPlace: boolean}): Array<Bin>;
         packOne(w: number, h: number, id?: number|string): Bin;
+        shrink(): void;
 
         ref(bin: Bin): number;
         unref(bin: Bin): number;

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "@mapbox/gl-matrix": "^0.0.1",
     "@mapbox/point-geometry": "^0.1.0",
-    "@mapbox/shelf-pack": "^3.0.0",
+    "@mapbox/shelf-pack": "^3.1.0",
     "@mapbox/tiny-sdf": "^1.1.0",
     "@mapbox/unitbezier": "^0.0.0",
     "@mapbox/vector-tile": "^1.3.0",

diff --git a/src/render/glyph_atlas.js b/src/render/glyph_atlas.js
@@ -61,11 +61,11 @@ function makeGlyphAtlas(stacks: {[string]: {[number]: ?StyleGlyph}}): GlyphAtlas
         }
     }
 
-    // pack.shrink();
-    // resizeAlphaImage(image, {
-    //     width: pack.w,
-    //     height: pack.h
-    // });
+    pack.shrink();
+    AlphaImage.resize(image, {
+        width: pack.w,
+        height: pack.h
+    });
 
     return {image, positions};
 }

diff --git a/src/render/image_atlas.js b/src/render/image_atlas.js
@@ -86,11 +86,11 @@ function makeImageAtlas(images: {[string]: StyleImage}): ImageAtlas {
         positions[id] = imagePosition(bin, src);
     }
 
-    // pack.shrink();
-    // resizeImageData(image, {
-    //     width: pack.w,
-    //     height: pack.h
-    // });
+    pack.shrink();
+    RGBAImage.resize(image, {
+        width: pack.w,
+        height: pack.h
+    });
 
     return {image, positions};
 }

diff --git a/src/render/texture.js b/src/render/texture.js
@@ -38,6 +38,7 @@ class Texture {
 
         const {gl} = this;
         gl.bindTexture(gl.TEXTURE_2D, this.texture);
+        gl.pixelStorei(gl.UNPACK_ALIGNMENT, 1);
 
         if (this.format === gl.RGBA) {
             gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, (true: any));

diff --git a/yarn.lock b/yarn.lock
@@ -26,9 +26,9 @@
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2"
 
-"@mapbox/shelf-pack@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/shelf-pack/-/shelf-pack-3.0.0.tgz#44e284c8336eeda1e9dbbb1d61954c70e26e5766"
+"@mapbox/shelf-pack@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/shelf-pack/-/shelf-pack-3.1.0.tgz#1edea9c0bf6715b217171ba60646c201af520f6a"
 
 "@mapbox/tiny-sdf@^1.1.0":
   version "1.1.0"