From c2c392bd61fc743e13c910763f6136054e92bd8f Mon Sep 17 00:00:00 2001 From: daose <15278132+daose@users.noreply.github.com> Date: Tue, 25 Feb 2020 17:03:50 -0500 Subject: [PATCH 1/6] add bigboi icon --- spritec_gui/build/icon.png | Bin 0 -> 1513 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 spritec_gui/build/icon.png diff --git a/spritec_gui/build/icon.png b/spritec_gui/build/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce898a41c93a7153f00138146b7b6db87b163885 GIT binary patch literal 1513 zcmY*Z2~d+q6n=j=BSJu~7zCqr>QSz$HI*coLLxF~1R}9mi!fFzbmT^2Vq;nl3N}cK z1*HlKieQ3>DMAC$)Ch766PUpZir^qnDN&KeOb8@RB!9#=^Z&d1?c4W#``+&6Ml!=3 z7Z4TzfMfU;dNcsW*u{Xgm9ep9x3?P`BqKU31bNc#d(=3dz}5hxDro6|D(ty#rEvi+Gn&Z) z!v{7ZEUg5v2@0owv4eA7)mN9ign^e&5^4A?%ZVv+SHTdnJb_DaK8%d7|0i+{X_bGX zxGgO-=S<#)wKmlJdseBx@aUyK{Qg^Z7EjXD(9qDdm&Z43Adv?(5fbUt1@f;e!b?OA z!O4E=15?&U5hiPMB0kj>Zm-SLk5u$3m@ac@!D`z5rtQ4y9G`V_z`Vae3@0bzvb=74 znNszkwPA-;0c@4cYa(TtnxHT{q}$nlAN-B>O`xFnyM;LOiW}s+$JECly7p6w8If=H zUL-8DE8q&BA!g{U-}@-=+#&LhM=#5+l=6?GtXj;HIQ0W3-qBbe?pf}%i>Zc2TWf1C z%V=ch+?&4d#KKYc&!HeVf`oi_+>g4II^l*g+{AD+{asvNLssUh`CM4%nke-EuBLwJ z^vCL8vYk0Z+ae+#SyJ75O6@p@v^mGujo+^>3UDZH@ROSL_GVXz?{g|C#%+`F9%xkW)4i3YlWkJoIufG`3`2uPkq_K?)rVNb z!_PfMqWxNi@AX;I%^q{@01jg^2P0>M|Gl_Ys73D9E6eYcTkg!Xf?F}K`gBH!35ss8UR_G~WJ|dsvYWof<6|?mQ^Zo$@iQv)m z#zlVFzGs`Vb8%8(ORc3oz=Pg6@EnodIjLmqbr&}4Dq17>SWU5FhV5n1OI%E=DO^U@ zaQxAf&~^#Bb<|4Lr8)(RDcXpN%Rnf(MT73~my;w#p)%AN&Uy_greY*2zDKgFast@X(8=>3_~#Jv?)Br|7irpm@6B?*>ZaMDSxzVj>y|`hkE;wmLxJ zbfLw2?vR?TThMt(u#dFVRC1`d7}T8RB1YGE*`HX^_|F zqG#UNU1oyc*)3l~keJ|Yi;mkoE^<)@kk=qzCO`DNIGYBe1ETCXA30l)KWWuvdI#r> z6S)e)+03#O7S2lE9fT2Lvs~Z8+@fm$S#cCOz<|NaIVeo}+asD_H-YmvqH| XNc&Efu+GR$FEfNQnDpx*@jw0#+I8+b literal 0 HcmV?d00001 From fee5335048dafb3555a9c7758e5ba572afd21034 Mon Sep 17 00:00:00 2001 From: daose <15278132+daose@users.noreply.github.com> Date: Tue, 25 Feb 2020 17:04:35 -0500 Subject: [PATCH 2/6] allow larger scaling --- spritec_gui/main.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spritec_gui/main.html b/spritec_gui/main.html index 044c2b8..f34e917 100644 --- a/spritec_gui/main.html +++ b/spritec_gui/main.html @@ -106,7 +106,8 @@

