diff --git a/core/src/avm2/globals/flash/filters/BevelFilter.as b/core/src/avm2/globals/flash/filters/BevelFilter.as index c6f3125aad52..4a618ea1e58d 100644 --- a/core/src/avm2/globals/flash/filters/BevelFilter.as +++ b/core/src/avm2/globals/flash/filters/BevelFilter.as @@ -1,86 +1,86 @@ package flash.filters { - public final class BevelFilter extends BitmapFilter { - // FIXME these should all be getters/setters to match Flash + public final class BevelFilter extends BitmapFilter { + // FIXME these should all be getters/setters to match Flash - [Ruffle(InternalSlot)] - public var angle : Number; + [Ruffle(InternalSlot)] + public var angle : Number; - [Ruffle(InternalSlot)] - public var blurX : Number; + [Ruffle(InternalSlot)] + public var blurX : Number; - [Ruffle(InternalSlot)] - public var blurY : Number; + [Ruffle(InternalSlot)] + public var blurY : Number; - [Ruffle(InternalSlot)] - public var distance : Number; + [Ruffle(InternalSlot)] + public var distance : Number; - [Ruffle(InternalSlot)] - public var highlightAlpha : Number; + [Ruffle(InternalSlot)] + public var highlightAlpha : Number; - [Ruffle(InternalSlot)] - public var highlightColor : uint; + [Ruffle(InternalSlot)] + public var highlightColor : uint; - [Ruffle(InternalSlot)] - public var knockout : Boolean; + [Ruffle(InternalSlot)] + public var knockout : Boolean; - [Ruffle(InternalSlot)] - public var quality : int; + [Ruffle(InternalSlot)] + public var quality : int; - [Ruffle(InternalSlot)] - public var shadowAlpha : Number; + [Ruffle(InternalSlot)] + public var shadowAlpha : Number; - [Ruffle(InternalSlot)] - public var shadowColor : uint; + [Ruffle(InternalSlot)] + public var shadowColor : uint; - [Ruffle(InternalSlot)] - public var strength : Number; + [Ruffle(InternalSlot)] + public var strength : Number; - [Ruffle(InternalSlot)] - public var type : String; + [Ruffle(InternalSlot)] + public var type : String; - public function BevelFilter( - distance:Number = 4.0, - angle:Number = 45, - highlightColor:uint = 0xFFFFFF, - highlightAlpha:Number = 1.0, - shadowColor:uint = 0x000000, - shadowAlpha:Number = 1.0, - blurX:Number = 4.0, - blurY:Number = 4.0, - strength:Number = 1, - quality:int = 1, - type:String = "inner", - knockout:Boolean = false - ) { - this.angle = angle; - this.blurX = blurX; - this.blurY = blurY; - this.distance = distance; - this.highlightAlpha = highlightAlpha; - this.highlightColor = highlightColor; - this.knockout = knockout; - this.quality = quality; - this.shadowAlpha = shadowAlpha; - this.shadowColor = shadowColor; - this.strength = strength; - this.type = type; - } + public function BevelFilter( + distance:Number = 4.0, + angle:Number = 45, + highlightColor:uint = 0xFFFFFF, + highlightAlpha:Number = 1.0, + shadowColor:uint = 0x000000, + shadowAlpha:Number = 1.0, + blurX:Number = 4.0, + blurY:Number = 4.0, + strength:Number = 1, + quality:int = 1, + type:String = "inner", + knockout:Boolean = false + ) { + this.angle = angle; + this.blurX = blurX; + this.blurY = blurY; + this.distance = distance; + this.highlightAlpha = highlightAlpha; + this.highlightColor = highlightColor; + this.knockout = knockout; + this.quality = quality; + this.shadowAlpha = shadowAlpha; + this.shadowColor = shadowColor; + this.strength = strength; + this.type = type; + } - override public function clone(): BitmapFilter { - return new BevelFilter( - this.distance, - this.angle, - this.highlightColor, - this.highlightAlpha, - this.shadowColor, - this.shadowAlpha, - this.blurX, - this.blurY, - this.strength, - this.quality, - this.type, - this.knockout - ); - } - } + override public function clone(): BitmapFilter { + return new BevelFilter( + this.distance, + this.angle, + this.highlightColor, + this.highlightAlpha, + this.shadowColor, + this.shadowAlpha, + this.blurX, + this.blurY, + this.strength, + this.quality, + this.type, + this.knockout + ); + } + } } diff --git a/core/src/avm2/globals/flash/filters/BitmapFilter.as b/core/src/avm2/globals/flash/filters/BitmapFilter.as index 5814e20846d5..7b09a8f9a575 100644 --- a/core/src/avm2/globals/flash/filters/BitmapFilter.as +++ b/core/src/avm2/globals/flash/filters/BitmapFilter.as @@ -1,7 +1,7 @@ package flash.filters { - public class BitmapFilter { - public function clone(): BitmapFilter { - return null; - } - } + public class BitmapFilter { + public function clone(): BitmapFilter { + return null; + } + } } diff --git a/core/src/avm2/globals/flash/filters/BlurFilter.as b/core/src/avm2/globals/flash/filters/BlurFilter.as index e8fd13f3faef..69a3c5d47ca8 100644 --- a/core/src/avm2/globals/flash/filters/BlurFilter.as +++ b/core/src/avm2/globals/flash/filters/BlurFilter.as @@ -1,22 +1,22 @@ package flash.filters { - public final class BlurFilter extends BitmapFilter { - [Ruffle(InternalSlot)] - public var blurX: Number; + public final class BlurFilter extends BitmapFilter { + [Ruffle(InternalSlot)] + public var blurX: Number; - [Ruffle(InternalSlot)] - public var blurY: Number; + [Ruffle(InternalSlot)] + public var blurY: Number; - [Ruffle(InternalSlot)] - public var quality: int; + [Ruffle(InternalSlot)] + public var quality: int; - public function BlurFilter(blurX: Number = 4.0, blurY: Number = 4.0, quality: int = 1) { - this.blurX = blurX; - this.blurY = blurY; - this.quality = quality; - } + public function BlurFilter(blurX: Number = 4.0, blurY: Number = 4.0, quality: int = 1) { + this.blurX = blurX; + this.blurY = blurY; + this.quality = quality; + } - override public function clone(): BitmapFilter { - return new BlurFilter(this.blurX, this.blurY, this.quality); - } - } + override public function clone(): BitmapFilter { + return new BlurFilter(this.blurX, this.blurY, this.quality); + } + } } diff --git a/core/src/avm2/globals/flash/filters/ColorMatrixFilter.as b/core/src/avm2/globals/flash/filters/ColorMatrixFilter.as index eca0b1cd465f..17ba0220337a 100644 --- a/core/src/avm2/globals/flash/filters/ColorMatrixFilter.as +++ b/core/src/avm2/globals/flash/filters/ColorMatrixFilter.as @@ -1,36 +1,36 @@ package flash.filters { - public final class ColorMatrixFilter extends BitmapFilter { - [Ruffle(InternalSlot)] - private var _matrix: Array; + public final class ColorMatrixFilter extends BitmapFilter { + [Ruffle(InternalSlot)] + private var _matrix: Array; - public function ColorMatrixFilter(matrix: Array = null) { - if (matrix == null) { - matrix = [ - 1, 0, 0, 0, 0, - 0, 1, 0, 0, 0, - 0, 0, 1, 0, 0, - 0, 0, 0, 1, 0 - ]; - } - this.matrix = matrix; - } + public function ColorMatrixFilter(matrix: Array = null) { + if (matrix == null) { + matrix = [ + 1, 0, 0, 0, 0, + 0, 1, 0, 0, 0, + 0, 0, 1, 0, 0, + 0, 0, 0, 1, 0 + ]; + } + this.matrix = matrix; + } - // From the Flash docs, we need to make a copy of the `Array`, - // as modifying the `filter.matrix` directly should have no effect. - // We call the method in the AS3 namespace, as some SWFS define a - // extend `Array` and declare a *public* 'concat' method with a - // different signature. + // From the Flash docs, we need to make a copy of the `Array`, + // as modifying the `filter.matrix` directly should have no effect. + // We call the method in the AS3 namespace, as some SWFS define a + // extend `Array` and declare a *public* 'concat' method with a + // different signature. - public function get matrix(): Array { - return this._matrix.AS3::concat(); - } + public function get matrix(): Array { + return this._matrix.AS3::concat(); + } - public function set matrix(matrix:Array):void { - this._matrix = matrix.AS3::concat(); - } + public function set matrix(matrix:Array):void { + this._matrix = matrix.AS3::concat(); + } - override public function clone(): BitmapFilter { - return new ColorMatrixFilter(this.matrix.AS3::concat()); - } - } + override public function clone(): BitmapFilter { + return new ColorMatrixFilter(this.matrix.AS3::concat()); + } + } } diff --git a/core/src/avm2/globals/flash/filters/ConvolutionFilter.as b/core/src/avm2/globals/flash/filters/ConvolutionFilter.as index 116b566da8f8..cdd593c6dfc0 100644 --- a/core/src/avm2/globals/flash/filters/ConvolutionFilter.as +++ b/core/src/avm2/globals/flash/filters/ConvolutionFilter.as @@ -1,56 +1,56 @@ package flash.filters { - public final class ConvolutionFilter extends BitmapFilter { - [Ruffle(InternalSlot)] - public var alpha : Number; - - [Ruffle(InternalSlot)] - public var bias : Number; - - [Ruffle(InternalSlot)] - public var clamp : Boolean; - - [Ruffle(InternalSlot)] - public var color : uint; - - [Ruffle(InternalSlot)] - public var divisor : Number; - - [Ruffle(InternalSlot)] - public var matrix : Array; - - [Ruffle(InternalSlot)] - public var matrixX : Number; - - [Ruffle(InternalSlot)] - public var matrixY : Number; - - [Ruffle(InternalSlot)] - public var preserveAlpha : Boolean; - - public function ConvolutionFilter( - matrixX:Number = 0, - matrixY:Number = 0, - matrix:Array = null, - divisor:Number = 1.0, - bias:Number = 0.0, - preserveAlpha:Boolean = true, - clamp:Boolean = true, - color:uint = 0, - alpha:Number = 0.0 - ) { - this.alpha = alpha; - this.bias = bias; - this.clamp = clamp; - this.color = color; - this.divisor = divisor; - this.matrix = matrix; - this.matrixX = matrixX; - this.matrixY = matrixY; - this.preserveAlpha = preserveAlpha; - } - - override public function clone(): BitmapFilter { - return new ConvolutionFilter(this.matrixX, this.matrixY, this.matrixull, this.divisor, this.bias, this.preserveAlpharue, this.clamprue, this.color, this.alpha); - } - } + public final class ConvolutionFilter extends BitmapFilter { + [Ruffle(InternalSlot)] + public var alpha : Number; + + [Ruffle(InternalSlot)] + public var bias : Number; + + [Ruffle(InternalSlot)] + public var clamp : Boolean; + + [Ruffle(InternalSlot)] + public var color : uint; + + [Ruffle(InternalSlot)] + public var divisor : Number; + + [Ruffle(InternalSlot)] + public var matrix : Array; + + [Ruffle(InternalSlot)] + public var matrixX : Number; + + [Ruffle(InternalSlot)] + public var matrixY : Number; + + [Ruffle(InternalSlot)] + public var preserveAlpha : Boolean; + + public function ConvolutionFilter( + matrixX:Number = 0, + matrixY:Number = 0, + matrix:Array = null, + divisor:Number = 1.0, + bias:Number = 0.0, + preserveAlpha:Boolean = true, + clamp:Boolean = true, + color:uint = 0, + alpha:Number = 0.0 + ) { + this.alpha = alpha; + this.bias = bias; + this.clamp = clamp; + this.color = color; + this.divisor = divisor; + this.matrix = matrix; + this.matrixX = matrixX; + this.matrixY = matrixY; + this.preserveAlpha = preserveAlpha; + } + + override public function clone(): BitmapFilter { + return new ConvolutionFilter(this.matrixX, this.matrixY, this.matrixull, this.divisor, this.bias, this.preserveAlpharue, this.clamprue, this.color, this.alpha); + } + } } diff --git a/core/src/avm2/globals/flash/filters/DisplacementMapFilter.as b/core/src/avm2/globals/flash/filters/DisplacementMapFilter.as index 1f33cb98ae7b..21472dfe63a6 100644 --- a/core/src/avm2/globals/flash/filters/DisplacementMapFilter.as +++ b/core/src/avm2/globals/flash/filters/DisplacementMapFilter.as @@ -1,59 +1,59 @@ package flash.filters { - import flash.display.BitmapData; - import flash.geom.Point; - - public final class DisplacementMapFilter extends BitmapFilter { - // FIXME these should all be getters/setters to match Flash - - [Ruffle(InternalSlot)] - public var alpha: Number; - - [Ruffle(InternalSlot)] - public var color: uint; - - [Ruffle(InternalSlot)] - public var componentX: uint; - - [Ruffle(InternalSlot)] - public var componentY: uint; - - [Ruffle(InternalSlot)] - public var mapBitmap: BitmapData; - - [Ruffle(InternalSlot)] - public var mapPoint: Point; - - [Ruffle(InternalSlot)] - public var mode: String; - - [Ruffle(InternalSlot)] - public var scaleX: Number; - - [Ruffle(InternalSlot)] - public var scaleY: Number; - - public function DisplacementMapFilter(mapBitmap:BitmapData = null, - mapPoint:Point = null, - componentX:uint = 0, - componentY:uint = 0, - scaleX:Number = 0.0, - scaleY:Number = 0.0, - mode:String = "wrap", - color:uint = 0, - alpha:Number = 0.0) { - this.mapBitmap = mapBitmap; - this.mapPoint = mapPoint; - this.componentX = componentX; - this.componentY = componentY; - this.scaleX = scaleX; - this.scaleY = scaleY; - this.mode = mode; - this.color = color; - this.alpha = alpha; - } - - override public function clone(): BitmapFilter { - return new DisplacementMapFilter(this.mapBitmap.clone(), this.mapPoint.clone(), this.componentX, this.componentY, this.scaleX, this.scaleY, this.mode, this.color, this.alpha); - } - } + import flash.display.BitmapData; + import flash.geom.Point; + + public final class DisplacementMapFilter extends BitmapFilter { + // FIXME these should all be getters/setters to match Flash + + [Ruffle(InternalSlot)] + public var alpha: Number; + + [Ruffle(InternalSlot)] + public var color: uint; + + [Ruffle(InternalSlot)] + public var componentX: uint; + + [Ruffle(InternalSlot)] + public var componentY: uint; + + [Ruffle(InternalSlot)] + public var mapBitmap: BitmapData; + + [Ruffle(InternalSlot)] + public var mapPoint: Point; + + [Ruffle(InternalSlot)] + public var mode: String; + + [Ruffle(InternalSlot)] + public var scaleX: Number; + + [Ruffle(InternalSlot)] + public var scaleY: Number; + + public function DisplacementMapFilter(mapBitmap:BitmapData = null, + mapPoint:Point = null, + componentX:uint = 0, + componentY:uint = 0, + scaleX:Number = 0.0, + scaleY:Number = 0.0, + mode:String = "wrap", + color:uint = 0, + alpha:Number = 0.0) { + this.mapBitmap = mapBitmap; + this.mapPoint = mapPoint; + this.componentX = componentX; + this.componentY = componentY; + this.scaleX = scaleX; + this.scaleY = scaleY; + this.mode = mode; + this.color = color; + this.alpha = alpha; + } + + override public function clone(): BitmapFilter { + return new DisplacementMapFilter(this.mapBitmap.clone(), this.mapPoint.clone(), this.componentX, this.componentY, this.scaleX, this.scaleY, this.mode, this.color, this.alpha); + } + } } diff --git a/core/src/avm2/globals/flash/filters/DropShadowFilter.as b/core/src/avm2/globals/flash/filters/DropShadowFilter.as index 75ef3310afaf..14fdd24f6b2b 100644 --- a/core/src/avm2/globals/flash/filters/DropShadowFilter.as +++ b/core/src/avm2/globals/flash/filters/DropShadowFilter.as @@ -1,75 +1,75 @@ package flash.filters { - public final class DropShadowFilter extends BitmapFilter { - [Ruffle(InternalSlot)] - public var alpha: Number; + public final class DropShadowFilter extends BitmapFilter { + [Ruffle(InternalSlot)] + public var alpha: Number; - [Ruffle(InternalSlot)] - public var angle: Number; + [Ruffle(InternalSlot)] + public var angle: Number; - [Ruffle(InternalSlot)] - public var blurX: Number; + [Ruffle(InternalSlot)] + public var blurX: Number; - [Ruffle(InternalSlot)] - public var blurY: Number; + [Ruffle(InternalSlot)] + public var blurY: Number; - [Ruffle(InternalSlot)] - public var color: uint; + [Ruffle(InternalSlot)] + public var color: uint; - [Ruffle(InternalSlot)] - public var distance: Number; + [Ruffle(InternalSlot)] + public var distance: Number; - [Ruffle(InternalSlot)] - public var hideObject: Boolean; + [Ruffle(InternalSlot)] + public var hideObject: Boolean; - [Ruffle(InternalSlot)] - public var inner: Boolean; + [Ruffle(InternalSlot)] + public var inner: Boolean; - [Ruffle(InternalSlot)] - public var knockout: Boolean; + [Ruffle(InternalSlot)] + public var knockout: Boolean; - [Ruffle(InternalSlot)] - public var quality: int; + [Ruffle(InternalSlot)] + public var quality: int; - [Ruffle(InternalSlot)] - public var strength: Number; + [Ruffle(InternalSlot)] + public var strength: Number; - public function DropShadowFilter(distance:Number = 4.0, - angle:Number = 45, - color:uint = 0, - alpha:Number = 1.0, - blurX:Number = 4.0, - blurY:Number = 4.0, - strength:Number = 1.0, - quality:int = 1, - inner:Boolean = false, - knockout:Boolean = false, - hideObject:Boolean = false) - { - this.alpha = alpha; - this.angle = angle; - this.blurX = blurX; - this.blurY = blurY; - this.color = color; - this.distance = distance; - this.hideObject = hideObject; - this.inner = inner; - this.knockout = knockout; - this.quality = quality; - this.strength = strength; - } + public function DropShadowFilter(distance:Number = 4.0, + angle:Number = 45, + color:uint = 0, + alpha:Number = 1.0, + blurX:Number = 4.0, + blurY:Number = 4.0, + strength:Number = 1.0, + quality:int = 1, + inner:Boolean = false, + knockout:Boolean = false, + hideObject:Boolean = false) + { + this.alpha = alpha; + this.angle = angle; + this.blurX = blurX; + this.blurY = blurY; + this.color = color; + this.distance = distance; + this.hideObject = hideObject; + this.inner = inner; + this.knockout = knockout; + this.quality = quality; + this.strength = strength; + } - override public function clone(): BitmapFilter { - return new DropShadowFilter(this.distance, - this.angle, - this.color, - this.alpha, - this.blurX, - this.blurY, - this.strength, - this.quality, - this.inner, - this.knockout, - this.hideObject); - } - } + override public function clone(): BitmapFilter { + return new DropShadowFilter(this.distance, + this.angle, + this.color, + this.alpha, + this.blurX, + this.blurY, + this.strength, + this.quality, + this.inner, + this.knockout, + this.hideObject); + } + } } diff --git a/core/src/avm2/globals/flash/filters/GlowFilter.as b/core/src/avm2/globals/flash/filters/GlowFilter.as index e4849e9b93b6..6e7e60ba6952 100644 --- a/core/src/avm2/globals/flash/filters/GlowFilter.as +++ b/core/src/avm2/globals/flash/filters/GlowFilter.as @@ -1,30 +1,30 @@ package flash.filters { - public final class GlowFilter extends BitmapFilter { - [Ruffle(InternalSlot)] - public var alpha: Number; + public final class GlowFilter extends BitmapFilter { + [Ruffle(InternalSlot)] + public var alpha: Number; - [Ruffle(InternalSlot)] - public var blurX: Number; + [Ruffle(InternalSlot)] + public var blurX: Number; - [Ruffle(InternalSlot)] - public var blurY: Number; + [Ruffle(InternalSlot)] + public var blurY: Number; - [Ruffle(InternalSlot)] - public var color: uint; + [Ruffle(InternalSlot)] + public var color: uint; - [Ruffle(InternalSlot)] - public var inner: Boolean; + [Ruffle(InternalSlot)] + public var inner: Boolean; - [Ruffle(InternalSlot)] - public var knockout: Boolean; + [Ruffle(InternalSlot)] + public var knockout: Boolean; - [Ruffle(InternalSlot)] - public var quality: int; + [Ruffle(InternalSlot)] + public var quality: int; - [Ruffle(InternalSlot)] - public var strength: Number; + [Ruffle(InternalSlot)] + public var strength: Number; - public function GlowFilter(color: uint = 0xFF0000, + public function GlowFilter(color: uint = 0xFF0000, alpha: Number = 1.0, blurX: Number = 6.0, blurY: Number = 6.0, @@ -32,19 +32,19 @@ quality: int = 1, inner: Boolean = false, knockout: Boolean = false) - { - this.alpha = alpha; - this.blurX = blurX; - this.blurY = blurY; - this.color = color; - this.inner = inner; - this.knockout = knockout; - this.quality = quality; - this.strength = strength; - } - - override public function clone(): BitmapFilter { - return new GlowFilter(this.color, this.alpha, this.blurX, this.blurY, this.strength, this.quality, this.inner, this.knockout); - } - } + { + this.alpha = alpha; + this.blurX = blurX; + this.blurY = blurY; + this.color = color; + this.inner = inner; + this.knockout = knockout; + this.quality = quality; + this.strength = strength; + } + + override public function clone(): BitmapFilter { + return new GlowFilter(this.color, this.alpha, this.blurX, this.blurY, this.strength, this.quality, this.inner, this.knockout); + } + } } diff --git a/core/src/avm2/globals/flash/filters/GradientBevelFilter.as b/core/src/avm2/globals/flash/filters/GradientBevelFilter.as index d9539fbb5c2a..e8a2847eba54 100644 --- a/core/src/avm2/globals/flash/filters/GradientBevelFilter.as +++ b/core/src/avm2/globals/flash/filters/GradientBevelFilter.as @@ -1,82 +1,82 @@ package flash.filters { - public final class GradientBevelFilter extends BitmapFilter { - // NOTE if reordering these fields, make sure to use the same order in - // GradientGlowFilter; filter code assumes the slot layouts are identical + public final class GradientBevelFilter extends BitmapFilter { + // NOTE if reordering these fields, make sure to use the same order in + // GradientGlowFilter; filter code assumes the slot layouts are identical - // FIXME these should all be getters/setters to match Flash + // FIXME these should all be getters/setters to match Flash [Ruffle(InternalSlot)] - public var alphas : Array; + public var alphas : Array; [Ruffle(InternalSlot)] - public var angle : Number; + public var angle : Number; [Ruffle(InternalSlot)] - public var blurX : Number; + public var blurX : Number; [Ruffle(InternalSlot)] - public var blurY : Number; + public var blurY : Number; [Ruffle(InternalSlot)] - public var colors : Array; + public var colors : Array; [Ruffle(InternalSlot)] - public var distance : Number; + public var distance : Number; [Ruffle(InternalSlot)] - public var knockout : Boolean; + public var knockout : Boolean; [Ruffle(InternalSlot)] - public var quality : int; + public var quality : int; [Ruffle(InternalSlot)] - public var ratios : Array; + public var ratios : Array; [Ruffle(InternalSlot)] - public var strength : Number; + public var strength : Number; [Ruffle(InternalSlot)] - public var type : String; + public var type : String; - public function GradientBevelFilter( - distance:Number = 4.0, - angle:Number = 45, - colors:Array = null, - alphas:Array = null, - ratios:Array = null, - blurX:Number = 4.0, - blurY:Number = 4.0, - strength:Number = 1, - quality:int = 1, - type:String = "inner", - knockout:Boolean = false - ) { - this.distance = distance; - this.angle = angle; - this.colors = colors; - this.alphas = alphas; - this.ratios = ratios; - this.blurX = blurX; - this.blurY = blurY; - this.strength = strength; - this.quality = quality; - this.type = type; - this.knockout = knockout; - } + public function GradientBevelFilter( + distance:Number = 4.0, + angle:Number = 45, + colors:Array = null, + alphas:Array = null, + ratios:Array = null, + blurX:Number = 4.0, + blurY:Number = 4.0, + strength:Number = 1, + quality:int = 1, + type:String = "inner", + knockout:Boolean = false + ) { + this.distance = distance; + this.angle = angle; + this.colors = colors; + this.alphas = alphas; + this.ratios = ratios; + this.blurX = blurX; + this.blurY = blurY; + this.strength = strength; + this.quality = quality; + this.type = type; + this.knockout = knockout; + } - override public function clone(): BitmapFilter { - return new GradientBevelFilter( - this.distance, - this.angle, - this.colors, - this.alphas, - this.ratios, - this.blurX, - this.blurY, - this.strength, - this.quality, - this.type, - this.knockout - ); - } - } + override public function clone(): BitmapFilter { + return new GradientBevelFilter( + this.distance, + this.angle, + this.colors, + this.alphas, + this.ratios, + this.blurX, + this.blurY, + this.strength, + this.quality, + this.type, + this.knockout + ); + } + } } diff --git a/core/src/avm2/globals/flash/filters/GradientGlowFilter.as b/core/src/avm2/globals/flash/filters/GradientGlowFilter.as index 8eeecc713bda..f42bd63076d7 100644 --- a/core/src/avm2/globals/flash/filters/GradientGlowFilter.as +++ b/core/src/avm2/globals/flash/filters/GradientGlowFilter.as @@ -1,11 +1,12 @@ package flash.filters { - public final class GradientGlowFilter extends BitmapFilter { - // NOTE if reordering these fields, make sure to use the same order in - // GradientBevelFilter; filter code assumes the slot layouts are identical - // (these aren't annotated with [Ruffle(InternalSlot)] because we use the - // slots from GradientBevelFilter to access them) + public final class GradientGlowFilter extends BitmapFilter { + // NOTE if reordering these fields, make sure to use the same order in + // GradientBevelFilter; filter code assumes the slot layouts are identical + // (these aren't annotated with [Ruffle(InternalSlot)] because we use the + // slots from GradientBevelFilter to access them) // FIXME these should all be getters/setters to match Flash + [Ruffle(InternalSlot)] public var alphas : Array; @@ -39,35 +40,35 @@ [Ruffle(InternalSlot)] public var type : String; - public function GradientGlowFilter( - distance:Number = 4.0, - angle:Number = 45, - colors:Array = null, - alphas:Array = null, - ratios:Array = null, - blurX:Number = 4.0, - blurY:Number = 4.0, - strength:Number = 1, - quality:int = 1, - type:String = "inner", - knockout:Boolean = false - ) - { - this.distance = distance; - this.angle = angle; - this.colors = colors; - this.alphas = alphas; - this.ratios = ratios; - this.blurX = blurX; - this.blurY = blurY; - this.strength = strength; - this.quality = quality; - this.type = type; - this.knockout = knockout; - } + public function GradientGlowFilter( + distance:Number = 4.0, + angle:Number = 45, + colors:Array = null, + alphas:Array = null, + ratios:Array = null, + blurX:Number = 4.0, + blurY:Number = 4.0, + strength:Number = 1, + quality:int = 1, + type:String = "inner", + knockout:Boolean = false + ) + { + this.distance = distance; + this.angle = angle; + this.colors = colors; + this.alphas = alphas; + this.ratios = ratios; + this.blurX = blurX; + this.blurY = blurY; + this.strength = strength; + this.quality = quality; + this.type = type; + this.knockout = knockout; + } - override public function clone(): BitmapFilter { - return new GradientGlowFilter(this.distance, this.angle, this.colors, this.alphas, this.ratios, this.blurX, this.blurY, this.strength, this.quality, this.type, this.knockout); - } - } + override public function clone(): BitmapFilter { + return new GradientGlowFilter(this.distance, this.angle, this.colors, this.alphas, this.ratios, this.blurX, this.blurY, this.strength, this.quality, this.type, this.knockout); + } + } }