Changeset 3382

Timestamp:

12/21/07 03:17:06 (13 months ago)

Author:

gyuque

Message:

lang/legacy-actionscript/as2draw: implemented fixing bottom layer

Location:

lang/legacy-actionscript/as2draw

Files:

• AS2Draw.as (modified) (2 diffs)
• AS2Draw.swf (modified) (previous)
• Drawable.as (modified) (8 diffs)
• MovieClipStack.as (modified) (2 diffs)
• PixelBuffer.as (modified) (1 diff)

lang/legacy-actionscript/as2draw/AS2Draw.as

@@ -20 +20 @@
         {
                 var _this = this;
-                
+                /*
                 {
                         var closure = function(b){_this.pushedPenButton(b);};
@@ -38 +38 @@
                         pushedPenButton(p1);
                 }
-                
+                */
                 tp.appendBlank(8);
                 

lang/legacy-actionscript/as2draw/Drawable.as

@@ -1 +1 @@
 class Drawable
 {
+        public static var UNDO_LIMIT = 3;
+        
         private var mBGColor:Number;
         private var mMC:MovieClip;
@@ -14 +16 @@
         {
                 mCurrentPen = new Pen();
-                mDragData = {dragging: false, prevX: 0, prevY: 0};
+                mDragData = {dragging: false, prevX: 0, prevY: 0, count: 0, startX: 0, startY: 0, startLayer: null};
                 mMC = aContainer.createEmptyMovieClip("drawable_mc", 1);
                 mMC._quality = "LOW";
@@ -47 +49 @@
         {
                 mDragData.dragging = true;
-                mDragData.prevX = mMC._xmouse;
-                mDragData.prevY = mMC._ymouse;
+                mDragData.count = 0;
+                mDragData.prevX = Math.floor(mMC._xmouse);
+                mDragData.prevY = Math.floor(mMC._ymouse);
                 
-                renderLine(mMC._xmouse, mMC._ymouse, mMC._xmouse, mMC._ymouse);
+                mDragData.startX = mDragData.prevX;
+                mDragData.startY = mDragData.prevY;
+                
+                renderLine(mDragData.prevX, mDragData.prevY, mDragData.prevX, mDragData.prevY);
+                mDragData.startLayer = mCurrentDrawingMC;
+        
         }
 
@@ -56 +64 @@
         {
                 mDragData.dragging = false;
+                /*if (mDragData.count > 0)
+                        smooth(mMC._xmouse, mMC._ymouse);*/
                 commit();
         }
@@ -70 +80 @@
         private function renderLine(x1:Number, y1:Number, x2:Number, y2:Number)
         {
+                var color:Number = mCurrentPen.color;
                 var g:MovieClip;
                 
@@ -89 +100 @@
                                 dy = ofs[(i<<1)+1];
                         }
+/*                      
+                        mPixBuf.setOut(g);
+*/
                         mPixBuf.drawLine(
                                 x1 +dx, y1 +dy,
-                                x2 +dx, y2 +dy, 0, mCurrentPen.color);
-
-                        g.lineStyle(0, mCurrentPen.color);
-                        g.moveTo(x1+dx, y1+dy);
-                        g.lineTo(x2+dx, y2+dy);
-                        g.lineTo(x2+dx, y2+dy+1);
+                                x2 +dx, y2 +dy, 0, color);
+                        
+                        g.stackData.log.push(new LineData(x1+dx, y1+dy, x2+dx, y2+dy, color));
+                        drawNativeLine(g, x1+dx, y1+dy, x2+dx, y2+dy, color);
                 }
+        }
+        
+        public function drawNativeLine(g:MovieClip, x1:Number, y1:Number, x2:Number, y2:Number, color:Number)
+        {
+                var DX:Number = Math.abs(x2 - x1);
+                var DY:Number = Math.abs(y2 - y1);
+                
+                g.lineStyle(0, color);
+                g.moveTo(x1, y1);
+                g.lineTo(x2, y2);
+                
+                if (!(DX > DY && x1 < x2 && y1 < y2))
+                        g.lineTo(x2+1, y2);
         }
 
@@ -104 +129 @@
                 if (mDragData.dragging)
                 {
-                        renderLine(mDragData.prevX, mDragData.prevY, mMC._xmouse, mMC._ymouse);
+                        /*if (++mDragData.count == 5)
+                        {
+                                smooth(mMC._xmouse, mMC._ymouse);
+                                mDragData.count = 0;
+                        }
+                        else*/
+                        {
+                                var x:Number = Math.floor(mMC._xmouse);
+                                var y:Number = Math.floor(mMC._ymouse);
+                                renderLine(mDragData.prevX, mDragData.prevY, x, y);
                         
-                        mDragData.prevX = mMC._xmouse;
-                        mDragData.prevY = mMC._ymouse;
+                                mDragData.prevX = x;
+                                mDragData.prevY = y;
+                        }
                 }
+        }
+        
+        public function smooth(x:Number, y:Number)
+        {
+                x = Math.floor(x);
+                y = Math.floor(y);
+                
+                if (mDragData.startLayer == mCurrentDrawingMC)
+                        mCurrentDrawingMC.clear();
+                else
+                        mMStack.pop();
+                
+                mCurrentDrawingMC = mDragData.startLayer;
+                renderLine(mDragData.startX, mDragData.startY, x, y);
+                mCurrentDrawingMC = null;
+                
+                mDragData.startX = x;
+                mDragData.startY = y;
+                mDragData.prevX = x;
+                mDragData.prevY = y;
+
         }
 
@@ -120 +176 @@
         private function commit()
         {
+                if (mMStack.size() > UNDO_LIMIT)
+                {
+                        mMStack.fixBottom(mMC, this);
+                }
+                
                 mCurrentDrawingMC = null;
         }

lang/legacy-actionscript/as2draw/MovieClipStack.as

@@ -11 +11 @@
         }
         
+        public function size():Number
+        {
+                return mStack.length;
+        }
+        
         public function pushNew():MovieClip
         {
                 var mc:MovieClip = mParentMC.createEmptyMovieClip("mcstackitem-" + (mNextName++), mParentMC.getNextHighestDepth());
+                mc.stackData = {log:[]};
                 mStack.push(mc);
                 return mc;
@@ -28 +34 @@
                 return true;
         }
+        
+        public function fixBottom(g:MovieClip, renderer):Boolean
+        {
+                if (mStack.length < 1)
+                        return false;
+                
+                var bottomMC:MovieClip = MovieClip(mStack.shift());
+                
+                var arr = bottomMC.stackData.log;
+                var l:Number = arr.length;
+                
+                for (var i:Number = 0;i < l;i++)
+                {
+                        var ln = arr[i];
+                        renderer.drawNativeLine(g, ln.x1, ln.y1, ln.x2, ln.y2, ln.color);
+                }
+                
+                bottomMC.removeMovieClip();
+
+                return true;
+        }
 }

lang/legacy-actionscript/as2draw/PixelBuffer.as

@@ -31 +31 @@
                 mStride = 1 << i;
         }
+        
+        public function setOut(aMC:MovieClip):Void
+        {
+                mOut = aMC;
+        }
 
         public function setPixel(x:Number, y:Number, k:Number)
         {
                 if (x<0 || x>=mWidth || y<0) return;
-                //mBuf[ (y<<mStrideShift) + x ] = k;
+                mBuf[ (y<<mStrideShift) + x ] = k;
         }