wbrawner/piskel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	Gruntfile.js
This commit is contained in:
Filipe Vieira 2014-05-06 02:53:18 +01:00
commit 8a85e953f1
10 changed files with 158 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -12,15 +12,12 @@ npm-debug.log
# git stackdumps
*.stackdump
# builds
build/*.js
build/*.css
# diffs
diff.txt
# Closure compiler generated JS binary.
build/closure/closure_compiled_binary.js
# build destination
dest
# marked as private
*.private.*

122
Gruntfile.js
View file

@ -36,6 +36,10 @@ module.exports = function(grunt) {
};
grunt.initConfig({
clean: {
before: ['dest'],
after: ['build/closure/closure_compiled_binary.js']
},
jshint: {
options: {
indent:2,
@ -60,12 +64,39 @@ module.exports = function(grunt) {
base : '.',
port : 4321
}
}
},
express: {
regular: {
options: {
port: 9001,
hostname : 'localhost',
bases: ['dest']
}
},
serve : {
options : {
base : '.',
port : 1234,
keepalive : true
debug: {
options: {
port: 9901,
hostname : 'localhost',
bases: ['src']
}
}
},
open : {
regular : {
path : 'http://localhost:9001/'
},
debug : {
path : 'http://localhost:9901/?debug'
}
},
watch: {
scripts: {
files: ['src/**/*.*'],
tasks: ['merge'],
options: {
spawn: false
}
}
},
@ -79,11 +110,11 @@ module.exports = function(grunt) {
separator : ';'
},
src : piskelScripts,
dest : 'build/piskel-packaged.js'
dest : 'dest/js/piskel-packaged.js'
},
css : {
src : piskelStyles,
dest : 'build/piskel-style-packaged.css'
dest : 'dest/css/piskel-style-packaged.css'
}
},
uglify : {
@ -92,10 +123,20 @@ module.exports = function(grunt) {
},
my_target : {
files : {
'build/piskel-packaged-min.js' : ['build/piskel-packaged.js']
'dest/js/piskel-packaged-min.js' : ['dest/js/piskel-packaged.js']
}
}
},
copy: {
main: {
files: [
{src: ['src/piskel-boot.js'], dest: 'dest/piskel-boot.js'},
{src: ['src/js/lib/iframeLoader.js'], dest: 'dest/js/lib/iframeLoader.js'},
{expand: true, src: ['img/**'], cwd: 'src/', dest: 'dest/', filter: 'isFile'},
{expand: true, src: ['**/*.html'], cwd: 'src/', dest: 'dest/', filter: 'isFile'}
]
}
},
closureCompiler: {
options: {
// [REQUIRED] Path to closure compiler
@ -146,26 +187,18 @@ module.exports = function(grunt) {
// This generated JS binary is currently not used and even excluded from source control using .gitignore.
dest: 'build/closure/closure_compiled_binary.js'
},
}
},
nodewebkit: {
options: {
build_dir: './build', // Where the build version of my node-webkit app is saved
mac: true,
win: true,
linux32: true,
linux64: true
},
src: ['./**/*']
},
copy: {
desktop: {
files: [
{expand: true, cwd: "build/", src: ['*'], dest: 'desktop/build/', filter: 'isFile'},
{expand: true, cwd: "src/", src: ['**'], dest: 'desktop/'},
]
}
}
options: {
build_dir: './dest', // Where the build version of my node-webkit app is saved
mac: true,
win: true,
linux32: true,
linux64: true
},
src: ['./**/*']
}
});
grunt.config.set('leadingIndent.indentation', 'spaces');
@ -179,12 +212,17 @@ module.exports = function(grunt) {
src: ['src/css/**/*.css']
});
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-closure-tools');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-express');
grunt.loadNpmTasks('grunt-ghost');
grunt.loadNpmTasks('grunt-open');
grunt.loadNpmTasks('grunt-leading-indent');
grunt.loadNpmTasks('grunt-node-webkit-builder');
grunt.loadNpmTasks('grunt-contrib-copy');
@ -193,23 +231,27 @@ module.exports = function(grunt) {
grunt.registerTask('lint', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint']);
// Validate & Test
grunt.registerTask('test', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint', 'compile', 'connect:test', 'ghost:default']);
grunt.registerTask('test', ['lint', 'compile', 'connect:test', 'ghost:default']);
// Validate & Test (faster version) will NOT work on travis !!
grunt.registerTask('precommit', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint', 'compile', 'connect:test', 'ghost:local']);
grunt.registerTask('precommit', ['lint', 'compile', 'connect:test', 'ghost:local']);
// Compile JS code (eg verify JSDoc annotation and types, no actual minified code generated).
grunt.registerTask('compile', ['closureCompiler:compile']);
grunt.registerTask('compile', ['closureCompiler:compile', 'clean:after']);
grunt.registerTask('merge', ['concat:js', 'concat:css', 'uglify']);
grunt.registerTask('merge', ['concat:js', 'concat:css', 'uglify', 'copy']);
// Validate & Build
grunt.registerTask('default', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint', 'concat:js', 'concat:css', 'compile', 'uglify']);
grunt.registerTask('default', ['clean:before', 'lint', 'compile', 'merge']);
// Start webserver
grunt.registerTask('serve', ['connect:serve']);
// Build stand alone app with nodewebkit
grunt.registerTask('desktop', ['compile', 'merge', 'copy:desktop', 'nodewebkit']);
grunt.registerTask('desktop', ['default', 'nodewebkit']);
grunt.registerTask('server', ['merge', 'express:regular', 'open:regular', 'express-keepalive']);
// Start webserver and watch for changes
grunt.registerTask('server:watch', ['server', 'watch']);
// Start webserver on src folder, in debug mode
grunt.registerTask('server:debug', ['express:debug', 'open:debug', 'express-keepalive']);
};

10
package.json
View file

@ -1,7 +1,7 @@
{
"author": "Julian Descottes, Vincent Renaudin",
"name": "piskel",
"main": "./desktop/index.html",
"main": "./dest/index.html",
"description": "Web based 2d animations editor",
"version": "0.0.1",
"homepage": "http://github.com/juliandescottes/piskel",
@ -15,15 +15,19 @@
},
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-clean": "0.5.0",
"grunt-contrib-connect": "0.3.0",
"grunt-contrib-concat": "0.1.2",
"grunt-contrib-copy": "0.5.0",
"grunt-contrib-jshint": "0.5.4",
"grunt-contrib-uglify": "0.2.2",
"grunt-contrib-watch": "0.6.1",
"grunt-express": "1.0",
"grunt-ghost": "1.0.12",
"grunt-open": "0.2.3",
"grunt-leading-indent": "0.1.0",
"grunt-closure-tools": "~0.8.3",
"grunt-node-webkit-builder": "~0.1.21",
"grunt-contrib-copy": "~0.5.0"
"grunt-node-webkit-builder": "~0.1.21"
},
"window": {
"toolbar": false

1
src/js/controller/DrawingController.js
View file

@ -60,7 +60,6 @@
$.subscribe(Events.USER_SETTINGS_CHANGED, $.proxy(this.onUserSettingsChange_, this));
$.subscribe(Events.FRAME_SIZE_CHANGED, $.proxy(this.onFrameSizeChanged_, this));
// this.afterWindowResize_.bind(this);
window.setTimeout(this.afterWindowResize_.bind(this), 100);
};

52
src/js/controller/settings/ResizeController.js
View file

@ -17,6 +17,8 @@
this.resizeForm = $("[name=resize-form]");
this.resizeForm.submit(this.onResizeFormSubmit_.bind(this));
this.resizeContentCheckbox = $(".resize-content-checkbox");
};
ns.ResizeController.prototype.onResizeFormSubmit_ = function (evt) {
@ -25,31 +27,41 @@
var width = parseInt(this.resizeWidth.val(), 10);
var height = parseInt(this.resizeHeight.val(), 10);
var layers = [];
var fromLayers = this.piskelController.getLayers();
for (var i = 0 ; i < fromLayers.length ; i++) {
var frames = [];
var fromFrames = fromLayers[i].getFrames();
for (var j = 0 ; j < fromFrames.length ; j++) {
var frame = new pskl.model.Frame(width, height);
this.copyFromFrameToFrame(fromFrames[j], frame);
frames.push(frame);
}
var layer = pskl.model.Layer.fromFrames(fromLayers[i].getName(), frames);
layers.push(layer);
}
var piskel = pskl.model.Piskel.fromLayers(layers, this.piskelController.getPiskel().getDescriptor());
var resizeContentEnabled = this.isResizeContentEnabled_();
var resizedLayers = this.piskelController.getLayers().map(this.resizeLayer_.bind(this));
var piskel = pskl.model.Piskel.fromLayers(resizedLayers, this.piskelController.getPiskel().getDescriptor());
pskl.app.piskelController.setPiskel(piskel);
$.publish(Events.CLOSE_SETTINGS_DRAWER);
};
ns.ResizeController.prototype.copyFromFrameToFrame = function (from, to) {
from.forEachPixel(function (color, x, y) {
if (x < to.getWidth() && y < to.getHeight()) {
to.setPixel(x, y, color);
}
});
ns.ResizeController.prototype.resizeLayer_ = function (layer) {
var resizedFrames = layer.getFrames().map(this.resizeFrame_.bind(this));
return pskl.model.Layer.fromFrames(layer.getName(), resizedFrames);
};
ns.ResizeController.prototype.resizeFrame_ = function (frame) {
var width = parseInt(this.resizeWidth.val(), 10);
var height = parseInt(this.resizeHeight.val(), 10);
var resizedFrame;
if (this.isResizeContentEnabled_()) {
resizedFrame = pskl.utils.FrameUtils.resize(frame, width, height, false);
} else {
resizedFrame = new pskl.model.Frame(width, height);
frame.forEachPixel(function (color, x, y) {
if (x < resizedFrame.getWidth() && y < resizedFrame.getHeight()) {
resizedFrame.setPixel(x, y, color);
}
});
}
return resizedFrame;
};
ns.ResizeController.prototype.isResizeContentEnabled_ = function () {
return !!this.resizeContentCheckbox.prop('checked');
};
ns.ResizeController.prototype.onCancelButtonClicked_ = function (evt) {

2
src/js/controller/settings/SettingsController.js
View file

@ -95,6 +95,8 @@
this.isExpanded = false;
this.currentSetting = null;
document.activeElement.blur();
};
})();

25
src/js/service/HistoryService.js
View file

@ -78,8 +78,9 @@
throw 'Could not find previous SNAPSHOT saved in history stateQueue';
}
var piskelSnapshot = this.getSnapshotFromState_(snapshotIndex);
this.loadPiskel(piskelSnapshot, this.onPiskelLoadedCallback.bind(this, index, snapshotIndex));
var serializedPiskel = this.getSnapshotFromState_(snapshotIndex);
var onPiskelLoadedCb = this.onPiskelLoaded_.bind(this, index, snapshotIndex);
pskl.utils.serialization.Deserializer.deserialize(serializedPiskel, onPiskelLoadedCb);
}
};
@ -98,16 +99,11 @@
return piskelSnapshot;
};
ns.HistoryService.prototype.loadPiskel = function (piskel, callback) {
var descriptor = this.piskelController.piskel.getDescriptor();
pskl.utils.serialization.Deserializer.deserialize(piskel, function (deserializedPiskel) {
deserializedPiskel.setDescriptor(descriptor);
this.piskelController.setPiskel(deserializedPiskel);
callback(deserializedPiskel);
}.bind(this));
};
ns.HistoryService.prototype.onPiskelLoaded_ = function (index, snapshotIndex, piskel) {
var originalSize = this.getPiskelSize_();
piskel.setDescriptor(this.piskelController.piskel.getDescriptor());
this.piskelController.setPiskel(piskel);
ns.HistoryService.prototype.onPiskelLoadedCallback = function (index, snapshotIndex, piskel) {
for (var i = snapshotIndex + 1 ; i <= index ; i++) {
var state = this.stateQueue[i];
this.setupState(state);
@ -118,6 +114,13 @@
this.setupState(lastState);
this.currentIndex = index;
$.publish(Events.PISKEL_RESET);
if (originalSize !== this.getPiskelSize_()) {
$.publish(Events.FRAME_SIZE_CHANGED);
}
};
ns.HistoryService.prototype.getPiskelSize_ = function () {
return this.piskelController.getWidth() + 'x' + this.piskelController.getHeight();
};
ns.HistoryService.prototype.setupState = function (state) {

12
src/js/utils/FrameUtils.js
View file

@ -22,6 +22,12 @@
});
},
resize : function (frame, targetWidth, targetHeight, smoothing) {
var image = pskl.utils.FrameUtils.toImage(frame);
var resizedImage = pskl.utils.ImageResizer.resize(image, targetWidth, targetHeight, smoothing);
return pskl.utils.FrameUtils.createFromImage(resizedImage);
},
/**
* Alpha compositing using porter duff algorithm :
* http://en.wikipedia.org/wiki/Alpha_compositing
@ -151,6 +157,12 @@
componentToHex : function (c) {
var hex = c.toString(16);
return hex.length == 1 ? "0" + hex : hex;
},
toImage : function (frame) {
var canvasRenderer = new pskl.rendering.CanvasRenderer(frame, 1);
canvasRenderer.drawTransparentAs(Constants.TRANSPARENT_COLOR);
return canvasRenderer.render();
}
};
})();

6
src/piskel-boot.js
View file

@ -59,11 +59,11 @@
} else {
var script;
if (window.location.href.indexOf("pack") != -1) {
script = "build/piskel-packaged.js";
script = "js/piskel-packaged.js";
} else {
script = "build/piskel-packaged-min.js";
script = "js/piskel-packaged-min.js";
}
loadStyle('build/piskel-style-packaged.css');
loadStyle('css/piskel-style-packaged.css');
var loaderInterval = window.setInterval(function () {
if (document.querySelectorAll("[data-iframe-loader]").length === 0) {

4
src/templates/settings/resize.html
View file

@ -10,6 +10,10 @@
<input type="text" class="textfield resize-size-field" name="resize-width"/>x
<input type="text" class="textfield resize-size-field" name="resize-height"/>
</div>
<div class="resize-section">
<span class="resize-section-title resize-section-title-small">Resize canvas content : </span>
<input type="checkbox" class="resize-content-checkbox" name="resize-content-checkbox" value="true"/>
</div>
<input type="submit" class="button button-primary resize-button" value="Resize" />
<input type="button" class="button resize-cancel-button" value="Cancel" />
</form>