Merge pull request #58 from askmeaboutlo0m/master

Use `openfl` instead of `flash` packages
openfl · Mar 3, 2017 · c79edc2 · c79edc2
2 parents 6e266fe + c9f2f53
commit c79edc2
Show file tree

Hide file tree

Showing 19 changed files with 131 additions and 105 deletions.
diff --git a/format/SVG.hx b/format/SVG.hx
@@ -1,9 +1,9 @@
 package format;
 
 
-import flash.display.Graphics;
-import flash.geom.Matrix;
-import flash.geom.Rectangle;
+import openfl.display.Graphics;
+import openfl.geom.Matrix;
+import openfl.geom.Rectangle;
 import format.svg.SVGData;
 import format.svg.SVGRenderer;
 

diff --git a/format/gfx/Gfx.hx b/format/gfx/Gfx.hx
@@ -1,14 +1,14 @@
 package format.gfx;
 
-import flash.display.GradientType;
-import flash.display.SpreadMethod;
-import flash.display.InterpolationMethod;
-import flash.display.CapsStyle;
-import flash.display.JointStyle;
-import flash.display.LineScaleMode;
+import openfl.display.GradientType;
+import openfl.display.SpreadMethod;
+import openfl.display.InterpolationMethod;
+import openfl.display.CapsStyle;
+import openfl.display.JointStyle;
+import openfl.display.LineScaleMode;
 import format.svg.Text;
 
