Initial commit for fork

kitzsh · kitzsh · commit 19e0ec46a88a · 2025-06-28T02:36:06.000+10:00
diff --git a/README.md b/README.md
@@ -1,14 +1,17 @@
-# Free texture packer
-
+# Tex-Packer-EX
 ![logo](https://raw.githubusercontent.com/odrick/free-tex-packer/master/electron/build/icons/96x96.png)
-
 #
 
-## IMPORTANT: I don't have time to imporove this app anymore. Only critical bugs will be fixed.
+Tex-Packer-EX is a fork of [Free texture packer](https://github.com/odrick/free-tex-packer) which adds new features and bug fixes, including:
+- The ability to repack existing spritesheets
+- Splitter for Sparrow/Starling spritesheets (the standard format for FNF)
+- Correctly ordered frames when exporting
 
-#
+This was primarily created with Friday Night Funkin' modding in mind, however it can be used for any other project.
+
+# Free texture packer
 
-Free texture packer creates sprite sheets for you game or site. Rotation, trimming, multipacking, various export formats (json, xml, css, pixi.js, godot, phaser, cocos2d). Zip support. TinyPNG support. Split sheet tool.
+Free texture packer creates sprite sheets for your game or site. Rotation, trimming, multipacking, various export formats (json, xml, css, pixi.js, godot, phaser, cocos2d). Zip support. TinyPNG support. Split sheet tool.
 
 ![screenshot](https://free-tex-packer.com/wp-content/uploads/2019/01/screenshot.png)
 
diff --git a/dist/web/static/localization/de.csv b/dist/web/static/localization/de.csv
@@ -132,8 +132,9 @@ CONTEXT_MENU_PASTE;Einfügen
 CONTEXT_MENU_DELETE;Löschen
 CONTEXT_MENU_SELECT_ALL;Alles markieren
 SPLIT;Extrahieren
+REPACK;Wieder verpacken
 SELECT_TEXTURE;Textur
 SELECT_DATA_FILE;Daten-Datei
-SPLITTER;Sprites aus Bild extrahieren
+SPLITTER;Wieder verpacken/Sprites aus Bild extrahieren
 SPLITTER_ERROR_NO_FRAMES;Sprites wurden nicht gefunden. Vermutlich ist das Atlas Format falsch.
 HOLD_TRIM;Trim beibehalten:
diff --git a/dist/web/static/localization/en.csv b/dist/web/static/localization/en.csv
@@ -133,8 +133,9 @@ CONTEXT_MENU_PASTE;Paste
 CONTEXT_MENU_DELETE;Delete
 CONTEXT_MENU_SELECT_ALL;Select all
 SPLIT;Split
+REPACK;Repack
 SELECT_TEXTURE;Texture
 SELECT_DATA_FILE;Data file
-SPLITTER;Split sheet
+SPLITTER;Repack/Split sheet
 SPLITTER_ERROR_NO_FRAMES;Sprites not found. Probably, atlas format is incorrect.
 HOLD_TRIM;Hold trim:
diff --git a/dist/web/static/localization/es.csv b/dist/web/static/localization/es.csv
@@ -133,8 +133,9 @@ CONTEXT_MENU_PASTE;Pegar
 CONTEXT_MENU_DELETE;Borrar
 Desembalaje;Selecionar todo
 SPLIT;Desembalaje
+REPACK;Reempaquetar
 SELECT_TEXTURE;Textura
 SELECT_DATA_FILE;Datos
-SPLITTER;Desembalaje atlas
+SPLITTER;Reempaquetar/Desembalaje atlas
 SPLITTER_ERROR_NO_FRAMES;No se ha encontrado ningún sprite. Quizás el formato del atlas sea incorrecto.
 HOLD_TRIM;Mantener corte:
diff --git a/dist/web/static/localization/ru.csv b/dist/web/static/localization/ru.csv
@@ -133,8 +133,9 @@ CONTEXT_MENU_PASTE;Вставить
 CONTEXT_MENU_DELETE;Удалить
 CONTEXT_MENU_SELECT_ALL;Выделить все
 SPLIT;Распаковать
+REPACK;Переупаковка
 SELECT_TEXTURE;Текстура
 SELECT_DATA_FILE;Данные
-SPLITTER;Распаковка атласа
+SPLITTER;Переупаковка/Распаковка атласа
 SPLITTER_ERROR_NO_FRAMES;Не найдено ни одного спрайта. Возможно, формат атласа неверен.
 HOLD_TRIM;Обрезать:
diff --git a/dist/web/static/localization/zh-cn.csv b/dist/web/static/localization/zh-cn.csv
@@ -133,8 +133,9 @@ CONTEXT_MENU_PASTE;粘贴
 CONTEXT_MENU_DELETE;删除
 CONTEXT_MENU_SELECT_ALL;选择全部
 SPLIT;分割
+REPACK;重新包装
 SELECT_TEXTURE;纹理图
 SELECT_DATA_FILE;数据文件
-SPLITTER;分割精灵表
+SPLITTER;重新包装/分割精灵表
 SPLITTER_ERROR_NO_FRAMES;精灵图没有找到，请检查文件格式是否正确。
 HOLD_TRIM;保持整齐(修剪):
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "free-tex-packer",
-  "displayName": "Free texture packer",
-  "version": "0.6.7",
+  "name": "tex-packer-ex",
+  "displayName": "Tex-Packer-EX",
+  "version": "0.6.8",
   "description": "Free online texture packer",
-  "url": "http://free-tex-packer.com",
-  "download": "http://free-tex-packer.com/download",
-  "webApp": "http://free-tex-packer.com/app",
+  "url": "https://strawberrysage.github.io/tex-packer-ex",
+  "download": "https://strawberrysage.github.io/tex-packer-ex",
+  "webApp": "https://strawberrysage.github.io/tex-packer-ex",
   "main": "src/index.js",
   "tinifyUrl": "http://free-tex-packer.com/server/tinify.php",
   "localizations": [
@@ -47,6 +47,10 @@
     {
       "name": "Davide Matta aka DadeKuma",
       "homepage": "https://github.com/DadeKuma"
+    },
+    {
+      "name": "StrawberrySage",
+      "homepage": "https://github.com/StrawberrySage"
     }
   ],
   "scripts": {
@@ -108,4 +112,4 @@
     "webpack-dev-server": "^3.1.14",
     "xml2js": "^0.4.19"
   }
-}
+}
diff --git a/src/client/Observer.js b/src/client/Observer.js
@@ -26,7 +26,8 @@ let GLOBAL_EVENT = {
     DOWNLOAD_PROGRESS_CHANGED    : "DOWNLOAD_PROGRESS_CHANGED",
     INSTALL_UPDATE               : "INSTALL_UPDATE",
     SHOW_SHEET_SPLITTER          : "SHOW_SHEET_SPLITTER",
-    HIDE_SHEET_SPLITTER          : "HIDE_SHEET_SPLITTER"
+    HIDE_SHEET_SPLITTER          : "HIDE_SHEET_SPLITTER",
+    IMAGES_FROM_REPACK           : "IMAGES_FROM_REPACK"
 };
 
 export {
diff --git a/src/client/exporters/index.js b/src/client/exporters/index.js
@@ -51,6 +51,18 @@ function getExporterByType(type) {
     return null;
 }
 
+function getNum(str){
+    const s = str.split('').filter((c) => {
+        return !isNaN(c);
+    }).join("");
+    if (s.length){
+        return parseInt(s);
+    }
+    else {
+        return 0;
+    }
+}
+
 function prepareData(data, options) {
 
     let opt = Object.assign({}, options);
@@ -124,6 +136,13 @@ function prepareData(data, options) {
     }
 
     if(ret.length) {
+        // get the numbers in order first
+        ret.sort((a, b) => {
+            return getNum(a.name) - getNum(b.name);
+        });
+        // then, sort it again by the contents of the name
+        ret.sort((a, b) => a.name.localeCompare(b.name)); 
+
         ret[0].first = true;
         ret[ret.length-1].last = true;
     }
diff --git a/src/client/exporters/list.json b/src/client/exporters/list.json
@@ -112,8 +112,8 @@
     "fileExt": "paper2dsprites"
   },
   {
-    "type": "Starling",
-    "description": "Starling format",
+    "type": "Sparrow/Starling",
+    "description": "Sparrow/Starling format",
     "allowTrim": true,
     "allowRotation": true,
     "template": "Starling.mst",
diff --git a/src/client/resources/static/localization/de.csv b/src/client/resources/static/localization/de.csv
@@ -132,8 +132,9 @@ CONTEXT_MENU_PASTE;Einfügen
 CONTEXT_MENU_DELETE;Löschen
 CONTEXT_MENU_SELECT_ALL;Alles markieren
 SPLIT;Extrahieren
+REPACK;Wieder verpacken
 SELECT_TEXTURE;Textur
 SELECT_DATA_FILE;Daten-Datei
-SPLITTER;Sprites aus Bild extrahieren
+SPLITTER;Wieder verpacken/Sprites aus Bild extrahieren
 SPLITTER_ERROR_NO_FRAMES;Sprites wurden nicht gefunden. Vermutlich ist das Atlas Format falsch.
 HOLD_TRIM;Trim beibehalten:
diff --git a/src/client/resources/static/localization/en.csv b/src/client/resources/static/localization/en.csv
@@ -133,8 +133,9 @@ CONTEXT_MENU_PASTE;Paste
 CONTEXT_MENU_DELETE;Delete
 CONTEXT_MENU_SELECT_ALL;Select all
 SPLIT;Split
+REPACK;Repack
 SELECT_TEXTURE;Texture
 SELECT_DATA_FILE;Data file
-SPLITTER;Split sheet
+SPLITTER;Repack/Split sheet
 SPLITTER_ERROR_NO_FRAMES;Sprites not found. Probably, atlas format is incorrect.
 HOLD_TRIM;Hold trim:
diff --git a/src/client/resources/static/localization/es.csv b/src/client/resources/static/localization/es.csv
@@ -133,8 +133,9 @@ CONTEXT_MENU_PASTE;Pegar
 CONTEXT_MENU_DELETE;Borrar
 Desembalaje;Selecionar todo
 SPLIT;Desembalaje
+REPACK;Reempaquetar
 SELECT_TEXTURE;Textura
 SELECT_DATA_FILE;Datos
-SPLITTER;Desembalaje atlas
+SPLITTER;Reempaquetar/Desembalaje atlas
 SPLITTER_ERROR_NO_FRAMES;No se ha encontrado ningún sprite. Quizás el formato del atlas sea incorrecto.
 HOLD_TRIM;Mantener corte:
diff --git a/src/client/resources/static/localization/ru.csv b/src/client/resources/static/localization/ru.csv
@@ -133,8 +133,9 @@ CONTEXT_MENU_PASTE;Вставить
 CONTEXT_MENU_DELETE;Удалить
 CONTEXT_MENU_SELECT_ALL;Выделить все
 SPLIT;Распаковать
+REPACK;Переупаковка
 SELECT_TEXTURE;Текстура
 SELECT_DATA_FILE;Данные
-SPLITTER;Распаковка атласа
+SPLITTER;Переупаковка/Распаковка атласа
 SPLITTER_ERROR_NO_FRAMES;Не найдено ни одного спрайта. Возможно, формат атласа неверен.
 HOLD_TRIM;Обрезать:
diff --git a/src/client/resources/static/localization/zh-cn.csv b/src/client/resources/static/localization/zh-cn.csv
@@ -133,8 +133,9 @@ CONTEXT_MENU_PASTE;粘贴
 CONTEXT_MENU_DELETE;删除
 CONTEXT_MENU_SELECT_ALL;选择全部
 SPLIT;分割
+REPACK;重新包装
 SELECT_TEXTURE;纹理图
 SELECT_DATA_FILE;数据文件
-SPLITTER;分割精灵表
+SPLITTER;重新包装/分割精灵表
 SPLITTER_ERROR_NO_FRAMES;精灵图没有找到，请检查文件格式是否正确。
 HOLD_TRIM;保持整齐(修剪):
diff --git a/src/client/splitters/Sparrow.js b/src/client/splitters/Sparrow.js
@@ -0,0 +1,92 @@
+import Splitter from './Splitter';
+
+import xmlParser from 'xml2js';
+
+class Sparrow extends Splitter {
+    static check(data, cb) {
+        try {
+            xmlParser.parseString(data, (err, atlas) => {
+                if(err) {
+                    cb(false);
+                    return;
+                }
+                
+                cb(atlas.TextureAtlas && Array.isArray(atlas.TextureAtlas.sprite));
+            });
+        }
+        catch(e) {
+            cb(false);
+        }
+    }
+
+    static split(data, options, cb) {
+        let res = [];
+
+        try {
+
+            xmlParser.parseString(data, (err, atlas) => {
+                if(err) {
+                    cb(res);
+                    return;
+                }
+
+                let list = atlas.TextureAtlas.SubTexture;
+                
+                for(let item of list) {
+                    item = item['$'];
+
+                    
+                    if (isNaN(item.frameX)) item.frameX = 0;
+                    if (isNaN(item.frameY)) item.frameY = 0;
+                    if (isNaN(item.frameWidth)) item.frameWidth = item.width;
+                    if (isNaN(item.frameHeight)) item.frameHeight = item.height;
+
+                    item.x *= 1;
+                    item.y *= 1;
+                    item.width *= 1;
+                    item.height *= 1;
+                    item.frameX *= -1;
+                    item.frameY *= -1;
+                    item.frameWidth *= 1;
+                    item.frameHeight *= 1;
+
+                    let trimmed = item.w < item.oW || item.h < item.oH;
+                    
+                    res.push({
+                        name: Splitter.fixFileName(item.name),
+                        frame: {
+                            x: item.x,
+                            y: item.y,
+                            w: item.width,
+                            h: item.height
+                        },
+                        spriteSourceSize: {
+                            x: item.frameX,
+                            y: item.frameY,
+                            w: item.width,
+                            h: item.height
+                        },
+                        sourceSize: {
+                            w: item.frameWidth,
+                            h: item.frameHeight
+                        },
+                        rotated: item.r === 'y',
+                        trimmed: trimmed
+                    });
+                }
+                
+                cb(res);
+            });
+        }
+        catch(e) {
+        }
+
+        cb(res);
+    }
+
+    static get type() {
+        return 'Sparrow/Starling';
+    }
+}
+
+export default Sparrow;
diff --git a/src/client/splitters/index.js b/src/client/splitters/index.js
@@ -1,3 +1,4 @@
+import Sparrow from './Sparrow';
 import Grid from './Grid';
 import JsonHash from './JsonHash';
 import JsonArray from './JsonArray';
@@ -6,6 +7,7 @@ import UIKit from './UIKit';
 import Spine from './Spine';
 
 const list = [
+    Sparrow,
     Grid,
     JsonHash,
     JsonArray,
@@ -41,7 +43,7 @@ function getSplitterByData(data, cb) {
 }
 
 function getDefaultSplitter() {
-    return Grid;
+    return Sparrow;
 }
 
 export { getSplitterByType, getSplitterByData, getDefaultSplitter };
diff --git a/src/client/ui/ImagesList.jsx b/src/client/ui/ImagesList.jsx
@@ -2,6 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 
 import LocalImagesLoader from '../utils/LocalImagesLoader';
+import Base64ImagesLoader from '../utils/Base64ImagesLoader';
 import ZipLoader from '../utils/ZipLoader';
 import I18 from '../utils/I18';
 
@@ -35,6 +36,8 @@ class ImagesList extends React.Component {
         Observer.on(GLOBAL_EVENT.IMAGE_ITEM_SELECTED, this.handleImageItemSelected, this);
         Observer.on(GLOBAL_EVENT.IMAGE_CLEAR_SELECTION, this.handleImageClearSelection, this);
         Observer.on(GLOBAL_EVENT.FS_CHANGES, this.handleFsChanges, this);
+
+        Observer.on(GLOBAL_EVENT.IMAGES_FROM_REPACK, this.addImagesFromRepack, this);
 		
 		this.handleKeys = this.handleKeys.bind(this);
 		
@@ -80,6 +83,13 @@ class ImagesList extends React.Component {
             };
         }
     }
+
+    addImagesFromRepack(files){
+        if (files.length){
+            let loader = new Base64ImagesLoader();
+            loader.load(files, null, data => this.loadImagesComplete(data));
+        }
+    }
     
     setImages(images) {
         this.setState({images: images});
diff --git a/src/client/ui/MainHeader.jsx b/src/client/ui/MainHeader.jsx
@@ -29,7 +29,8 @@ class MainHeader extends React.Component {
             <div className="main-header back-900 color-white">
                 <div className="main-header-app-name">
                     <img src="static/images/logo.png" />
-                    {appInfo.displayName} {appInfo.version}
+                    {appInfo.displayName} {appInfo.version} (Based on <a href="https://free-tex-packer.com/">Free texture packer</a>)
+                    
                 </div>
 
                 <div className="main-header-about" onClick={this.showAbout}>
diff --git a/src/client/ui/SheetSplitter.jsx b/src/client/ui/SheetSplitter.jsx
