added platform detection & multiple binaries

Experience-Monks · Aug 17, 2016 · cbe30c7 · cbe30c7
1 parent 0aa552a
commit cbe30c7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/bin/freetype6.dll b/bin/freetype6.dll
diff --git a/bin/msdfgen.exe b/bin/msdfgen.exe
diff --git a/msdfgen.osx → bin/msdfgen.osx b/msdfgen.osx → bin/msdfgen.osx
diff --git a/bin/zlib1.dll b/bin/zlib1.dll
diff --git a/index.js b/index.js
@@ -3,12 +3,24 @@ const exec = require('child_process').exec;
 const mapLimit = require('map-limit');
 const MultiBinPacker = require('multi-bin-packer');
 const Canvas = require('canvas');
+const path = require('path');
 
 const defaultCharset = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~".split('');
 
+const binaryLookup = {
+  darwin: 'msdfgen.osx',
+  win32: 'msdfgen.exe'
+};
+
 module.exports = generateBMFont;
 
 function generateBMFont (fontPath, opt, callback) {
+  const binName = binaryLookup[process.platform];
+  if (binName === undefined) {
+    throw new Error(`No msdfgen binary for platform ${process.platform}.`);
+  }
+  const binaryPath = path.join(__dirname, 'bin', binName);
+
   if (!fontPath || typeof fontPath !== 'string') {
     throw new TypeError('must specify a font path');
   }
@@ -45,7 +57,14 @@ function generateBMFont (fontPath, opt, callback) {
   const packer = new MultiBinPacker(textureWidth, textureHeight, texturePadding);
   const chars = [];
   mapLimit(charset, 15, (char, cb) => {
-    generateImage(fontPath, font, char, fontSize, fieldType, distanceRange, (err, res) => {
+    generateImage({
+      binaryPath,
+      font,
+      char,
+      fontSize,
+      fieldType,
+      distanceRange
+    }, (err, res) => {
       if (err) return cb(err);
       cb(null, res);
     });
@@ -103,7 +122,8 @@ function generateBMFont (fontPath, opt, callback) {
   });
 }
 
-function generateImage (fontPath, font, char, fontSize, fieldType, distanceRange, callback) {
+function generateImage (opt, callback) {
+  const {binaryPath, font, char, fontSize, fieldType, distanceRange} = opt;
   const glyph = font.charToGlyph(char);
   const commands = glyph.getPath(0, 0, fontSize).commands;
   let contours = [];
@@ -152,7 +172,7 @@ function generateImage (fontPath, font, char, fontSize, fieldType, distanceRange
   let width = Math.round(bBox[2] - bBox[0]) + pad + pad;
   let height = Math.round(bBox[3] - bBox[1]) + pad + pad;
   let topOffset = -bBox[1] + pad;
-  let command = `${__dirname}/msdfgen.osx ${fieldType} -format text -stdout -size ${width} ${height} -translate ${pad} ${topOffset} -pxrange ${distanceRange} -defineshape "${shapeDesc}"`;
+  let command = `${binaryPath} ${fieldType} -format text -stdout -size ${width} ${height} -translate ${pad} ${topOffset} -pxrange ${distanceRange} -defineshape "${shapeDesc}"`;
 
   exec(command, (err, stdout, stderr) => {
     if (err) return callback(err);