-import flash.geom.Matrix;
+import openfl.geom.Matrix;
 
 class Gfx
 {

diff --git a/format/gfx/Gfx2Haxe.hx b/format/gfx/Gfx2Haxe.hx
@@ -1,12 +1,12 @@
 package format.gfx;
 
-import flash.display.GradientType;
-import flash.display.SpreadMethod;
-import flash.display.InterpolationMethod;
-import flash.display.CapsStyle;
-import flash.display.JointStyle;
-import flash.display.LineScaleMode;
-import flash.geom.Matrix;
+import openfl.display.GradientType;
+import openfl.display.SpreadMethod;
+import openfl.display.InterpolationMethod;
+import openfl.display.CapsStyle;
+import openfl.display.JointStyle;
+import openfl.display.LineScaleMode;
+import openfl.geom.Matrix;
 
 
 class Gfx2Haxe extends Gfx

diff --git a/format/gfx/GfxBytes.hx b/format/gfx/GfxBytes.hx
@@ -1,14 +1,14 @@
 package format.gfx;
 
-import flash.display.GradientType;
-import flash.display.SpreadMethod;
-import flash.display.InterpolationMethod;
-import flash.display.CapsStyle;
-import flash.display.JointStyle;
-import flash.display.LineScaleMode;
-import flash.geom.Matrix;
-
-import flash.utils.ByteArray;
+import openfl.display.GradientType;
+import openfl.display.SpreadMethod;
+import openfl.display.InterpolationMethod;
+import openfl.display.CapsStyle;
+import openfl.display.JointStyle;
+import openfl.display.LineScaleMode;
+import openfl.geom.Matrix;
+
+import openfl.utils.ByteArray;
 
 import haxe.io.Bytes;
 

diff --git a/format/gfx/GfxExtent.hx b/format/gfx/GfxExtent.hx
@@ -1,7 +1,7 @@
 package format.gfx;
 
-import flash.geom.Matrix;
-import flash.geom.Rectangle;
+import openfl.geom.Matrix;
+import openfl.geom.Rectangle;
 
 class GfxExtent extends Gfx
 {

diff --git a/format/gfx/GfxGraphics.hx b/format/gfx/GfxGraphics.hx
@@ -1,14 +1,14 @@
 package format.gfx;
 
-import flash.display.GradientType;
-import flash.display.SpreadMethod;
-import flash.display.InterpolationMethod;
-import flash.display.CapsStyle;
-import flash.display.JointStyle;
-import flash.display.LineScaleMode;
-import flash.display.Graphics;
-
-import flash.geom.Matrix;
+import openfl.display.GradientType;
+import openfl.display.SpreadMethod;
+import openfl.display.InterpolationMethod;
+import openfl.display.CapsStyle;
+import openfl.display.JointStyle;
+import openfl.display.LineScaleMode;
+import openfl.display.Graphics;
+
+import openfl.geom.Matrix;
 
 class GfxGraphics extends Gfx
 {

diff --git a/format/gfx/Gradient.hx b/format/gfx/Gradient.hx
@@ -1,12 +1,12 @@
 package format.gfx;
 
-import flash.geom.Matrix;
-import flash.display.GradientType;
-import flash.display.SpreadMethod;
-import flash.display.InterpolationMethod;
-import flash.display.CapsStyle;
-import flash.display.JointStyle;
-import flash.display.LineScaleMode;
+import openfl.geom.Matrix;
+import openfl.display.GradientType;
+import openfl.display.SpreadMethod;
+import openfl.display.InterpolationMethod;
+import openfl.display.CapsStyle;
+import openfl.display.JointStyle;
+import openfl.display.LineScaleMode;
 
 class Gradient
 {

diff --git a/format/gfx/LineStyle.hx b/format/gfx/LineStyle.hx
@@ -1,8 +1,8 @@
 package format.gfx;
 
-import flash.display.LineScaleMode;
-import flash.display.CapsStyle;
-import flash.display.JointStyle;
+import openfl.display.LineScaleMode;
+import openfl.display.CapsStyle;
+import openfl.display.JointStyle;
 
 class LineStyle
 {

diff --git a/format/svg/BitmapDataManager.hx b/format/svg/BitmapDataManager.hx
@@ -3,10 +3,10 @@ package format.svg;
 //import gm2d.reso.Resources;
 import format.svg.SVGRenderer;
 
-import flash.geom.Matrix;
-import flash.display.Shape;
-import flash.display.Bitmap;
-import flash.display.BitmapData;
+import openfl.geom.Matrix;
+import openfl.display.Shape;
+import openfl.display.Bitmap;
+import openfl.display.BitmapData;
 
 
 class BitmapDataManager
@@ -37,9 +37,9 @@ class BitmapDataManager
       var h = Std.int(svg.height*inScale +  0.99);
       var bmp = new BitmapData(w,h,true,0x00);
       var q = gm2d.Lib.current.stage.quality;
-      flash.Lib.current.stage.quality = flash.display.StageQuality.BEST;
+      openfl.Lib.current.stage.quality = flash.display.StageQuality.BEST;
       bmp.draw(shape,matrix);
-      flash.Lib.current.stage.quality = q;
+      openfl.Lib.current.stage.quality = q;
 
       if (inCache)
          bitmaps.set(key,bmp);

diff --git a/format/svg/Grad.hx b/format/svg/Grad.hx
@@ -1,14 +1,14 @@
 package format.svg;
 
-import flash.geom.Matrix;
-import flash.geom.Rectangle;
+import openfl.geom.Matrix;
+import openfl.geom.Rectangle;
 
-import flash.display.GradientType;
-import flash.display.SpreadMethod;
-import flash.display.InterpolationMethod;
-import flash.display.CapsStyle;
-import flash.display.JointStyle;
-import flash.display.LineScaleMode;
+import openfl.display.GradientType;
+import openfl.display.SpreadMethod;
+import openfl.display.InterpolationMethod;
+import openfl.display.CapsStyle;
+import openfl.display.JointStyle;
+import openfl.display.LineScaleMode;
 
 class Grad extends /*gm2d.gfx.Gradient*/format.gfx.Gradient
 {

diff --git a/format/svg/Gradient.hx b/format/svg/Gradient.hx
@@ -1,12 +1,12 @@
 package format.svg;
 
-import flash.geom.Matrix;
-import flash.display.GradientType;
-import flash.display.SpreadMethod;
-import flash.display.InterpolationMethod;
-import flash.display.CapsStyle;
-import flash.display.JointStyle;
-import flash.display.LineScaleMode;
+import openfl.geom.Matrix;
+import openfl.display.GradientType;
+import openfl.display.SpreadMethod;
+import openfl.display.InterpolationMethod;
+import openfl.display.CapsStyle;
+import openfl.display.JointStyle;
+import openfl.display.LineScaleMode;
 
 class Gradient
 {

diff --git a/format/svg/Path.hx b/format/svg/Path.hx
@@ -1,12 +1,12 @@
 package format.svg;
 
-import flash.geom.Matrix;
-import flash.display.GradientType;
-import flash.display.SpreadMethod;
-import flash.display.InterpolationMethod;
-import flash.display.CapsStyle;
-import flash.display.JointStyle;
-import flash.display.LineScaleMode;
+import openfl.geom.Matrix;
+import openfl.display.GradientType;
+import openfl.display.SpreadMethod;
+import openfl.display.InterpolationMethod;
+import openfl.display.CapsStyle;
+import openfl.display.JointStyle;
+import openfl.display.LineScaleMode;
 
 typedef PathSegments = Array<PathSegment>;
 

diff --git a/format/svg/PathSegment.hx b/format/svg/PathSegment.hx
@@ -1,8 +1,8 @@
 package format.svg;
-import flash.geom.Rectangle;
-import flash.geom.Matrix;
-import flash.geom.Point;
-import flash.display.Graphics;
+import openfl.geom.Rectangle;
+import openfl.geom.Matrix;
+import openfl.geom.Point;
+import openfl.display.Graphics;
 import format.gfx.Gfx;
 
 class PathSegment

diff --git a/format/svg/RenderContext.hx b/format/svg/RenderContext.hx
@@ -1,7 +1,7 @@
 package format.svg;
 
-import flash.geom.Matrix;
-import flash.geom.Rectangle;
+import openfl.geom.Matrix;
+import openfl.geom.Rectangle;
 
 class RenderContext
 {

diff --git a/format/svg/SVGData.hx b/format/svg/SVGData.hx
@@ -1,12 +1,12 @@
 package format.svg;
 
-import flash.geom.Matrix;
-import flash.geom.Rectangle;
-import flash.display.GradientType;
-import flash.display.Graphics;
-import flash.display.SpreadMethod;
-import flash.display.CapsStyle;
-import flash.display.JointStyle;
+import openfl.geom.Matrix;
+import openfl.geom.Rectangle;
+import openfl.display.GradientType;
+import openfl.display.Graphics;
+import openfl.display.SpreadMethod;
+import openfl.display.CapsStyle;
+import openfl.display.JointStyle;
 import format.svg.Grad;
 import format.svg.Group;
 import format.svg.FillType;

diff --git a/format/svg/SVGRenderer.hx b/format/svg/SVGRenderer.hx
@@ -3,25 +3,25 @@ package format.svg;
 import format.svg.PathParser;
 import format.svg.PathSegment;
 
-import flash.geom.Matrix;
-import flash.geom.Rectangle;
-import flash.display.Graphics;
-
-import flash.display.Shape;
-import flash.display.Sprite;
-import flash.display.DisplayObject;
-import flash.display.GradientType;
-import flash.display.SpreadMethod;
-import flash.display.InterpolationMethod;
-import flash.display.CapsStyle;
-import flash.display.JointStyle;
-import flash.display.LineScaleMode;
+import openfl.geom.Matrix;
+import openfl.geom.Rectangle;
+import openfl.display.Graphics;
+
+import openfl.display.Shape;
+import openfl.display.Sprite;
+import openfl.display.DisplayObject;
+import openfl.display.GradientType;
+import openfl.display.SpreadMethod;
+import openfl.display.InterpolationMethod;
+import openfl.display.CapsStyle;
+import openfl.display.JointStyle;
+import openfl.display.LineScaleMode;
 
 import format.svg.Grad;
 import format.svg.Group;
 import format.svg.FillType;
 import format.gfx.Gfx;
-import flash.geom.Rectangle;
+import openfl.geom.Rectangle;
 
 
 typedef GroupPath = Array<String>;
@@ -318,9 +318,9 @@ class SVGRenderer
        var w = Std.int(Math.ceil( inRect==null ? width : inRect.width*inScale ));
        var h = Std.int(Math.ceil( inRect==null ? width : inRect.height*inScale ));
 
-       var bmp = new flash.display.BitmapData(w,h,true,#if (neko && !haxe3) { a: 0x00, rgb: 0x000000 } #else 0x00000000 #end);
+       var bmp = new openfl.display.BitmapData(w,h,true,#if (neko && !haxe3) { a: 0x00, rgb: 0x000000 } #else 0x00000000 #end);
 
-       var shape = new flash.display.Shape();
+       var shape = new openfl.display.Shape();
        mGfx = new format.gfx.GfxGraphics(shape.graphics);
 
        mGroupPath = [];

diff --git a/format/svg/Text.hx b/format/svg/Text.hx
@@ -1,6 +1,6 @@
 package format.svg;
 
-import flash.geom.Matrix;
+import openfl.geom.Matrix;
 
 
 class Text

diff --git a/test/MacroTest.hx b/test/MacroTest.hx
@@ -0,0 +1,24 @@
+package;
+
+import massive.munit.Assert;
+
+import format.SVG;
+
+/**
+* Tests that using SVGs inside macros actually compiles. If the `flash` package
+* is used instead of the `openfl` package.
+*/
+class MacroTest
+{
+	macro static function makeSvg()
+	{
+		// This macro will fail if the `flash` package is used.
+		return macro new SVG("<svg></svg>");
+	}
+
+	@Test
+	public function compilesInMacro()
+	{
+		Assert.isNotNull(makeSvg());
+	}
+}
diff --git a/test/TestSuite.hx b/test/TestSuite.hx
@@ -1,6 +1,7 @@
 import massive.munit.TestSuite;
 
 import SvgGenerationTest;
+import MacroTest;
 
 /**
  * Auto generated Test Suite for MassiveUnit.
@@ -15,5 +16,6 @@ class TestSuite extends massive.munit.TestSuite
 		super();
 
 		add(SvgGenerationTest);
+		add(MacroTest);
 	}
 }