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

Added JSCS linter to enforce style conventions

Browse Source
This commit is contained in:
juliandescottes
2015-04-14 18:02:33 +02:00
parent 007e4d4e11
commit b480acc6a0
150 changed files with 847 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/rendering/AbstractRenderer.js
View File

@@ -19,4 +19,4 @@
ns.AbstractRenderer.prototype.setDisplaySize = Constants.ABSTRACT_FUNCTION;
ns.AbstractRenderer.prototype.getDisplaySize = Constants.ABSTRACT_FUNCTION;
})();
})();

14
src/js/rendering/CanvasRenderer.js
View File

@@ -1,6 +1,6 @@
(function () {
var ns = $.namespace("pskl.rendering");
var ns = $.namespace('pskl.rendering');
ns.CanvasRenderer = function (frame, zoom) {
this.frame = frame;
this.zoom = zoom;
@@ -20,11 +20,11 @@
var canvas = this.createCanvas_();
var context = canvas.getContext('2d');
for(var x = 0, width = this.frame.getWidth(); x < width; x++) {
for(var y = 0, height = this.frame.getHeight(); y < height; y++) {
for (var x = 0, width = this.frame.getWidth(); x < width; x++) {
for (var y = 0, height = this.frame.getHeight(); y < height; y++) {
var color = this.frame.getPixel(x, y);
var w = 1;
while (color === this.frame.getPixel(x, y+w)) {
while (color === this.frame.getPixel(x, y + w)) {
w++;
}
this.renderLine_(color, x, y, w, context);
@@ -42,7 +42,7 @@
};
ns.CanvasRenderer.prototype.renderPixel_ = function (color, x, y, context) {
if(color == Constants.TRANSPARENT_COLOR) {
if (color == Constants.TRANSPARENT_COLOR) {
color = this.transparentColor_;
}
context.fillStyle = color;
@@ -50,7 +50,7 @@
};
ns.CanvasRenderer.prototype.renderLine_ = function (color, x, y, width, context) {
if(color == Constants.TRANSPARENT_COLOR) {
if (color == Constants.TRANSPARENT_COLOR) {
color = this.transparentColor_;
}
context.fillStyle = color;
@@ -63,4 +63,4 @@
var height = this.frame.getHeight() * zoom;
return pskl.utils.CanvasUtils.createCanvas(width, height);
};
})();
})();

2
src/js/rendering/CompositeRenderer.js
View File

@@ -65,4 +65,4 @@
throw 'Renderer manager is empty';
}
};
})();
})();

6
src/js/rendering/DrawingLoop.js
View File

@@ -1,5 +1,5 @@
(function () {
var ns = $.namespace("pskl.rendering");
var ns = $.namespace('pskl.rendering');
ns.DrawingLoop = function () {
this.requestAnimationFrame = this.getRequestAnimationFrameShim_();
@@ -54,8 +54,8 @@
window.mozRequestAnimationFrame ||
window.webkitRequestAnimationFrame ||
window.msRequestAnimationFrame ||
function (callback) { window.setTimeout(callback, 1000/60); };
function (callback) { window.setTimeout(callback, 1000 / 60); };
return requestAnimationFrame;
};
})();
})();

5
src/js/rendering/FramesheetRenderer.js
View File

@@ -25,7 +25,7 @@
ns.FramesheetRenderer.prototype.drawFrameInCanvas_ = function (frame, canvas, offsetWidth, offsetHeight) {
var context = canvas.getContext('2d');
frame.forEachPixel(function (color, x, y) {
if(color != Constants.TRANSPARENT_COLOR) {
if (color != Constants.TRANSPARENT_COLOR) {
context.fillStyle = color;
context.fillRect(x + offsetWidth, y + offsetHeight, 1, 1);
}
@@ -39,5 +39,4 @@
var height = sampleFrame.getHeight();
return pskl.utils.CanvasUtils.createCanvas(width, height);
};
})();
})();

4
src/js/rendering/OnionSkinRenderer.js
View File

@@ -34,7 +34,7 @@
ns.OnionSkinRenderer.prototype.getOnionFrames_ = function () {
var frames = [];
var currentFrameIndex = this.piskelController.getCurrentFrameIndex();
var layer = this.piskelController.getCurrentLayer();
@@ -87,4 +87,4 @@
ns.OnionSkinRenderer.prototype.flush = function () {
this.hash = '';
};
})();
})();

4
src/js/rendering/PiskelRenderer.js
View File

@@ -1,6 +1,6 @@
(function () {
var ns = $.namespace("pskl.rendering");
var ns = $.namespace('pskl.rendering');
ns.PiskelRenderer = function (piskelController) {
var frames = [];
@@ -11,4 +11,4 @@
};
pskl.utils.inherit(ns.PiskelRenderer, ns.FramesheetRenderer);
})();
})();

46
src/js/rendering/frame/FrameRenderer.js
View File

