Changeset 3460 for lang/legacy-actionscript

Timestamp:

12/23/07 03:03:47 (12 months ago)

Author:

gyuque

Message:

lang/legacy-actionscript/as2draw: inlined functions

Location:

lang/legacy-actionscript/as2draw

Files:

• AS2Draw.swf (modified) (previous)
• Drawable.as (modified) (1 diff)
• PixelBuffer.as (modified) (12 diffs)

lang/legacy-actionscript/as2draw/Drawable.as

@@ -103 +103 @@
                         mPixBuf.setOut(g);
 */
-                        mPixBuf.drawLine(
-                                x1 +dx, y1 +dy,
-                                x2 +dx, y2 +dy, 0, color);
-                        
                         g.stackData.log.push(new LineData(x1+dx, y1+dy, x2+dx, y2+dy, color));
+                        drawPixBufferLine(x1+dx, y1+dy, x2+dx, y2+dy, color);
                         drawNativeLine(g, x1+dx, y1+dy, x2+dx, y2+dy, color);
                 }
+        }
+
+        public function drawPixBufferLine(x1:Number, y1:Number, x2:Number, y2:Number, color:Number)
+        {
+                mPixBuf.drawLine(
+                        x1, y1,
+                        x2, y2, 0, color);
         }
         

lang/legacy-actionscript/as2draw/PixelBuffer.as

@@ -36 +36 @@
                 mOut = aMC;
         }
-
+/*
         public function setPixel(x:Number, y:Number, k:Number)
         {
                 if (x<0 || x>=mWidth || y<0) return;
                 mBuf[ (y<<mStrideShift) + x ] = k;
-        }
-
+                //var i:Number = (y<<mStrideShift) + x;
+        }
+*/
         private var mSX;
         private var mSY;
         private var mDir;
         private var mCount;
-        
+        /*
         public function begin(aX:Number, aY:Number, aDir:Number)
         {
@@ -55 +56 @@
                 mCount = 0;
         }
-
-        public function advance()
-        {
-                mCount++;
-        }
-
-        public function commit(aData:Number, aOutColor:Number, aUseDebugRendering:Boolean)
+        */
+        public function commit(aData:Number, aOutColor:Number/*, aUseDebugRendering:Boolean*/)
         {
                 if (mCount == 0)
@@ -68 +64 @@
                 var dx:Number;
                 var dy:Number;
-
+/*
                 if (aUseDebugRendering)
                         mOut.lineStyle(1, aOutColor);
-                
+*/      
                 switch(mDir) {
                 case 0:
                         dx = 0; dy = -1;
+/*
                         if (aUseDebugRendering)
                         {
@@ -80 +77 @@
                                 mOut.lineTo(mSX, mSY);
                         }
+*/                      
                         break;
                 case 1:
                         dx = 1; dy = 0;
+/*
                         if (aUseDebugRendering)
                         {
@@ -88 +87 @@
                                 mOut.lineTo(mSX+mCount, mSY);
                         }
+*/                      
                         break;
                 case 2:
                         dx = 0; dy = 1;
+/*
                         if (aUseDebugRendering)
                         {
@@ -96 +97 @@
                                 mOut.lineTo(mSX, mSY+mCount);
                         }
+*/                      
                         break;
                 case 3:
                         dx = -1; dy = 0;
-                        
+/*
                         if (aUseDebugRendering)
                         {
@@ -105 +107 @@
                                 mOut.lineTo(mSX       , mSY);
                         }
+*/                      
                         break;
                 }
@@ -110 +113 @@
                 for (var i:Number = 0;i < mCount;i++)
                 {
-                        setPixel(mSX, mSY, aData);
+                        //setPixel(mSX, mSY, aData);
+                        if (mSX>=0 && mSX<mWidth && mSY>=0);
+                                mBuf[ (mSY<<mStrideShift) + mSX ] = aData;
+                        
                         mSX += dx;
                         mSY += dy;
@@ -146 +152 @@
                         x = x1;
                         y = y1;
-                        begin(x, y, 1);
+
+                        // begin(x, y, 1);
+                        mSX  = x;
+                        mSY  = y;
+                        mDir = 1;
+                        mCount = 0;
+                        
                         for (; x <= x2; x++)
                         {
-                                advance();
+                                mCount++;
                                 
                                 E += dy;
@@ -156 +168 @@
                                         y += step;
                                         commit(c, outc, aUseDebugRendering);
-                                        begin(x+1, y, 1);
+                                        
+                                        //begin(x+1, y, 1);
+                                        mSX  = x+1;
+                                        mSY  = y;
+                                        mDir = 1;
+                                        mCount = 0;
+                                        
                                 }                                       
                         }
@@ -174 +192 @@
                         x = x1;
                         y = y1;
-                        begin(x, y, 2);
+                        
+                        //begin(x, y, 2);
+                        mSX  = x;
+                        mSY  = y;
+                        mDir = 2;
+                        mCount = 0;
+                        
                         for (; y <= y2; y++)
                         {
-                                advance();
+                                mCount++;
                                 
                                 E += dx;
@@ -185 +209 @@
                                         x += step;
                                         commit(c, outc, aUseDebugRendering);
-                                        begin(x, y+1, 2);
+                                        //begin(x, y+1, 2);
+                                        mSX  = x;
+                                        mSY  = y+1;
+                                        mDir = 2;
+                                        mCount = 0;
+                                        
                                 }
                         }