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

C export: fix after review

Browse Source
This commit is contained in:
Clement Leger
2016-04-11 14:33:58 +02:00
parent 4927557c89
commit dfb8fec0c9
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/controller/settings/exportimage/CExportController.js
View File

@@ -18,7 +18,6 @@
ns.CExportController.prototype.onCDownloadButtonClick_ = function (evt) { ns.CExportController.prototype.onCDownloadButtonClick_ = function (evt) {
var fileName = this.getPiskelName_() + '.c'; var fileName = this.getPiskelName_() + '.c';
var cName = this.getPiskelName_().replace(' ','_'); var cName = this.getPiskelName_().replace(' ','_');
var outputCanvas = this.getFramesheetAsCanvas();
var width = this.piskelController.getWidth(); var width = this.piskelController.getWidth();
var height = this.piskelController.getHeight(); var height = this.piskelController.getHeight();
var frameCount = this.piskelController.getFrameCount(); var frameCount = this.piskelController.getFrameCount();
@@ -26,7 +25,6 @@
// Create a background canvas that will be filled with the transparent color before each render. // Create a background canvas that will be filled with the transparent color before each render.
var background = pskl.utils.CanvasUtils.createCanvas(width, height); var background = pskl.utils.CanvasUtils.createCanvas(width, height);
var context = background.getContext('2d'); var context = background.getContext('2d');
context.fillStyle = BLACK;
// Useful defines for C routines // Useful defines for C routines
var frameStr = '#include <stdint.h>\n\n'; var frameStr = '#include <stdint.h>\n\n';
@@ -41,8 +39,6 @@
for (var i = 0 ; i < frameCount ; i++) { for (var i = 0 ; i < frameCount ; i++) {
var render = this.piskelController.renderFrameAt(i, true); var render = this.piskelController.renderFrameAt(i, true);
context.clearRect(0, 0, width, height);
context.fillRect(0, 0, width, height);
context.drawImage(render, 0, 0, width, height); context.drawImage(render, 0, 0, width, height);
var imgd = context.getImageData(0, 0, width, height); var imgd = context.getImageData(0, 0, width, height);
var pix = imgd.data; var pix = imgd.data;
@@ -82,10 +78,4 @@
hexStr += ('00' + r.toString(16)).substr(-2); hexStr += ('00' + r.toString(16)).substr(-2);
return hexStr; return hexStr;
}; };
ns.CExportController.prototype.getFramesheetAsCanvas = function () {
var renderer = new pskl.rendering.PiskelRenderer(this.piskelController);
return renderer.renderAsCanvas();
};
})(); })();

14
src/templates/settings/export.html
View File

@@ -33,6 +33,13 @@
</div> </div>
<button type="button" class="button button-primary zip-generate-button"/>Download ZIP</button> <button type="button" class="button button-primary zip-generate-button"/>Download ZIP</button>
</div> </div>
<div class="settings-title">
Export as C File
</div>
<div class="settings-item">
<div class="settings-description">C file with frame rendered as array.</div>
<button type="button" class="button button-primary c-download-button">Download C file</button>
</div>
<div class="settings-title"> <div class="settings-title">
Export to Animated GIF Export to Animated GIF
</div> </div>
@@ -61,12 +68,5 @@
<div class="gif-upload-status"></div> <div class="gif-upload-status"></div>
</div> </div>
</div> </div>
<div class="settings-title">
Export as C File
</div>
<div class="settings-item">
<div class="settings-description">C file with frame rendered as array.</div>
<button type="button" class="button button-primary c-download-button">Download C file</button>
</div>
</div> </div>
</script> </script>