チェンジセット 1122

コミット日時:

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

コミッタ:

tasuku

ログメッセージ:

r73@poppop (orig r72): tasuku | 2008-06-02 19:39:12 +0900

• fixed Alpha Blending fill Rect
  
• enable/disable controls depending on pen mode
  

ファイル:

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

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

@@ -9 +9 @@
-  import flash.events.MouseEvent;
-  import flash.geom.Point;
+  import flash.geom.Rectangle;
-  import flash.utils.ByteArray;
-  
@@ -230 +231 @@
-        
-        // マウス座標から描画座標に変換。
-rivate
+ublic static
-          return Math.floor(n) + 0.5;
+        }
+        // マウス座標の描画座標での比較
+        public static function comparePoint(ax:Number, ay:Number, bx:Number, by:Number):Boolean {
+          return (zz(ax) == zz(bx) && zz(ay) == zz(by));
-        }
-        
@@ -287 +292 @@
-        
-        public function floodFill():void {
-
+RGB
-      afterDrawBitmap();
-      logWrite(['floodFill', x, y]);
-        }
-
+
-        // FIXME: x, yはcurrentPointでいいのでは？lineStyleもmoveToでセットしてくれるし。
-    public function drawRect(x:Number, y:Number, width:uint, height:uint):void {

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

@@ -14 +14 @@
-  <mx:Label x="3" y="28" text="太"/>
-  <mx:HSlider x="16" y="28" width="87" minimum="1" maximum="30" snapInterval="1" height="12" value="3" id="thicknessSlider"/>
-
-
-
-
+
+
+
+
+
-
-  <!-- color palette -->

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

@@ -131 +131 @@
-  cancelDropper();
-  _pen.mode = uint(evt.currentTarget.value);
+  switch(_pen.mode) {
+  case GPPen.PEN_MODE_HAND:
+  case GPPen.PEN_MODE_LINE:
+    thicknessButton1.enabled = true;
+    thicknessButton2.enabled = true;
+    thicknessButton3.enabled = true;
+    thicknessButton4.enabled = true;
+    thicknessButton5.enabled = true;
+    thicknessSlider.enabled = true;
+    alphaSlider.enabled = true;
+    blendModeComboBox.enabled = true;
+    break;
+  case GPPen.PEN_MODE_FLOOD_FILL:
+    thicknessButton1.enabled = false;
+    thicknessButton2.enabled = false;
+    thicknessButton3.enabled = false;
+    thicknessButton4.enabled = false;
+    thicknessButton5.enabled = false;
+    thicknessSlider.enabled = false;
+    alphaSlider.enabled = false;
+    blendModeComboBox.enabled = false;
+    break;
+  }
-  changePen();
-}

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

@@ -68 +68 @@
-    public function get argbColor():uint {
-      return uint(_alpha * 255) << 24 | _color;
+    }
+    public function get argbRGBColor():uint {
+      return 0xFF000000 | _color;
-    }
-    
@@ -216 +219 @@
-          _canvas.drawCircle(thickness / 2);
-          _canvas.endFill();
-
+            
-        }
-        _canvas.drawShapeOnBitmap();
-        break;
-      case PEN_MODE_LINE:
-
-
-
+
+
+
+
+
+
+
-        break;
-      }