migration to starling 2.0

Fovea · Mar 2, 2016 · a5a93ad · a5a93ad
1 parent 0ed9c07
commit a5a93ad
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/src/starling/display/Disk.as b/src/starling/display/Disk.as
@@ -12,9 +12,9 @@ package starling.display
     /** A Disk represents a circle filled with a uniform color. */
     public class Disk extends Ring
     {
-        public function Disk(radius:Number, color:uint=0xffffff, premultipliedAlpha:Boolean=true)
+        public function Disk(radius:Number, color:uint=0xffffff)
         {
-            super(0, radius, color, premultipliedAlpha);
+            super(0, radius, color);
         }
     }
 }
diff --git a/src/starling/display/Line.as b/src/starling/display/Line.as
@@ -21,7 +21,7 @@ package starling.display
      *  @see Poly4
      */
     public class Line extends Poly4 {
-        public function Line(from:Point, to:Point, thickness:Number, color:uint, premultipliedAlpha:Boolean = true) {
+        public function Line(from:Point, to:Point, thickness:Number, color:uint) {
             var dx:Number = to.x - from.x;
             var dy:Number = to.y - from.y;
             var l:Number = Math.sqrt(dx*dx + dy*dy);
@@ -45,7 +45,7 @@ package starling.display
             p4.offset(-v.x * halfT, -v.y * halfT);
             p4.offset(u.x * halfT, u.y * halfT);
 
-            super(p1, p2, p3, p4, color, premultipliedAlpha);
+            super(p1, p2, p3, p4, color);
         }
     }
 }
diff --git a/src/starling/display/Poly4.as b/src/starling/display/Poly4.as
@@ -15,8 +15,6 @@ package starling.display
     import flash.geom.Rectangle;
     import flash.geom.Vector3D;
 
-    import starling.core.RenderSupport;
-    import starling.utils.VertexData;
     import starling.display.Quad;
 
     /** A Poly4 represents an abitrary quad with a uniform color or a color gradient.
@@ -39,18 +37,17 @@ package starling.display
     {
         private var _lowerRight:Point;
 
-        public function Poly4(p1:Point, p2:Point, p3:Point, p4:Point, color:uint=0xffffff, premultipliedAlpha:Boolean=true)
+        public function Poly4(p1:Point, p2:Point, p3:Point, p4:Point, color:uint=0xffffff)
         {
             var xmin:Number = Math.min(p1.x,p2.x,p3.x,p4.x);
             var ymin:Number = Math.min(p1.y,p2.y,p3.y,p4.y);
             var xmax:Number = Math.max(p1.x,p2.x,p3.x,p4.x);
             var ymax:Number = Math.max(p1.y,p2.y,p3.y,p4.y);
-            super(xmax-xmin,ymax-ymin,color,premultipliedAlpha);
-            mVertexData.setPosition(0, p1.x - xmin, p1.y - ymin);
-            mVertexData.setPosition(1, p2.x - xmin, p2.y - ymin);
-            mVertexData.setPosition(2, p3.x - xmin, p3.y - ymin);
-            mVertexData.setPosition(3, p4.x - xmin, p4.y - ymin);
-            onVertexDataChanged();
+            super(xmax-xmin,ymax-ymin,color);
+            vertexData.setPoint(0, 'position', p1.x - xmin, p1.y - ymin);
+            vertexData.setPoint(1, 'position', p2.x - xmin, p2.y - ymin);
+            vertexData.setPoint(2, 'position', p3.x - xmin, p3.y - ymin);
+            vertexData.setPoint(3, 'position', p4.x - xmin, p4.y - ymin);
             x = xmin;
             y = ymin;
             _lowerRight = new Point(xmax - xmin, ymax - ymin);

diff --git a/src/starling/display/Ring.as b/src/starling/display/Ring.as
@@ -15,8 +15,6 @@ package starling.display
     import flash.geom.Rectangle;
     import flash.geom.Vector3D;
 
-    import starling.core.RenderSupport;
-    import starling.utils.VertexData;
     import starling.display.Sprite;
     import starling.display.Quad;
 
@@ -31,7 +29,7 @@ package starling.display
         public function get innerRadius():Number { return _innerRadius; }
         public function get outerRadius():Number { return _outerRadius; }
 
-        public function Ring(innerRadius:Number, outerRadius:Number, color:uint=0xffffff, premultipliedAlpha:Boolean=true)
+        public function Ring(innerRadius:Number, outerRadius:Number, color:uint=0xffffff)
         {
             _polygons = new Vector.<Poly4>;
             _innerRadius = innerRadius;
@@ -58,7 +56,8 @@ package starling.display
                 p0.y = outerRadius + sa0 * outerRadius;
                 p1.x = outerRadius + ca1 * outerRadius;
                 p1.y = outerRadius + sa1 * outerRadius;
-                var q:Poly4 = new Poly4(c0, p0, c1, p1, color, premultipliedAlpha);
+                var q:Poly4 = new Poly4(c0, p0, c1, p1, color);
+                    q.pixelSnapping = false;
                 _polygons.push(q);
                 addChild(q);
             }
@@ -70,9 +69,9 @@ package starling.display
             }
         }
 
-        public override function hitTest(localPoint:Point, forTouch:Boolean = false):DisplayObject {
+        public override function hitTest(localPoint:Point):DisplayObject {
             // on a touch test, invisible or untouchable objects cause the test to fail
-            if (forTouch && (!visible || !touchable)) return null;
+            if (!visible || !touchable) return null;
             var vx:Number = localPoint.x - _outerRadius;
             var vy:Number = localPoint.y - _outerRadius;
             var l2:Number = vx*vx + vy*vy;