fixed that masking a filtered object with a clipRect did not work

It worked with stencil masks, but the clipRect-fallback sometimes used the wrong bounds.
Gamua · Oct 11, 2016 · 9e229e7 · 9e229e7
1 parent bf41d75
commit 9e229e7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/starling/src/starling/filters/FilterHelper.as b/starling/src/starling/filters/FilterHelper.as
@@ -20,6 +20,7 @@ package starling.filters
     import starling.textures.SubTexture;
     import starling.textures.Texture;
     import starling.utils.MathUtil;
+    import starling.utils.Pool;
 
     use namespace starling_internal;
 
@@ -45,6 +46,7 @@ package starling.filters
         private var _renderTarget:Texture;
         private var _targetBounds:Rectangle;
         private var _target:DisplayObject;
+        private var _clipRect:Rectangle;
 
         // helpers
         private var sRegion:Rectangle = new Rectangle();
@@ -66,6 +68,9 @@ package starling.filters
         /** Purges the pool. */
         public function dispose():void
         {
+            Pool.putRectangle(_clipRect);
+            _clipRect = null;
+
             purge();
         }
 
@@ -184,9 +189,22 @@ package starling.filters
 
         /** The render target that was active when the filter started processing. */
         public function get renderTarget():Texture { return _renderTarget; }
-        public function set renderTarget(value:Texture):void
+        public function set renderTarget(value:Texture):void { _renderTarget = value; }
+
+        /** The clipping rectangle that was active when the filter started processing. */
+        public function get clipRect():Rectangle { return _clipRect; }
+        public function set clipRect(value:Rectangle):void
         {
-            _renderTarget = value;
+            if (value)
+            {
+                if (_clipRect) _clipRect.copyFrom(value);
+                else _clipRect = Pool.getRectangle(value.x, value.y, value.width, value.height);
+            }
+            else if (_clipRect)
+            {
+                Pool.putRectangle(_clipRect);
+                _clipRect = null;
+            }
         }
 
         /** @inheritDoc */

diff --git a/starling/src/starling/filters/FragmentFilter.as b/starling/src/starling/filters/FragmentFilter.as
@@ -227,6 +227,7 @@ package starling.filters
             _helper.textureScale = Starling.contentScaleFactor * _resolution;
             _helper.projectionMatrix3D = painter.state.projectionMatrix3D;
             _helper.renderTarget = painter.state.renderTarget;
+            _helper.clipRect = painter.state.clipRect;
             _helper.targetBounds = bounds;
             _helper.target = _target;
             _helper.start(numPasses, drawLastPassToBackBuffer);
@@ -242,6 +243,7 @@ package starling.filters
             painter.cacheEnabled = false; // -> what follows should not be cached
             painter.pushState();
             painter.state.alpha = 1.0;
+            painter.state.clipRect = null;
             painter.state.renderTarget = input;
             painter.state.setProjectionMatrix(bounds.x, bounds.y,
                 input.root.width, input.root.height,
@@ -251,7 +253,6 @@ package starling.filters
 
             painter.finishMeshBatch();
             painter.state.setModelviewMatricesToIdentity();
-            painter.state.clipRect = null;
 
             output = process(painter, _helper, input); // -> feed 'input' to actual filter code
 
@@ -318,6 +319,10 @@ package starling.filters
                 renderTarget = (helper as FilterHelper).renderTarget;
                 projectionMatrix = (helper as FilterHelper).projectionMatrix3D;
                 effect.textureSmoothing = _textureSmoothing;
+
+                // restore clipRect (projection matrix influences clipRect!)
+                painter.state.clipRect = (helper as FilterHelper).clipRect;
+                painter.state.projectionMatrix3D.copyFrom(projectionMatrix);
             }
 
             painter.state.renderTarget = renderTarget;