From dfb8fec0c9cea4346196f9aad74f407f10eb7f46 Mon Sep 17 00:00:00 2001
From: Clement Leger <clement.leger@kalray.eu>
Date: Mon, 11 Apr 2016 14:33:58 +0200
Subject: [PATCH] C export: fix after review

---
 .../settings/exportimage/CExportController.js      | 10 ----------
 src/templates/settings/export.html                 | 14 +++++++-------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/js/controller/settings/exportimage/CExportController.js b/src/js/controller/settings/exportimage/CExportController.js
index d276448e..9f28ce24 100644
--- a/src/js/controller/settings/exportimage/CExportController.js
+++ b/src/js/controller/settings/exportimage/CExportController.js
@@ -18,7 +18,6 @@
   ns.CExportController.prototype.onCDownloadButtonClick_ = function (evt) {
     var fileName = this.getPiskelName_() + '.c';
     var cName = this.getPiskelName_().replace(' ','_');
-    var outputCanvas = this.getFramesheetAsCanvas();
     var width = this.piskelController.getWidth();
     var height = this.piskelController.getHeight();
     var frameCount = this.piskelController.getFrameCount();
@@ -26,7 +25,6 @@
     // Create a background canvas that will be filled with the transparent color before each render.
     var background = pskl.utils.CanvasUtils.createCanvas(width, height);
     var context = background.getContext('2d');
-    context.fillStyle = BLACK;
 
     // Useful defines for C routines
     var frameStr = '#include <stdint.h>\n\n';
@@ -41,8 +39,6 @@
 
     for (var i = 0 ; i < frameCount ; i++) {
       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);
       var imgd = context.getImageData(0, 0, width, height);
       var pix = imgd.data;
@@ -82,10 +78,4 @@
     hexStr += ('00' + r.toString(16)).substr(-2);
     return hexStr;
   };
-
-  ns.CExportController.prototype.getFramesheetAsCanvas = function () {
-    var renderer = new pskl.rendering.PiskelRenderer(this.piskelController);
-    return renderer.renderAsCanvas();
-  };
-
 })();
diff --git a/src/templates/settings/export.html b/src/templates/settings/export.html
index 5fabdb71..e2b6614c 100644
--- a/src/templates/settings/export.html
+++ b/src/templates/settings/export.html
@@ -33,6 +33,13 @@
       </div>
       <button type="button" class="button button-primary zip-generate-button"/>Download ZIP</button>
     </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">
       Export to Animated GIF
     </div>
@@ -61,12 +68,5 @@
         <div class="gif-upload-status"></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>
 </script>