lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-11-24 08:46:44 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

brighten tests are now passing

Browse Source
This commit is contained in:
Eric Rowell
2013-12-31 13:16:41 -08:00
parent 966ddc5a83
commit 3321102784
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/filters/Brighten.js
View File

@@ -6,7 +6,7 @@
* @param {Object} imageData
*/
Kinetic.Filters.Brighten = function(imageData) {
var brightness = this.getFilterBrightness();
var brightness = this.brightness() * 255;
var data = imageData.data;
for(var i = 0; i < data.length; i += 4) {
// red
@@ -20,17 +20,13 @@
Kinetic.Factory.addFilterGetterSetter(Kinetic.Node, 'brightness', 0);
/**
* get filter brightness. The brightness is a number between -255 and 255.&nbsp; Positive values
* increase the brightness and negative values decrease the brightness, making the image darker
* @name getFilterBrightness
* get/set filter brightness. The brightness is a number between -1 and 1.&nbsp; Positive values
* brighten the node and negative values darken it.
* @name brightness
* @method
* @memberof Kinetic.Image.prototype
* @param {Number} brightness value between -1 and 1
* @returns {Number}
*/
/**
* set filter brightness
* @name setFilterBrightness
* @method
* @memberof Kinetic.Image.prototype
*/
})();

3
test/runner.html
View File

@@ -81,6 +81,8 @@
<!-- filters -->
<script src="unit/filters/Blur-test.js"></script>
<script src="unit/filters/Brighten-test.js"></script>
<!--
<script src="unit/filters/ColorPack-test.js"></script>
<script src="unit/filters/Invert-test.js"></script>
<script src="unit/filters/Mask-test.js"></script>
@@ -95,6 +97,7 @@
<script src="unit/filters/Flip-test.js"></script>
<script src="unit/filters/Mirror-test.js"></script>
<script src="unit/filters/Sepia-test.js"></script>
-->
<!--=============== functional tests ================-->

2
test/unit/filters/Blur-test.js
View File

@@ -43,7 +43,7 @@ suite('Blur', function() {
});
test.only('blur group', function(){
test('blur group', function(){
var stage = addStage();
var layer = new Kinetic.Layer();
var group = new Kinetic.Group({

28
test/unit/filters/Brighten-test.js
View File

@@ -17,11 +17,12 @@ suite('Brighten', function() {
layer.add(darth);
stage.add(layer);
darth.setFilter(Kinetic.Filters.Brighten);
darth.setFilterBrightness(100);
darth.cache();
darth.filters([Kinetic.Filters.Brighten]);
darth.brightness(0.3);
layer.draw();
assert.equal(darth.getFilterBrightness(), 100);
assert.equal(darth.brightness(), 0.3);
done();
};
@@ -47,14 +48,15 @@ suite('Brighten', function() {
layer.add(darth);
stage.add(layer);
darth.setFilter(Kinetic.Filters.Brighten);
darth.setFilterBrightness(100);
darth.cache();
darth.filters([Kinetic.Filters.Brighten]);
darth.brightness(0.3);
layer.draw();
var tween = new Kinetic.Tween({
node: darth,
duration: 2.0,
filterBrightness: 0,
brightness: 0,
easing: Kinetic.Easings.EaseInOut
});
@@ -91,11 +93,12 @@ suite('Brighten', function() {
layer.add(darth);
stage.add(layer);
darth.setFilter(Kinetic.Filters.Brighten);
darth.setFilterBrightness(-50);
darth.cache();
darth.filters([Kinetic.Filters.Brighten]);
darth.brightness(-0.3);
layer.draw();
assert.equal(darth.getFilterBrightness(), -50);
assert.equal(darth.brightness(), -0.3);
done();
@@ -121,14 +124,15 @@ suite('Brighten', function() {
layer.add(darth);
stage.add(layer);
darth.setFilter(Kinetic.Filters.Brighten);
darth.setFilterBrightness(100);
darth.cache();
darth.filters([Kinetic.Filters.Brighten]);
darth.brightness(0.3);
layer.draw();
var tween = new Kinetic.Tween({
node: darth,
duration: 2.0,
filterBrightness: -100,
brightness: -0.3,
easing: Kinetic.Easings.EaseInOut
});