🐛 Hotfix: fix font import issues on Windows, as well as fix potential…

… similar issues for other asset types
ct-js · Aug 29, 2020 · c9a3ef5 · c9a3ef5
1 parent 57d8bd8
commit c9a3ef5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/app/Changelog.md b/app/Changelog.md
@@ -54,6 +54,7 @@
 * Fix overflow issues and wrong initial values for bitmap font generator.
 * Fix regression from v1.4 with blurry particle editor and room view when pixelart rendering was enabled.
 * Fix `user-select` CSS parameter on modules' docs panel.
+* Hotfix: fix font import issues on Windows, as well as fix potential similar issues for other asset types
 
 ### 🍱 Demos, Dependencies and Stuff
 

diff --git a/src/node_requires/resources/fonts/index.js b/src/node_requires/resources/fonts/index.js
@@ -8,7 +8,7 @@ const getPathToTtf = function getPathToTtf(font, fs) {
     if (fs) {
         return path.join(global.projdir, 'fonts', font.origname);
     }
-    return `file://${global.projdir}/fonts/${font.origname}`;
+    return `file://${global.projdir.replace(/\\/g, '/')}/fonts/${font.origname}`;
 };
 
 /**
@@ -21,7 +21,7 @@ const getFontPreview = function getFontPreview(font, fs) {
     if (fs) {
         return path.join(global.projdir, 'fonts', `${font.origname}_prev.png`);
     }
-    return `file://${global.projdir}/fonts/${font.origname}_prev.png?cache=${font.lastmod}`;
+    return `file://${global.projdir.replace(/\\/g, '/')}/fonts/${font.origname}_prev.png?cache=${font.lastmod}`;
 };
 
 const fontGenPreview = async function fontGenPreview(font) {
@@ -52,7 +52,7 @@ const fontGenPreview = async function fontGenPreview(font) {
     c.x.clearRect(0, 0, 64, 64);
     c.x.font = `${font.italic ? 'italic ' : ''}${font.weight} ${Math.floor(64 * 0.75)}px "${loaded.family}"`;
     c.x.fillStyle = '#000';
-    c.x.fillText('Aa', 64 * 0.05, 64 * 0.75);
+    c.x.fillText('Ab', 64 * 0.05, 64 * 0.75);
 
     // strip off the data:image url prefix to get just the base64-encoded bytes
     const dataURL = c.toDataURL();
@@ -64,14 +64,14 @@ const fontGenPreview = async function fontGenPreview(font) {
 const importTtfToFont = async function importTtfToFont(src) {
     const fs = require('fs-extra'),
           path = require('path');
-    if (path.extname(src) !== '.ttf') {
+    if (path.extname(src).toLowerCase() !== '.ttf') {
         throw new Error(`[resources/fonts] Rejecting a file as it does not have a .ttf extension: ${src}`);
     }
     const generateGUID = require('./../../generateGUID');
     const uid = generateGUID();
     await fs.copy(src, path.join(global.projdir, '/fonts/f' + uid + '.ttf'));
     const obj = {
-        typefaceName: path.basename(src).replace('.ttf', ''),
+        typefaceName: path.basename(src).replace(/\.ttf$/i, ''),
         weight: 400,
         italic: false,
         origname: `f${uid}.ttf`,

diff --git a/src/node_requires/resources/skeletons.js b/src/node_requires/resources/skeletons.js
@@ -25,7 +25,7 @@ const getSkeletonPreview = function getSkeletonPreview(skeleton, fs) {
     if (fs) {
         return path.join(global.projdir, 'img', `${skeleton.origname}_prev.png`);
     }
-    return `file://${global.projdir}/img/${skeleton.origname}_prev.png`;
+    return `file://${global.projdir.replace(/\\/g, '/')}/img/${skeleton.origname}_prev.png`;
 };
 
 /**

diff --git a/src/node_requires/resources/textures/index.js b/src/node_requires/resources/textures/index.js
@@ -28,7 +28,7 @@ const getTexturePreview = function (texture, x2, fs) {
     if (fs) {
         return `${global.projdir}/img/${texture.origname}_prev${x2 ? '@2' : ''}.png`;
     }
-    return `file://${global.projdir}/img/${texture.origname}_prev${x2 ? '@2' : ''}.png?cache=${texture.lastmod}`;
+    return `file://${global.projdir.replace(/\\/g, '/')}/img/${texture.origname}_prev${x2 ? '@2' : ''}.png?cache=${texture.lastmod}`;
 };
 
 /**
@@ -47,14 +47,14 @@ const getTextureOrig = function (texture, fs) {
     if (fs) {
         return `${global.projdir}/img/${texture.origname}`;
     }
-    return `file://${global.projdir}/img/${texture.origname}?cache=${texture.lastmod}`;
+    return `file://${global.projdir.replace(/\\/g, '/')}/img/${texture.origname}?cache=${texture.lastmod}`;
 };
 
 const baseTextureFromTexture = texture => new Promise((resolve, reject) => {
     const textureLoader = new PIXI.Loader();
     const {resources} = textureLoader;
 
-    const path = 'file://' + global.projdir + '/img/' + texture.origname + '?' + texture.lastmod;
+    const path = 'file://' + global.projdir.replace(/\\/g, '/') + '/img/' + texture.origname + '?' + texture.lastmod;
 
     textureLoader.add(texture.uid, path);
     textureLoader.onError.add(reject);
@@ -111,7 +111,7 @@ const getDOMImage = function (texture, deflt) {
         if (typeof texture === 'string') {
             texture = getTextureFromId(texture);
         }
-        path = 'file://' + global.projdir + '/img/' + texture.origname + '?' + texture.lastmod;
+        path = 'file://' + global.projdir.replace(/\\/g, '/') + '/img/' + texture.origname + '?' + texture.lastmod;
     }
     img.src = path;
     return new Promise((resolve, reject) => {