Export options

- + +
From b8bffb72551a094735bd5c5a6f75e25532496586 Mon Sep 17 00:00:00 2001 From: daose <15278132+daose@users.noreply.github.com> Date: Tue, 25 Feb 2020 17:05:17 -0500 Subject: [PATCH 3/6] reset animation counter to force render --- spritec_gui/components/Import/ImportCanvas.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spritec_gui/components/Import/ImportCanvas.js b/spritec_gui/components/Import/ImportCanvas.js index 3d6dc7f..19e3770 100644 --- a/spritec_gui/components/Import/ImportCanvas.js +++ b/spritec_gui/components/Import/ImportCanvas.js @@ -108,6 +108,12 @@ class ImportCanvas extends Component { requestAnimationFrame(this.renderCanvas); } + + render() { + // Whenever something changes reset the animation + // TODO: implement proper media controls (play/pause) instead of this flag + this.state.step = -1; + } } module.exports = ImportCanvas; From 90e9eedb9c358d7a1ea59428af06cd64c25504d0 Mon Sep 17 00:00:00 2001 From: daose <15278132+daose@users.noreply.github.com> Date: Tue, 25 Feb 2020 17:05:43 -0500 Subject: [PATCH 4/6] update package name and description --- spritec_gui/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spritec_gui/package.json b/spritec_gui/package.json index ffdbc2a..d6dd618 100644 --- a/spritec_gui/package.json +++ b/spritec_gui/package.json @@ -1,7 +1,7 @@ { "name": "spritec_gui", "version": "0.1.0", - "description": "Electron app that uses spritec to convert 3D models into spritesheets.", + "description": "Convert 3D model into pixel art", "main": "index.js", "scripts": { "build": "electron-build-env neon build -p ../spritec_binding --release", @@ -15,6 +15,7 @@ }, "build": { "appId": "com.protoart.spritec", + "productName": "Spritec", "linux": { "target": "AppImage" } From e7e6ac3c63c15a198080fd3ab989ae19326c4ae3 Mon Sep 17 00:00:00 2001 From: daose <15278132+daose@users.noreply.github.com> Date: Tue, 25 Feb 2020 17:15:09 -0500 Subject: [PATCH 5/6] Alert on all errors and force reload --- spritec_gui/main.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spritec_gui/main.js b/spritec_gui/main.js index 6594c86..ad03a15 100644 --- a/spritec_gui/main.js +++ b/spritec_gui/main.js @@ -30,3 +30,8 @@ store.subscribe(() => { } }); }); + +// TODO: implement proper error handling in the app +// Loudly announce all errors. Reload the app so it's not left in a dead state. +window.onerror = (message) => {alert(message); location.reload();} +window.onunhandledrejection = ({reason}) => {alert(reason); location.reload();} From d5071479f397e81de063204390f1400047b5bf55 Mon Sep 17 00:00:00 2001 From: daose <15278132+daose@users.noreply.github.com> Date: Tue, 25 Feb 2020 17:22:36 -0500 Subject: [PATCH 6/6] remove default menu --- spritec_gui/index.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/spritec_gui/index.js b/spritec_gui/index.js index 7a8b3cb..7208c21 100644 --- a/spritec_gui/index.js +++ b/spritec_gui/index.js @@ -1,4 +1,7 @@ -const { app, BrowserWindow } = require('electron') +const { app, Menu, BrowserWindow } = require('electron') + +// Remove default menu +Menu.setApplicationMenu(null); // Keep a global reference of the window object, if you don't, the window will // be closed automatically when the JavaScript object is garbage collected. @@ -21,8 +24,8 @@ function createWindow () { // and load the index.html of the app. win.loadFile('main.html') - // Open the DevTools. - // win.webContents.openDevTools() + // Open the DevTools for developers + if (!app.isPackaged) win.webContents.openDevTools() // Emitted when the window is closed. win.on('closed', () => {