mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'gh-pages' of https://github.com/juliandescottes/piskel

Browse Source
This commit is contained in:
Vince
2012-08-29 23:58:25 +02:00
parent baa5ea5dc9 c43e25e3bf
commit 04bcb09496
8 changed files with 745 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/piskel.js
View File

@ -3,7 +3,6 @@
// Constants:
TRANSPARENT_COLOR = 'tc',
//TRANSPARENT_COLOR = 'pink',
DEFAULT_PEN_COLOR = '#000000',
// Configuration:
@ -52,7 +51,6 @@
frameSheet = FrameSheetModel.getInstance(framePixelWidth, framePixelHeight);
frameSheet.addEmptyFrame();
this.setActiveFrame(0);
this.initPalette();
this.initDrawingArea();
this.initPreviewSlideshow();
@ -157,7 +155,6 @@
body.setAttribute('onmouseup', 'piskel.onCanvasMouseup(event)');
drawingAreaContainer.setAttribute('onmousedown', 'piskel.onCanvasMousedown(event)');
drawingAreaContainer.setAttribute('onmousemove', 'piskel.onCanvasMousemove(event)');
this.drawFrameToCanvas(frameSheet.getFrameByIndex(this.getActiveFrameIndex()), drawingAreaCanvas, drawingCanvasDpi);
},
@ -218,6 +215,7 @@
}
$("display-fps").innerHTML = animPreviewFPS + " fps";
animFPSTuner.value = animPreviewFPS;
$("fps-value").innerHTML = animPreviewFPS + " fps";
refreshUpdater = startPreviewRefresh();
});
},
@ -434,4 +432,5 @@
window.piskel = piskel;
piskel.init();
})(function(id){return document.getElementById(id)});
})(function(id){return document.getElementById(id)});
//small change for checking my git setup :(