Skip to content

pivot point features implemented #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Blidnight wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pivot point features implemented #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,8 @@
"webpack-cli": "^3.2.3",
"webpack-dev-server": "^3.1.14",
"xml2js": "^0.4.19"
},
"dependencies": {
"sat": "^0.9.0"
}
}
59 changes: 30 additions & 29 deletions src/client/Observer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,36 @@
import EventEmitter from 'eventemitter3';
import EventEmitter from "eventemitter3";

let Observer = new EventEmitter();

let GLOBAL_EVENT = {
IMAGES_LIST_CHANGED : "IMAGES_LIST_CHANGED",
IMAGES_LIST_SELECTED_CHANGED : "IMAGES_LIST_SELECTED_CHANGED",
IMAGE_ITEM_SELECTED : "IMAGE_ITEM_SELECTED",
IMAGE_CLEAR_SELECTION : "IMAGE_CLEAR_SELECTION",
PACK_OPTIONS_CHANGED : "PACK_OPTIONS_CHANGED",
PACK_EXPORTER_CHANGED : "PACK_EXPORTER_CHANGED",
PACK_COMPLETE : "PACK_COMPLETE",
START_EXPORT : "START_EXPORT",
SHOW_MESSAGE : "SHOW_MESSAGE",
SHOW_SHADER : "SHOW_SHADER",
HIDE_SHADER : "HIDE_SHADER",
SHOW_ABOUT : "SHOW_ABOUT",
HIDE_ABOUT : "HIDE_ABOUT",
SHOW_UPDATER : "SHOW_UPDATER",
HIDE_UPDATER : "HIDE_UPDATER",
CHANGE_LANG : "CHANGE_LANG",
SHOW_EDIT_CUSTOM_EXPORTER : "SHOW_EDIT_CUSTOM_EXPORTER",
HIDE_EDIT_CUSTOM_EXPORTER : "HIDE_EDIT_CUSTOM_EXPORTER",
FS_CHANGES : "FS_CHANGES",
UPDATE_AVAILABLE : "UPDATE_AVAILABLE",
DOWNLOAD_PROGRESS_CHANGED : "DOWNLOAD_PROGRESS_CHANGED",
INSTALL_UPDATE : "INSTALL_UPDATE",
SHOW_SHEET_SPLITTER : "SHOW_SHEET_SPLITTER",
HIDE_SHEET_SPLITTER : "HIDE_SHEET_SPLITTER"
IMAGES_LIST_CHANGED: "IMAGES_LIST_CHANGED",
IMAGES_LIST_SELECTED_CHANGED: "IMAGES_LIST_SELECTED_CHANGED",
IMAGE_ITEM_SELECTED: "IMAGE_ITEM_SELECTED",
IMAGE_CLEAR_SELECTION: "IMAGE_CLEAR_SELECTION",
PACK_OPTIONS_CHANGED: "PACK_OPTIONS_CHANGED",
PACK_EXPORTER_CHANGED: "PACK_EXPORTER_CHANGED",
PACK_COMPLETE: "PACK_COMPLETE",
START_EXPORT: "START_EXPORT",
SHOW_MESSAGE: "SHOW_MESSAGE",
SHOW_SHADER: "SHOW_SHADER",
HIDE_SHADER: "HIDE_SHADER",
SHOW_ABOUT: "SHOW_ABOUT",
HIDE_ABOUT: "HIDE_ABOUT",
SHOW_UPDATER: "SHOW_UPDATER",
HIDE_UPDATER: "HIDE_UPDATER",
CHANGE_LANG: "CHANGE_LANG",
SHOW_EDIT_CUSTOM_EXPORTER: "SHOW_EDIT_CUSTOM_EXPORTER",
HIDE_EDIT_CUSTOM_EXPORTER: "HIDE_EDIT_CUSTOM_EXPORTER",
FS_CHANGES: "FS_CHANGES",
UPDATE_AVAILABLE: "UPDATE_AVAILABLE",
DOWNLOAD_PROGRESS_CHANGED: "DOWNLOAD_PROGRESS_CHANGED",
INSTALL_UPDATE: "INSTALL_UPDATE",
SHOW_SHEET_SPLITTER: "SHOW_SHEET_SPLITTER",
HIDE_SHEET_SPLITTER: "HIDE_SHEET_SPLITTER",
FRAME_PIVOT_CHANGE: "FRAME_PIVOT_CHANGE",
FRAME_SET: "FRAME_SET",
FRAME_UNSET: "FRAME_UNSET",
FRAME_UPDATE: "FRAME_UPDATE",
};

