Merge pull request openfl#367 from leshido/master

FIX: HTML5 canvas masks not working (closes openfl#366)

openfl/_internal/renderer/RenderSession.hx

@@ -40,7 +40,7 @@ class RenderSession {
 	public var offset:Point;
 
 	public var shaderManager:ShaderManager;
-	public var maskManager:MaskManager;
+	public var maskManager:Dynamic;
 	public var filterManager:FilterManager;
 	public var blendModeManager:BlendModeManager;
 	public var spriteBatch:SpriteBatch;

openfl/_internal/renderer/canvas/CanvasBitmap.hx

@@ -22,7 +22,7 @@ class CanvasBitmap {
 
 			if (bitmap.__mask != null) {
 
-				//renderSession.maskManager.pushMask (__mask);
+				renderSession.maskManager.pushMask (bitmap.__mask);
 
 			}
 
@@ -70,7 +70,7 @@ class CanvasBitmap {
 
 			if (bitmap.__mask != null) {
 
-				//renderSession.maskManager.popMask ();
+				renderSession.maskManager.popMask ();
 
 			}
 

openfl/_internal/renderer/canvas/CanvasRenderer.hx

@@ -25,6 +25,7 @@ class CanvasRenderer extends AbstractRenderer {
 		renderSession.context = context;
 		renderSession.roundPixels = true;
 		renderSession.renderer = this;
+		renderSession.maskManager = new MaskManager(renderSession);
 
 	}
 

openfl/_internal/renderer/canvas/MaskManager.hx

@@ -0,0 +1,62 @@
+package openfl._internal.renderer.canvas;
+
+import openfl.display.*;
+import openfl.geom.*;
+
+class MaskManager {
+
+
+	private var renderSession:RenderSession;
+
+
+	public function new (renderSession:RenderSession) {
+
+		this.renderSession = renderSession;
+
+	}
+
+
+	public function pushMask (mask:IBitmapDrawable):Void {
+
+		var context = renderSession.context;
+
+		context.save ();
+
+		//var cacheAlpha = mask.__worldAlpha;
+		var transform = mask.__worldTransform;
+		if (transform == null) transform = new Matrix ();
+
+		context.setTransform (transform.a, transform.c, transform.b, transform.d, transform.tx, transform.ty);
+
+		context.beginPath ();
+		mask.__renderMask (renderSession);
+
+		context.clip ();
+
+		//mask.worldAlpha = cacheAlpha;
+
+	}
+
+
+	public function pushRect (rect:Rectangle, transform:Matrix):Void {
+
+		var context = renderSession.context;
+		context.save ();
+
+		context.setTransform (transform.a, transform.c, transform.b, transform.d, transform.tx, transform.ty);
+
+		context.beginPath ();
+		context.rect (rect.x, rect.y, rect.width, rect.height);
+		context.clip ();
+
+	}
+
+
+	public function popMask ():Void {
+
+		renderSession.context.restore ();
+
+	}
+
+
+}