チェンジセット 1775

コミット日時:

2008/11/01 21:18:06 (2 ヶ月前)

コミッタ:

tasuku

ログメッセージ:

added circle tool

ファイル:

• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/PenDetailControlScript.as (更新) (3 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLogger.as (更新) (4 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPPen.as (更新) (2 diffs)

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

@@ -42 +42 @@
-/*    {label: 'スポイト', data: GPPen.PEN_MODE_DROPPER }, */
-    {label: '直線', data: GPPen.PEN_MODE_LINE },
-
-
-
+
+
+
+
+
+
-    {label: 'ペイント', data: GPPen.PEN_MODE_FLOOD_FILL }
-  ];
@@ -119 +122 @@
-public function resetPenTool():void {
-  if (dropperButton.selected) {
-Tool(GPPen.PEN_MODE_DROPPER, null, 
+ModeDropper(
-  } else if (handtoolButton.selected) {
-Tool(GPPen.PEN_MODE_HANDTOOL, null, 
+ModeHandtool(
-  } else if (dotButton.selected) {
-Tool(GPPen.PEN_MODE_PIXEL, null, 
+ModePixel(
-  } else {
-    _logger.eventSetPenMode(uint(penModeComboBox.value));
@@ -130 +133 @@
-
-// TODO: こいつらをスッキリまとめるべきでーす。
-dropperButtonHandler(evt:Event
+setModeDropper(selected:Boolean
-  handtoolButton.selected = false;
-  eraserButton.selected = false;
-  dotButton.selected = false;
-
-
-
-
+
+
+
+
+
+
+
+
-  dropperButton.selected = false;
-  eraserButton.selected = false;
-  dotButton.selected = false;
-
-
-
-
+
+
+
+
+
+
+
+
-  handtoolButton.selected = false;
-  dropperButton.selected = false;
-  dotButton.selected = false;
-
-
-
-
+
+
+
+
+
+
+
+
-  handtoolButton.selected = false;
-  eraserButton.selected = false;
-  dropperButton.selected = false;
-  // TODO: pen太さ
-
+
+
+
+
+
-}
-

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

@@ -1121 +1121 @@
-      case GPPen.PEN_MODE_ELLIPSE:
-      case GPPen.PEN_MODE_ROUND_RECT:
+      case GPPen.PEN_MODE_CIRCLE:
-        if (!_layerArray.isTargetLayerVisible) {
-          Alert.show('不可視の状態では描画できません！', '描画ツール');
@@ -1201 +1202 @@
-          if (_drawing) {
-            _pen.previewLineTo(_fromPoint.x, _fromPoint.y, evt.localX, evt.localY);
+          }
+          break;
+        case GPPen.PEN_MODE_RECT:
+          if (_drawing) {
+            _pen.previewRect(_fromPoint.x, _fromPoint.y, evt.localX, evt.localY);
+          }
+          break;
+        case GPPen.PEN_MODE_ELLIPSE:
+          if (_drawing) {
+            _pen.previewEllipse(_fromPoint.x, _fromPoint.y, evt.localX, evt.localY);
+          }
+          break;
+        case GPPen.PEN_MODE_ROUND_RECT:
+          /*
+          if (_drawing) {
+            _pen.previewRoundRect(_fromPoint.x, _fromPoint.y, evt.localX, evt.localY);
+          }
+          */
+          break;
+        case GPPen.PEN_MODE_CIRCLE:
+          if (_drawing) {
+            var dx:Number, dy:Number;
+            dx = evt.localX - _fromPoint.x;
+            dy = evt.localY - _fromPoint.y;
+            _pen.previewDrawCircle(_fromPoint.x, _fromPoint.y, Math.sqrt(dx * dx + dy * dy));
-          }
-          break;
@@ -1241 +1267 @@
-        }
-        break;
+      case GPPen.PEN_MODE_RECT:
+        if (_drawing) {
+          invokeRemoveDrawLayer();
+          if (!comparePoint(_fromPoint.x, _fromPoint.y, evt.localX, evt.localY)) {
+            // 始点と終点が違う場合にのみ…
+          }
+          _drawing = false;
+        }
+        break;
+      case GPPen.PEN_MODE_ELLIPSE:
+        if (_drawing) {
+          invokeRemoveDrawLayer();
+          if (!comparePoint(_fromPoint.x, _fromPoint.y, evt.localX, evt.localY)) {
+            // 始点と終点が違う場合にのみ…
+          }
+          _drawing = false;
+        }
+        break;
+      case GPPen.PEN_MODE_ROUND_RECT:
+        if (_drawing) {
+          invokeRemoveDrawLayer();
+          if (!comparePoint(_fromPoint.x, _fromPoint.y, evt.localX, evt.localY)) {
+            // 始点と終点が違う場合にのみ…
+          }
+          _drawing = false;
+        }
+        break;
+      case GPPen.PEN_MODE_CIRCLE:
+        if (_drawing) {
+          invokeRemoveDrawLayer();
+          if (!comparePoint(_fromPoint.x, _fromPoint.y, evt.localX, evt.localY)) {
+            var dx:Number, dy:Number;
+            dx = evt.localX - _fromPoint.x;
+            dy = evt.localY - _fromPoint.y;
+            // 始点と終点が違う場合にのみ円を描く
+            this.eventMoveTo(_fromPoint.x, _fromPoint.y);
+            this.eventDrawCircle(Math.sqrt(dx * dx + dy * dy));
+            this.eventDrawShapeOnBitmap();          
+          }
+          _drawing = false;
+        }
+        break;
-      case GPPen.PEN_MODE_DROPPER:
-        this.eventLineStyleColor(_layerArray.getColor(evt.localX, evt.localY));
@@ -1274 +1342 @@
-        break;
-      case GPPen.PEN_MODE_LINE:
+      case GPPen.PEN_MODE_RECT:
+      case GPPen.PEN_MODE_ELLIPSE:
+      case GPPen.PEN_MODE_ROUND_RECT:
+      case GPPen.PEN_MODE_CIRCLE:
-        if (_drawing) {
-          _drawing = false;

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

@@ -21 +21 @@
-    public static const PEN_MODE_ERASER:uint = 9;
-    public static const PEN_MODE_PIXEL:uint = 10;
+    public static const PEN_MODE_CIRCLE:uint = 11;
-
-    private var _mode:uint;
@@ -181 +182 @@
-          _drawShape.graphics.lineTo(zz(toX), zz(toY));
-        }
+
+        public function previewRect(fromX:Number, fromY:Number, toX:Number, toY:Number):void {
+          clearDrawShape();
+          setLineStyle();
+          _drawShape.graphics.drawRect(fromX, fromY, Math.abs(zz(toX) - fromX), Math.abs(zz(toY) - fromY));
+        }
+        
+        public function previewEllipse(fromX:Number, fromY:Number, toX:Number, toY:Number):void {
+          clearDrawShape();
+          setLineStyle();
+          _drawShape.graphics.drawEllipse(fromX, fromY, Math.abs(zz(toX) - fromX), Math.abs(zz(toY) - fromY));
+        }
+        
+        /*
+        public function previewRoundRect(fromX:Number, fromY:Number, toX:Number, toY:Number):void {
+          clearDrawShape();
+          setLineStyle();
+          _drawShape.graphics.drawRoundRect(fromX, fromY, Math.abs(zz(toX) - fromX), Math.abs(zz(toY) - fromY));
+        }
+        */
+        
+        public function previewDrawCircle(fromX:Number, fromY:Number, radius:Number):void {
+          clearDrawShape();
+          setLineStyle();
+          _drawShape.graphics.drawCircle(fromX, fromY, radius);
+        }
-        
-        /*********************************************************************/