チェンジセット 1121: as3

コミット日時:

2008/08/27 18:18:14 (5 年前)

コミッタ:

tasuku

ログメッセージ:

r72@poppop (orig r71): tasuku | 2008-06-02 18:31:15 +0900

• support line
  
• support floodFill
  

ファイル:

• as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint/controls/GPCanvas.as (更新) (10 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint/controls/PenDetailControl.mxml (更新) (1 diff)
• as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint/controls/PenDetailControlScript.as (更新) (2 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint/entities/GPLogger.as (更新) (4 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint/entities/GPPen.as (更新) (7 diffs)

as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint/controls/GPCanvas.as

@@ -30 +30 @@
-    private var undoBufferSize:uint;
-    
-
-
-
-
+
+
+
+
+
-    private var additionalNumber:uint = 4; // 補助線の分割数
-    
@@ -72 +73 @@
-      addChildAt(additionalBox, 2);
-      addChildAt(additionalSkew, 3);
-
+
+
+
+
+
-      if (logger) {
-        this._log = logger;
@@ -162 +167 @@
-        }
-        
-
+shape:Shape
-          // TODO: pixel hintingのパラメータつける…
-lineS
+s
-                                   _pen.color,
-                                   _pen.alpha,
@@ -173 +178 @@
-                                   _pen.miterLimit);
-
-
+
+
+
+
+
-      
-      if (writeLog) {
@@ -219 +228 @@
-      }
-        }
+        
+        // マウス座標から描画座標に変換。
+        private function zz(n:Number):Number {
+          return Math.floor(n) + 0.5;
+        }
+        
+        public function previewClear():void {
+          previewShape.graphics.clear();
+        }
+        
+        public function previewLineTo(fromX:Number, fromY:Number, toX:Number, toY:Number):void {
+          previewShape.graphics.clear();
+          setLineStyle(previewShape);
+          previewShape.graphics.moveTo(zz(fromX), zz(fromY));
+          previewShape.graphics.lineTo(zz(toX), zz(toY));
+        }       
+        
-        // 描画関係のフラグ
-        public var isMoveTo:Boolean = false;
@@ -227 +253 @@
-    public function oldMoveTo(x:Number, y:Number):void {
-      lineShape.graphics.moveTo(x, y);
-
+AndLog
-      logWrite(['moveTo', x, y]);
-      isDrawnLine = false;
@@ -260 +286 @@
-        }
-        
+        public function floodFill():void {
+          canvasData.floodFill(currentPoint.x, currentPoint.y, _pen.argbColor);
+      afterDrawBitmap();
+      logWrite(['floodFill', x, y]);
+        }
+
+        // FIXME: x, yはcurrentPointでいいのでは？lineStyleもmoveToでセットしてくれるし。
-    public function drawRect(x:Number, y:Number, width:uint, height:uint):void {
-      x = Math.floor(x) + 0.5;
-      y = Math.floor(y) + 0.5;
-      setLineStyle();
-      lineShape.graphics.drawRect(x, y, width, height);
-      logWrite(['drawRect', x, y, width, height]);
@@ -276 +308 @@
-      var x:Number = currentPoint.x;
-      var y:Number = currentPoint.y;
-      setLineStyle();
-      lineShape.graphics.drawCircle(x, y, radius);
-      // moveToでx, yは保存されているので、半径のみ保存
@@ -312 +343 @@
-      // 描画
-      canvasData.draw(lineShape, null, null, _pen.blendMode, null, false);
+      logWrite(['drawShapeOnBitmap']);
+      
+      afterDrawBitmap();
+    }
+    
+    public function afterDrawBitmap():void {
-      // リングバッファに追加して
-      // TODO: avoid GC
@@ -324 +361 @@
-      lineShape.graphics.clear();
-      isMoveTo = false;
-
-
+
-    }
-    

as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint/controls/PenDetailControl.mxml

@@ -86 +86 @@
-
-  <!-- line method/blend mode -->
- enabled="false"
+
-  </mx:ComboBox>
-  <mx:ComboBox id="blendModeComboBox" x="6" y="316" width="97">

as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint/controls/PenDetailControlScript.as

@@ -39 +39 @@
-  penModeComboBox.dataProvider = [
-    {label: '手描き', data: GPPen.PEN_MODE_HAND },
-
+
-    {label: '直線', data: GPPen.PEN_MODE_LINE },
-
+/*
-    {label: '円', data: GPPen.PEN_MODE_ELLIPSE },
-
+
+
-  ];
+  penModeComboBox.addEventListener(ListEvent.CHANGE, penModeComboBoxHandler);
-  
-  // ブレンドモード
@@ -126 +128 @@
-}
-
+private function penModeComboBoxHandler(evt:ListEvent):void {
+  cancelDropper();
+  _pen.mode = uint(evt.currentTarget.value);
+  changePen();
+}
+
-private function blendModeComboBoxHandler(evt:ListEvent):void {
-  cancelDropper();

as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint/entities/GPLogger.as

@@ -91 +91 @@
-    public static const ACTION_DRAW_ELLIPSE:uint = 11;
-    public static const ACTION_DRAW_ROUND_RECT:uint = 12;
+    public static const ACTION_FLOOD_FILL:uint = 13;
-
-    // LINESTYLE
@@ -193 +194 @@
-        writeDouble(info[1]);
-        break;
-
+
+
+
-      default:
-        Alert.show('対応していないアクションがログされました！');
@@ -343 +346 @@
-          case GPLogger.ACTION_DRAW_CIRCLE:
-            _playCanvas.drawCircle(a[1]);
+            break;
+          case GPLogger.ACTION_FLOOD_FILL:
+            _playCanvas.floodFill();
-            break;
-          default:
@@ -426 +432 @@
-          obj = readDouble();
-          return [ACTION_DRAW_CIRCLE, obj];
+        case ACTION_FLOOD_FILL:
+          return [ACTION_FLOOD_FILL];
-        default:
-          if (byte & 0x80) {

as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint/entities/GPPen.as

@@ -6 +6 @@
-  import flash.display.LineScaleMode;
-  import flash.events.MouseEvent;
+  import flash.geom.Point;
-  
-  import gunyarapaint.controls.GPCanvas;
-  import gunyarapaint.controls.PenDetailControl;
-  
-  import mx.core.Application;
-
-  public class GPPen
@@ -20 +19 @@
-    public static const PEN_MODE_ELLIPSE:uint = 5;
-    public static const PEN_MODE_ROUND_RECT:uint = 6;
+    public static const PEN_MODE_FLOOD_FILL:uint = 7;
-
-    private var _mode:uint;
@@ -65 +65 @@
-    public function get pixelHinting():Boolean {
-      return _pixelHinting;
+    }
+    public function get argbColor():uint {
+      return uint(_alpha * 255) << 24 | _color;
-    }
-    
@@ -146 +149 @@
-    }
-    
+    private var fromPoint:Point = new Point();
+    private var isMouseDownAndOut:Boolean = false;
+    
-    public function mouseDown(evt:MouseEvent):void {
-      // 一応…
@@ -153 +159 @@
-          switch (mode) {
-            case PEN_MODE_HAND:
+              // moveToして、ペンの状態を設定し、ペンの状態変化をログし、始点の座標を覚えさせる
+              // FIXME: lintToまでmoveToを遅延させよう！
-              _canvas.moveTo(evt.localX, evt.localY);
-              break;
@@ -159 +167 @@
-            case PEN_MODE_ELLIPSE:
-            case PEN_MODE_ROUND_RECT:
-
+
+
-        break;
-      case PEN_MODE_DROPPER:
-        color = _canvas.getColor(evt);
-        break;
-
-
-
-
-
+
+
+
+
+
+
-
-    public function mouseMove(evt:MouseEvent):void {
@@ -191 +201 @@
-          }
-          break;
+        case PEN_MODE_LINE:
+          _canvas.previewLineTo(fromPoint.x, fromPoint.y, evt.localX, evt.localY);
+          break;
-        }
-        lastX = evt.localX;
-        lastY = evt.localY;
-      }
-    }
-    public function mouseUp(evt:MouseEvent):void {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    public function mouseOut(evt:MouseEvent):void {
-
-
+
+
+
+
+
+
+
+
+
-      }
-    }