チェンジセット 2778

コミット日時:

2009/06/03 03:26:45 (4 年前)

コミッタ:

tasuku

ログメッセージ:

* gunyarapaint: 左右反転・上下反転をつけた。とりあえずは全レイヤー版のボタンをつけた。

ファイル:

• as3/gunyarapaint/trunk/ChangeLog (更新) (1 diff)
• as3/gunyarapaint/trunk/gunyarapaint/src/gplogplayer.mxml (更新) (1 diff)
• as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint.as (更新) (2 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint.mxml (更新) (2 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLayer.as (更新) (3 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLayerArray.as (更新) (3 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLogger.as (更新) (5 diffs)

as3/gunyarapaint/trunk/ChangeLog

@@ +1 @@
+2009-06-03  Tasuku SUENAGA <a at razil.jp>
+
+  * gunyarapaint: ���E���]�E�㉺���]������B�Ƃ肠�����͑S���C���[�ł̃{�^��������B
+
-2009-05-29  Tasuku SUENAGA <a at razil.jp>
-

as3/gunyarapaint/trunk/gunyarapaint/src/gplogplayer.mxml

@@ -160 +160 @@
-  ]]>
-  </mx:Script>
-528
+603
-</mx:Application>

as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint.as

@@ -80 +80 @@
-  zoomResetButton.addEventListener(FlexEvent.BUTTON_DOWN, zoomResetButtonHandler);
-  rotateResetButton.addEventListener(FlexEvent.BUTTON_DOWN, rotateResetButtonHandler);
+  horizontalMirrorButton.addEventListener(FlexEvent.BUTTON_DOWN, horizontalMirrorButtonHandler);
+  verticalMirrorButton.addEventListener(FlexEvent.BUTTON_DOWN, verticalMirrorButtonHandler);
-  
-  // アンドゥ・リドゥ
@@ -331 +333 @@
-}
-
+private function horizontalMirrorButtonHandler(evt:Event):void {
+  _logger.eventHorizontalMirror(0xff);
+}
+
+private function verticalMirrorButtonHandler(evt:Event):void {
+  _logger.eventVerticalMirror(0xff);
+}
+
-private function setRotate(v:Number):void {
-  canvasRotate.value = v;

as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint.mxml

@@ -23 +23 @@
-    <mx:Button id="rotateResetButton" x="467" y="63" label="角度" width="29" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17"/>
-    <mx:Button id="zoomResetButton" x="467" y="81" label="拡大" width="29" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17"/>
+    <mx:Button id="horizontalMirrorButton" x="117" y="128" label="全レイヤー左右反転" width="120" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17"/>
+    <mx:Button id="verticalMirrorButton" x="245" y="128" label="全レイヤー上下反転" width="120" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17"/>
-    <mx:HSlider id="canvasRotate" x="501" y="62" width="152" minimum="-180" maximum="180" snapInterval="5" value="0" />
-    <mx:HSlider id="canvasZoom" x="502" y="79" width="152" minimum="-4" maximum="16" snapInterval="1" value="1" />
@@ -33 +35 @@
-    <mx:Button id="undoButton" x="469" y="36" label="アンドゥ" enabled="false" paddingLeft="3" paddingRight="3"/>
-    <mx:Button id="redoButton" x="555" y="36" label="リドゥ" enabled="false" paddingLeft="3" paddingRight="3"/>
-528
+603
-    <mx:Button id="windowsResetButton" x="10" y="128" label="ウィンドウ初期状態" width="99" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17"/>
-117
+373
-    <mx:Button id="logPlayButton" x="502" y="105" label="ログプレイ" visible="false"/>
-    <mx:Button id="checkPngButton" x="585" y="105" label="同一check" visible="false"/>

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

@@ -26 +26 @@
-    
-    private var _logger:GPLogger;
+    
+    private static var mirrorMatrix:Matrix;
-    
-    public function GPLayer(logger:GPLogger,
@@ -65 +67 @@
-      this.bitmapData = _bitmapData.clone();
-      _bitmapData.floodFill(x, y, color);
-    
+
-    public function setPixel(x:Number, y:Number, color:uint):Boolean {
-      if (_bitmapData.getPixel32(x, y) == color) {
@@ -73 +75 @@
-      _bitmapData.setPixel32(x, y, color);
-      return true;
-
+
+
+
+
+
+
-    // 外から与えられたBitmapDataに、自分の_bitmapDataを_blendModeとalphaを使って描画する。
-    public function drawDest(dest:BitmapData):void {

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

@@ -29 +29 @@
-
-    private var _logger:GPLogger;
+    
+    private var _horizontalMirrorMatrix:Matrix; // 左右反転用Matrix、GPLayerで持つともったいないので
+    private var _verticalMirrorMatrix:Matrix; // 上下反転用Matrix、GPLayerで持つともったいないので
-
-    public function GPLayerArray(logger:GPLogger, a:Array, targetIndex:uint, w:uint, h:uint) {
@@ -35 +38 @@
-      _height = h;
-      _view = new Sprite();
+      _horizontalMirrorMatrix = new Matrix(-1, 0, 0, 1, w, 0);
+      _verticalMirrorMatrix = new Matrix(1, 0, 0, -1, 0, h);
-      if (a) {
-        _a = a;
@@ -300 +305 @@
-    }
-    
+    // レイヤー番号が0xffUの場合には、全部反転
+    public function horizontalMirror(i:uint):void {
+      if (i == 0xff) {
+        for (var j:uint = 0; j < _a.length; j++) {
+          _a[j].matrixConvert(this._horizontalMirrorMatrix);
+        }
+      } else {
+        _a[i].matrixConvert(this._horizontalMirrorMatrix);
+      }
+      recombine();
+    }
+    
+    // レイヤー番号が0xffUの場合には、全部反転
+    public function verticalMirror(i:uint):void {
+      if (i == 0xff) {
+        for (var j:uint = 0; j < _a.length; j++) {
+          _a[j].matrixConvert(this._verticalMirrorMatrix);
+        }
+      } else {
+        _a[i].matrixConvert(this._verticalMirrorMatrix);
+      }
+      recombine();
+    }
+
-    private function reindex():void {
-      for (var i:String in _a) {

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

@@ -146 +146 @@
-        break;
-      case '0.2.0:': // Math.floor(mouseX + 0.5)を、偶奇で変えるようにした by はくはく。
+      case '0.2.1:': // 水平・垂直反転反転ボタンをつけた。
-        break;
-      default:
@@ -199 +200 @@
-    public static const ACTION_LAYER_CHANGE_ALPHA:uint = 22;
-    public static const ACTION_SET_PIXEL:uint = 23;
+    public static const ACTION_HORIZONTAL_MIRROR:uint = 24;
+    public static const ACTION_VERTICAL_MIRROR:uint = 25;
-
-    // LINESTYLE
@@ -456 +459 @@
-          eventSetPixel(uintNum, uintNum2);
-          break;
+        case ACTION_HORIZONTAL_MIRROR:
+          uintNum = readByte();
+          eventHorizontalMirror(uintNum);
+          break;
+        case ACTION_VERTICAL_MIRROR:
+          uintNum = readByte();
+          eventVerticalMirror(uintNum);
+          break;
-        default:
-          if (byte & 0x80) {
@@ -859 +870 @@
-      trace('SET_PIXEL');
-    }
+    
+    public function eventHorizontalMirror(i:uint):void {
+      _layerArray.horizontalMirror(i);
+      if (_onLogging) {
+        writeByte(ACTION_HORIZONTAL_MIRROR);
+        writeByte(i);
+      }
+      trace('HORIZONTAL_MIRROR');
+    }
+
+    public function eventVerticalMirror(i:uint):void {
+      _layerArray.verticalMirror(i);
+      if (_onLogging) {
+        writeByte(ACTION_VERTICAL_MIRROR);
+        writeByte(i);
+      }
+      trace('VERTICAL_MIRROR');
+    }
-
-    private function invokeLayerChange():void {
@@ -891 +920 @@
-      }
-      trace('LAYER_COPY');
-
+
-      pushUndoBuffer();
-      invokeLayerChange();