diff --git a/src/filters/blendcolor_filter.class.js b/src/filters/blendcolor_filter.class.js index 028c6a0f..40ac52ae 100644 --- a/src/filters/blendcolor_filter.class.js +++ b/src/filters/blendcolor_filter.class.js @@ -276,6 +276,7 @@ */ toObject: function() { return { + type: this.type, color: this.color, mode: this.mode, alpha: this.alpha diff --git a/src/filters/noise_filter.class.js b/src/filters/noise_filter.class.js index 59c3ac2b..259e6090 100644 --- a/src/filters/noise_filter.class.js +++ b/src/filters/noise_filter.class.js @@ -36,7 +36,7 @@ */ fragmentSource: 'precision highp float;\n' + 'uniform sampler2D uTexture;\n' + - 'uniform float uHeight;\n' + + 'uniform float uStepH;\n' + 'uniform float uNoise;\n' + 'uniform float uSeed;\n' + 'varying vec2 vTexCoord;\n' + @@ -45,7 +45,7 @@ '}\n' + 'void main() {\n' + 'vec4 color = texture2D(uTexture, vTexCoord);\n' + - 'color.rgb += (0.5 - rand(vTexCoord, uSeed, uHeight / 10.0)) * uNoise;\n' + + 'color.rgb += (0.5 - rand(vTexCoord, uSeed, 0.1 / uStepH)) * uNoise;\n' + 'gl_FragColor = color;\n' + '}',