export {
Observer,
GLOBAL_EVENT
};
export { Observer, GLOBAL_EVENT };
134 changes: 92 additions & 42 deletions src/client/PackProcessor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
import MaxRectsBinPack from './packers/MaxRectsBin';
import OptimalPacker from './packers/OptimalPacker';
import allPackers from './packers';
import Trimmer from './utils/Trimmer';
import TextureRenderer from './utils/TextureRenderer';
import MaxRectsBinPack from "./packers/MaxRectsBin";
import OptimalPacker from "./packers/OptimalPacker";
import allPackers from "./packers";
import Trimmer from "./utils/Trimmer";
import TextureRenderer from "./utils/TextureRenderer";

import I18 from './utils/I18';
import I18 from "./utils/I18";

class PackProcessor {

static detectIdentical(rects) {

let identical = [];

for (let i = 0; i < rects.length; i++) {
let rect1 = rects[i];
for (let n = i + 1; n < rects.length; n++) {
let rect2 = rects[n];
if (rect1.image._base64 === rect2.image._base64 && identical.indexOf(rect2) < 0) {
if (
rect1.image._base64 === rect2.image._base64 &&
identical.indexOf(rect2) < 0
) {
rect2.identical = rect1;
identical.push(rect2);
}
Expand All @@ -29,8 +30,8 @@ class PackProcessor {

return {
rects: rects,
identical: identical
}
identical: identical,
};
}

static applyIdentical(rects, identical) {
Expand Down Expand Up @@ -67,14 +68,15 @@ class PackProcessor {
}

static pack(images = {}, options = {}, onComplete = null, onError = null) {

let rects = [];

let padding = options.padding || 0;
let extrude = options.extrude || 0;

let maxWidth = 0, maxHeight = 0;
let minWidth = 0, minHeight = 0;
let maxWidth = 0,
maxHeight = 0;
let minWidth = 0,
minHeight = 0;

let alphaThreshold = options.alphaThreshold || 0;
if (alphaThreshold > 255) alphaThreshold = 255;
Expand All @@ -89,18 +91,21 @@ class PackProcessor {
maxWidth += img.width;
maxHeight += img.height;

if (img.width > minWidth) minWidth = img.width + padding * 2 + extrude * 2;
if (img.height > minHeight) minHeight = img.height + padding * 2 + extrude * 2;
if (img.width > minWidth)
minWidth = img.width + padding * 2 + extrude * 2;
if (img.height > minHeight)
minHeight = img.height + padding * 2 + extrude * 2;

rects.push({
frame: { x: 0, y: 0, w: img.width, h: img.height },
rotated: false,
trimmed: false,
spriteSourceSize: { x: 0, y: 0, w: img.width, h: img.height },
sourceSize: { w: img.width, h: img.height },
pivot: { x: 0.5, y: 0.5 },
name: name,
file: key,
image: img
image: img,
});
}

Expand All @@ -125,9 +130,14 @@ class PackProcessor {
}

if (width < minWidth || height < minHeight) {
if (onError) onError({
description: I18.f("INVALID_SIZE_ERROR", minWidth, minHeight)
});
if (onError)
onError({
description: I18.f(
"INVALID_SIZE_ERROR",
minWidth,
minHeight
),
});
return;
}

Expand All @@ -154,9 +164,17 @@ class PackProcessor {
for (let packerClass of allPackers) {
if (packerClass !== OptimalPacker) {
for (let method in packerClass.methods) {
methods.push({ packerClass, packerMethod: packerClass.methods[method], allowRotation: false });
methods.push({
packerClass,
packerMethod: packerClass.methods[method],
allowRotation: false,
});
if (options.allowRotation) {
methods.push({ packerClass, packerMethod: packerClass.methods[method], allowRotation: true });
methods.push({
packerClass,
packerMethod: packerClass.methods[method],
allowRotation: true,
});
}
}
}
Expand All @@ -165,8 +183,18 @@ class PackProcessor {
};

let packerClass = options.packer || MaxRectsBinPack;
let packerMethod = options.packerMethod || MaxRectsBinPack.methods.BestShortSideFit;
let packerCombos = (packerClass === OptimalPacker) ? getAllPackers() : [{ packerClass, packerMethod, allowRotation: options.allowRotation }];
let packerMethod =
options.packerMethod || MaxRectsBinPack.methods.BestShortSideFit;
let packerCombos =
packerClass === OptimalPacker
? getAllPackers()
: [
{
packerClass,
packerMethod,
allowRotation: options.allowRotation,
},
];

let optimalRes;
let optimalSheets = Infinity;
Expand All @@ -182,26 +210,44 @@ class PackProcessor {
let sheetArea = 0;

// duplicate rects if more than 1 combo since the array is mutated in pack()
let _rects = packerCombos.length > 1 ? rects.map(rect => {
return Object.assign({}, rect, {
frame: Object.assign({}, rect.frame),
spriteSourceSize: Object.assign({}, rect.spriteSourceSize),
sourceSize: Object.assign({}, rect.sourceSize)
});
}) : rects;
let _rects =
packerCombos.length > 1
? rects.map((rect) => {
return Object.assign({}, rect, {
frame: Object.assign({}, rect.frame),
spriteSourceSize: Object.assign(
{},
rect.spriteSourceSize
),
sourceSize: Object.assign({}, rect.sourceSize),
});
})
: rects;

// duplicate identical if more than 1 combo and fix references to point to the
// cloned rects since the array is mutated in applyIdentical()
let _identical = packerCombos.length > 1 ? identical.map(rect => {
for (let rect2 of _rects) {
if (rect.identical.image._base64 == rect2.image._base64) {
return Object.assign({}, rect, { identical: rect2 });
}
}
}) : identical;
let _identical =
packerCombos.length > 1
? identical.map((rect) => {
for (let rect2 of _rects) {
if (
rect.identical.image._base64 ==
rect2.image._base64
) {
return Object.assign({}, rect, {
identical: rect2,
});
}
}
})
: identical;

while (_rects.length) {
let packer = new combo.packerClass(width, height, combo.allowRotation);
let packer = new combo.packerClass(
width,
height,
combo.allowRotation
);
let result = packer.pack(_rects, combo.packerMethod);

for (let item of result) {
Expand All @@ -221,14 +267,18 @@ class PackProcessor {
this.removeRect(_rects, item.name);
}

let { width: sheetWidth, height: sheetHeight } = TextureRenderer.getSize(result, options);
let { width: sheetWidth, height: sheetHeight } =
TextureRenderer.getSize(result, options);
sheetArea += sheetWidth * sheetHeight;
}

let sheets = res.length;
let efficiency = sourceArea / sheetArea;

if (sheets < optimalSheets || (sheets === optimalSheets && efficiency > optimalEfficiency)) {
if (
sheets < optimalSheets ||
(sheets === optimalSheets && efficiency > optimalEfficiency)
) {
optimalRes = res;
optimalSheets = sheets;
optimalEfficiency = efficiency;
Expand All @@ -250,4 +300,4 @@ class PackProcessor {
}
}

export default PackProcessor;
export default PackProcessor;
Loading