got the convolve filters working, but we still need to do some work on them

This commit is contained in:
Eric Rowell
2014-01-03 23:09:49 -08:00
parent 3814a1dddc
commit cfe3091833
2 changed files with 15 additions and 11 deletions

View File

@@ -68,7 +68,7 @@
return kernel; return kernel;
}; };
Kinetic.Factory.addFilterGetterSetter(Kinetic.Node, 'convoltion', 50); Kinetic.Factory.addFilterGetterSetter(Kinetic.Node, 'filterAmount', 50);
/** /**
* get the current filter amount * get the current filter amount
* @name getFilterAmount * @name getFilterAmount

View File

@@ -1,4 +1,4 @@
suite('Convolve Pack', function() { suite('ConvolvePack', function() {
// ====================================================== // ======================================================
test('emboss', function(done) { test('emboss', function(done) {
@@ -16,8 +16,9 @@ suite('Convolve Pack', function() {
layer.add(darth); layer.add(darth);
stage.add(layer); stage.add(layer);
darth.cache();
darth.filters([Kinetic.Filters.Emboss]); darth.filters([Kinetic.Filters.Emboss]);
darth.setFilterAmount(50); darth.filterAmount(100);
layer.draw(); layer.draw();
var tween = new Kinetic.Tween({ var tween = new Kinetic.Tween({
@@ -38,8 +39,8 @@ suite('Convolve Pack', function() {
done(); done();
}; };
//imageObj.src = 'assets/darth-vader.jpg'; imageObj.src = 'assets/darth-vader.jpg';
imageObj.src = 'assets/lion.png'; //imageObj.src = 'assets/lion.png';
}); });
@@ -59,8 +60,9 @@ suite('Convolve Pack', function() {
layer.add(darth); layer.add(darth);
stage.add(layer); stage.add(layer);
darth.setFilter(Kinetic.Filters.Edge); darth.cache();
darth.setFilterAmount(50); darth.filters([Kinetic.Filters.Edge]);
darth.setFilterAmount(100);
layer.draw(); layer.draw();
var tween = new Kinetic.Tween({ var tween = new Kinetic.Tween({
@@ -102,8 +104,9 @@ suite('Convolve Pack', function() {
layer.add(darth); layer.add(darth);
stage.add(layer); stage.add(layer);
darth.setFilter(Kinetic.Filters.UnsharpMask); darth.cache();
darth.setFilterAmount(50); darth.filters([Kinetic.Filters.UnsharpMask]);
darth.setFilterAmount(100);
layer.draw(); layer.draw();
var tween = new Kinetic.Tween({ var tween = new Kinetic.Tween({
@@ -145,8 +148,9 @@ suite('Convolve Pack', function() {
layer.add(darth); layer.add(darth);
stage.add(layer); stage.add(layer);
darth.setFilter(Kinetic.Filters.SoftBlur); darth.cache();
darth.setFilterAmount(50); darth.filters([Kinetic.Filters.SoftBlur]);
darth.setFilterAmount(100);
layer.draw(); layer.draw();
var tween = new Kinetic.Tween({ var tween = new Kinetic.Tween({