From fbdf1aaf9a60b1cce292c383413d8124d59302b5 Mon Sep 17 00:00:00 2001 From: juliandescottes Date: Mon, 23 Dec 2013 15:04:13 +0100 Subject: [PATCH 1/2] added loading over + fixed bug with highlighted pixel removal --- index.html | 13 +++++++++++++ js/drawingtools/BaseTool.js | 8 +++++--- js/drawingtools/selectiontools/BaseSelect.js | 3 +++ js/rendering/DrawingLoop.js | 6 +----- piskel-boot.js | 20 ++++++++++++++------ 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/index.html b/index.html index b6bb7fff..9550a6b8 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,19 @@ +
+ Loading pixels ... +
diff --git a/js/drawingtools/BaseTool.js b/js/drawingtools/BaseTool.js index 890c045b..1d2dfd40 100644 --- a/js/drawingtools/BaseTool.js +++ b/js/drawingtools/BaseTool.js @@ -32,9 +32,11 @@ }; ns.BaseTool.prototype.hideHighlightedPixel = function(overlay) { - overlay.setPixel(this.highlightedPixelCol, this.highlightedPixelRow, Constants.TRANSPARENT_COLOR); - this.highlightedPixelRow = null; - this.highlightedPixelCol = null; + if (this.highlightedPixelRow !== null && this.highlightedPixelCol !== null) { + overlay.setPixel(this.highlightedPixelCol, this.highlightedPixelRow, Constants.TRANSPARENT_COLOR); + this.highlightedPixelRow = null; + this.highlightedPixelCol = null; + } }; diff --git a/js/drawingtools/selectiontools/BaseSelect.js b/js/drawingtools/selectiontools/BaseSelect.js index 19972394..f6475699 100644 --- a/js/drawingtools/selectiontools/BaseSelect.js +++ b/js/drawingtools/selectiontools/BaseSelect.js @@ -70,6 +70,9 @@ } }; + ns.BaseSelect.prototype.hideHighlightedPixel = function () { + // not implemented for selection tools + }; /** * If we mouseover the selection draw inside the overlay frame, show the 'move' cursor diff --git a/js/rendering/DrawingLoop.js b/js/rendering/DrawingLoop.js index d746f684..e1816011 100644 --- a/js/rendering/DrawingLoop.js +++ b/js/rendering/DrawingLoop.js @@ -6,7 +6,6 @@ this.isRunning = false; this.previousTime = 0; this.callbacks = []; - this.i = 0; }; ns.DrawingLoop.prototype.addCallback = function (callback, scope, args) { @@ -34,10 +33,7 @@ ns.DrawingLoop.prototype.loop_ = function () { var currentTime = Date.now(); var delta = currentTime - this.previousTime; - this.i++; - if(this.i%2 === 0) { - this.executeCallbacks_(delta); - } + this.executeCallbacks_(delta); this.previousTime = currentTime; this.requestAnimationFrame.call(window, this.loop_.bind(this)); }; diff --git a/piskel-boot.js b/piskel-boot.js index 9317ca2b..b9be8a96 100644 --- a/piskel-boot.js +++ b/piskel-boot.js @@ -1,4 +1,16 @@ (function () { + + window.onPiskelReady = function () { + var loadingMask = document.getElementById('loading-mask'); + loadingMask.style.opacity = 0; + window.setTimeout(function () {loadingMask.parentNode.removeChild(loadingMask);}, 600) + pskl.app.init(); + // cleanup + delete window.exports; + delete window.loadDebugScripts; + delete window.done; + }; + var prefixPath = function (path) { if (window.pskl && window.pskl.appEngineToken_) { return '../' + path; @@ -29,11 +41,7 @@ var scriptIndex = 0; window.loadNextScript = function () { if (scriptIndex == window.exports.scripts.length) { - pskl.app.init(); - // cleanup - delete window.exports; - delete window.loadDebugScripts; - delete window.done; + window.onPiskelReady(); } else { loadScript(window.exports.scripts[scriptIndex], "loadNextScript()"); scriptIndex ++; @@ -60,7 +68,7 @@ var loaderInterval = window.setInterval(function () { if (document.querySelectorAll("[data-iframe-loader]").length === 0) { window.clearInterval(loaderInterval); - loadScript(script, "pskl.app.init()"); + loadScript(script, "onPiskelReady()"); } else { console.log("waiting for templates to load ...."); } From fc19695a4a1e4802b5e2c152a61923d88d4d01a6 Mon Sep 17 00:00:00 2001 From: juliandescottes Date: Tue, 24 Dec 2013 11:51:41 +0100 Subject: [PATCH 2/2] Misc : start frame index at 1 in PreviewFilm --- js/controller/PreviewFilmController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/controller/PreviewFilmController.js b/js/controller/PreviewFilmController.js index 67f0f03f..8fdce874 100644 --- a/js/controller/PreviewFilmController.js +++ b/js/controller/PreviewFilmController.js @@ -180,7 +180,7 @@ } var tileCount = document.createElement("div"); tileCount.className = "tile-overlay tile-count"; - tileCount.innerHTML = tileNumber; + tileCount.innerHTML = tileNumber + 1; previewTileRoot.appendChild(tileCount);