You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2018/09/03 09:16:33 UTC
[royale-asjs] 11/13: Now that we're using Merge we don't need to
play with sources in SuperImposeFilter
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 132d50db89ea502c6561839f9accb7760de540b0
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Mon Jul 30 14:58:20 2018 +0300
Now that we're using Merge we don't need to play with sources in SuperImposeFilter
---
.../royale/org/apache/royale/svg/DropShadowFilter.as | 17 ++++-------------
.../royale/org/apache/royale/svg/SuperimposeFilter.as | 4 ----
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/DropShadowFilter.as b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/DropShadowFilter.as
index c89859b..d841c08 100644
--- a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/DropShadowFilter.as
+++ b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/DropShadowFilter.as
@@ -56,16 +56,7 @@ package org.apache.royale.svg
public function build():void
{
children = [];
- var knockoutResult:String;
- if (!inset && knockout)
- {
- knockoutResult = "knockout_res1";
-// var fullAlpha:ColorMatrixFilterElement = new ColorMatrixFilterElement();
-// fullAlpha.opacity = 1000000;
-// fullAlpha.result = knockoutResult;
-// fullAlpha.in = "SourceAlpha";
-// children.push(fullAlpha);
- }
+ var doKnockout:Boolean = !inset && knockout;
if (inset)
{
var insetFilterElement:FilterElement = new InvertFilterElement();
@@ -78,7 +69,7 @@ package org.apache.royale.svg
children.push(offset);
offset.dx = dx;
offset.dy = dy;
- if (knockoutResult)
+ if (doKnockout)
{
offset.in = source ? source : "SourceGraphic";
}
@@ -90,11 +81,11 @@ package org.apache.royale.svg
{
blur.in = source ? source : "SourceGraphic";
}
- if (!inset && knockout)
+ if (doKnockout)
{
var outsetComposite:CompositeFilterElement = new CompositeFilterElement();
children.push(outsetComposite);
- outsetComposite.in2 = knockoutResult;
+ outsetComposite.in2 = "SourceAlpha";
outsetComposite.operator = "out";
}
var colorMatrix:ColorMatrixFilterElement = new ColorMatrixFilterElement();
diff --git a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/SuperimposeFilter.as b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/SuperimposeFilter.as
index 9c8358a..3b92e49 100644
--- a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/SuperimposeFilter.as
+++ b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/SuperimposeFilter.as
@@ -44,10 +44,6 @@ package org.apache.royale.svg
var resultName:String = "chainableResult" + i;
chainable.result = resultName;
results.push(resultName);
- if (i != 0)
- {
- chainable.source = "chainableResult" + (i - 1);
- }
chainable.build();
addArray(newChildren, chainable.children);
}