@@ -1,5 +1,5 @@
(function () {
var ns = $.namespace("pskl.rendering.frame");
var ns = $.namespace('pskl.rendering.frame');
/**
* FrameRenderer will display a given frame inside a canvas element.
@@ -15,11 +15,11 @@
renderingOptions = $.extend(true, {}, this.defaultRenderingOptions, renderingOptions);
if(container === undefined) {
if (container === undefined) {
throw 'Bad FrameRenderer initialization. <container> undefined.';
}
if(isNaN(renderingOptions.zoom)) {
if (isNaN(renderingOptions.zoom)) {
throw 'Bad FrameRenderer initialization. <zoom> not well defined.';
}
@@ -77,14 +77,14 @@
ns.FrameRenderer.prototype.setZoom = function (zoom) {
if (zoom > Constants.MINIMUM_ZOOM) {
// back up center coordinates
var centerX = this.offset.x + (this.displayWidth/(2*this.zoom));
var centerY = this.offset.y + (this.displayHeight/(2*this.zoom));
var centerX = this.offset.x + (this.displayWidth / (2 * this.zoom));
var centerY = this.offset.y + (this.displayHeight / (2 * this.zoom));
this.zoom = zoom;
// recenter
this.setOffset(
centerX - (this.displayWidth/(2*this.zoom)),
centerY - (this.displayHeight/(2*this.zoom))
centerX - (this.displayWidth / (2 * this.zoom)),
centerY - (this.displayHeight / (2 * this.zoom))
);
}
};
@@ -120,9 +120,9 @@
ns.FrameRenderer.prototype.setOffset = function (x, y) {
var width = pskl.app.piskelController.getWidth();
var height = pskl.app.piskelController.getHeight();
var maxX = width - (this.displayWidth/this.zoom);
var maxX = width - (this.displayWidth / this.zoom);
x = pskl.utils.Math.minmax(x, 0, maxX);
var maxY = height - (this.displayHeight/this.zoom);
var maxY = height - (this.displayHeight / this.zoom);
y = pskl.utils.Math.minmax(y, 0, maxY);
this.offset.x = x;
@@ -206,8 +206,8 @@
y = y + containerOffset.top;
return {
x : x + (cellSize/2),
y : y + (cellSize/2)
x : x + (cellSize / 2),
y : y + (cellSize / 2)
};
};
@@ -220,11 +220,11 @@
}
var context = this.canvas.getContext('2d');
for(var x = 0, width = frame.getWidth(); x < width; x++) {
for(var y = 0, height = frame.getHeight(); y < height; y++) {
for (var x = 0, width = frame.getWidth() ; x < width ; x++) {
for (var y = 0, height = frame.getHeight() ; y < height ; y++) {
var color = frame.getPixel(x, y);
var w = 1;
while (color === frame.getPixel(x, y+w)) {
while (color === frame.getPixel(x, y + w)) {
w++;
}
this.renderLine_(color, x, y, w, context);
@@ -237,17 +237,19 @@
var displayContext = this.displayCanvas.getContext('2d');
displayContext.save();
if (this.canvas.width*this.zoom < this.displayCanvas.width || this.canvas.height*this.zoom < this.displayCanvas.height) {
var smallerHeight = this.canvas.height * this.zoom < this.displayCanvas.height;
var smallerWidth = this.canvas.width * this.zoom < this.displayCanvas.width;
if (smallerHeight || smallerWidth) {
displayContext.fillStyle = Constants.ZOOMED_OUT_BACKGROUND_COLOR;
displayContext.fillRect(0,0,this.displayCanvas.width - 1, this.displayCanvas.height - 1);
displayContext.fillRect(0, 0, this.displayCanvas.width - 1, this.displayCanvas.height - 1);
}
displayContext.translate(
this.margin.x-this.offset.x*this.zoom,
this.margin.y-this.offset.y*this.zoom
this.margin.x - this.offset.x * this.zoom,
this.margin.y - this.offset.y * this.zoom
);
displayContext.clearRect(0, 0, this.canvas.width*this.zoom, this.canvas.height*this.zoom);
displayContext.clearRect(0, 0, this.canvas.width * this.zoom, this.canvas.height * this.zoom);
var isIE10 = pskl.utils.UserAgent.isIE && pskl.utils.UserAgent.version === 10;
@@ -264,16 +266,16 @@
};
ns.FrameRenderer.prototype.renderPixel_ = function (color, x, y, context) {
if(color != Constants.TRANSPARENT_COLOR) {
if (color != Constants.TRANSPARENT_COLOR) {
context.fillStyle = color;
context.fillRect(x, y, 1, 1);
}
};
ns.FrameRenderer.prototype.renderLine_ = function (color, x, y, width, context) {
if(color != Constants.TRANSPARENT_COLOR) {
if (color != Constants.TRANSPARENT_COLOR) {
context.fillStyle = color;
context.fillRect(x, y, 1, width);
}
};
})();
})();

2
src/js/rendering/frame/TiledFrameRenderer.js
View File

@@ -38,4 +38,4 @@
ns.TiledFrameRenderer.prototype.getZoom = function () {
return this.zoom;
};
})();
})();

11
src/js/rendering/layer/LayersRenderer.js
View File

@@ -7,8 +7,11 @@
this.piskelController = piskelController;
// Do not use CachedFrameRenderers here, since the caching will be performed in the render method of LayersRenderer
this.belowRenderer = new pskl.rendering.frame.FrameRenderer(container, renderingOptions, ["layers-canvas", "layers-below-canvas"]);
this.aboveRenderer = new pskl.rendering.frame.FrameRenderer(container, renderingOptions, ["layers-canvas", "layers-above-canvas"]);
this.belowRenderer = new pskl.rendering.frame.FrameRenderer(container, renderingOptions,
['layers-canvas', 'layers-below-canvas']);
this.aboveRenderer = new pskl.rendering.frame.FrameRenderer(container, renderingOptions,
['layers-canvas', 'layers-above-canvas']);
this.add(this.belowRenderer);
this.add(this.aboveRenderer);
@@ -30,7 +33,6 @@
var downLayers = layers.slice(0, currentLayerIndex);
var upLayers = layers.slice(currentLayerIndex + 1, layers.length);
var serializedRendering = [
this.getZoom(),
this.getGridWidth(),
@@ -41,8 +43,7 @@
this.getHashForLayersAt_(currentFrameIndex, downLayers),
this.getHashForLayersAt_(currentFrameIndex, upLayers),
layers.length
].join("-");
].join('-');
if (this.serializedRendering != serializedRendering) {
this.serializedRendering = serializedRendering;