チェンジセット 1523

コミット日時:

2008/10/05 20:29:16 (5 年前)

コミッタ:

tasuku

ログメッセージ:

fixed some layer bugs

ファイル:

• as3/gunyarapaint/trunk/gunyarapaint/src/gplogplayer.mxml (更新) (1 diff)
• as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint.as (更新) (1 diff)
• as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint.mxml (更新) (1 diff)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/GPLayerWindowControlScript.as (更新) (2 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/PenDetailControlScript.as (更新) (4 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLayer.as (更新) (2 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLayerArray.as (更新) (15 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLogger.as (更新) (5 diffs)
• as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPPen.as (更新) (1 diff)

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

@@ -163 +163 @@
-  ]]>
-  </mx:Script>
-2
+7
-</mx:Application>

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

@@ -39 +39 @@
-
-public function init():void {
-
-  var width:uint, height:uint, undoBufferSize:uint;
-

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

@@ -12 +12 @@
-  </mx:Script>
-  <mx:Canvas id="toolCanvas" x="0" y="0" width="685" height="102">
-3
+7
-    <mx:Label x="28" y="7" text="名前"/>
-    <mx:TextInput id="fromTextInput" x="55" y="3" maxChars="32" fontSize="14" focusThickness="0"/>

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

@@ -15 +15 @@
-  blendModeComboBox.dataProvider = [
-    {label: '通常', data: flash.display.BlendMode.NORMAL},
-    //{label: '消去', data: flash.display.BlendMode.ERASE}, // マスクレイヤでよい。
-    {label: '比較(暗)', data: flash.display.BlendMode.DARKEN},
-    {label: '乗算', data: flash.display.BlendMode.MULTIPLY},
@@ -25 +24 @@
-    {label: '差の絶対値', data: flash.display.BlendMode.DIFFERENCE},
-    {label: '除外', data: flash.display.BlendMode.SUBTRACT},
-
+
+
-  blendModeComboBox.addEventListener(ListEvent.CHANGE, blendModeComboBoxHandler);
-  

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

@@ -52 +52 @@
-  blendModeComboBox.dataProvider = [
-    {label: '通常', data: flash.display.BlendMode.NORMAL},
-    // {label: '消去', data: flash.display.BlendMode.ERASE}, // eraserButtonで設定させる
-    {label: '比較(暗)', data: flash.display.BlendMode.DARKEN},
-    {label: '乗算', data: flash.display.BlendMode.MULTIPLY},
@@ -62 +61 @@
-    {label: '差の絶対値', data: flash.display.BlendMode.DIFFERENCE},
-    {label: '除外', data: flash.display.BlendMode.SUBTRACT},
-
+
+
-  blendModeComboBox.addEventListener(ListEvent.CHANGE, blendModeComboBoxHandler);
-}
@@ -69 +69 @@
-  _logger = l;
-  gridItemPaletteClickHandler(1);
+  // 初期値と設定値が一緒なのでイベントが飛んでこない、明示的に呼んであげる
+  drawPreview(GPPen.PEN_MODE_HAND, 0x000000, 1, 3);
-}
-
@@ -176 +178 @@
-
-private function thicknessSliderHandler(evt:SliderEvent):void {
-  cancelTool();
-  _logger.eventLineStyleThickness(evt.value);
-}

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

@@ -26 +26 @@
-    
-    private var _logger:GPLogger;
-
+
-    public function GPLayer(logger:GPLogger,
-                            source:BitmapData, width:uint, height:uint, index:uint,
@@ -53 +53 @@
-    public function clone():GPLayer {
-      // indexは親で振りなおす
-.clone()
+
-    }
-
-    // 外から与えられたものを_bitmapDataに書き込む
-    public function draw(source:IBitmapDrawable, matrix:Matrix = null, colorTransform:ColorTransform = null, blendMode:String = null, clipRect:Rectangle = null, smoothing:Boolean = false):void {
+      // UndoBufferに入っているbitmapDataを上書きしないように、コピーしてから描く。
+      _bitmapData = _bitmapData.clone();
+      _bitmap.bitmapData = _bitmapData;
-      _bitmapData.draw(source, matrix, colorTransform, blendMode, clipRect, smoothing);
-    }
-    public function floodFill(x:Number, y:Number, color:uint):void {
+      _bitmapData = _bitmapData.clone();
+      _bitmap.bitmapData = _bitmapData;
-      _bitmapData.floodFill(x, y, color);
-    }    

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

@@ -3 +3 @@
-  import com.adobe.images.PNGEncoder;
-  
+  import flash.display.Bitmap;
-  import flash.display.BitmapData;
-  import flash.display.BlendMode;
@@ -19 +20 @@
-  {
-    private var _a:Array;
-(1 startがいいかな？)
+
-    private var _width:uint, _height:uint; // キャンバスサイズ
-    
@@ -100 +101 @@
-      _view.addChildAt(l.bitmap, _targetIndex);
-      reindex();
+      recombine();
-      return true;
-    }
-    
-    public function changeVisible(target:uint, b:Boolean):Boolean {
-
+target >= _a.length || 
-        return false;
-      }
@@ -151 +153 @@
-    
-    public function swap(f:uint, t:uint):Boolean {
-
+>= _a.length || t >= _a.length || f 
-        return false;
-      }
@@ -164 +166 @@
-
-    public function mergeWithBelow():Boolean {
-
-
+
-        Alert.show('統合するひとつ下のレイヤがありません。', 'レイヤツール');
-        return false;
-      }
-
-
-
-
-
-
-
+
+
+
+
-      reindex();
-      recombine();
@@ -182 +180 @@
-
-    public function remove():Boolean {
-      var i:uint = _targetIndex;
-      if (_a.length <= 1) {
-        Alert.show('レイヤ全てを削除することはできません。', 'レイヤツール');
-        return false;
-      }
-i
-if (_targetIndex == i) {
-  _targetIndex--;
-}
-_view.removeChildAt(i);
+_targetIndex
+_view.removeChildAt(_targetIndex);
+if (_targetIndex > 0) {
+  this.targetIndex = _targetIndex - 1;
+}
-      reindex();
-      recombine();
@@ -200 +197 @@
-    private function recombine():void {
-      _combinedBitmapData = new BitmapData(_width, _height, true, 0x00000000);
-String in _a
+uint = 0; i < _a.length; i++
-        _a[i].drawDest(_combinedBitmapData);
-      }
@@ -238 +235 @@
-      for (var i:uint = 0; i < _a.length; i++) {
-        var lo:Object = _a[i].to_object;
-
-
-
-
-
-
+
-        obj['layers'].push(lo);
-      }
@@ -251 +243 @@
-    public function set dataForUndo(obj:Object):void {
-      var i:uint;
-      _targetIndex = obj.target_index;
-      for (i = 0; i < _a.length; i++) {
-        try {
@@ -266 +257 @@
-        _view.addChild(l.bitmap);
-      }
+      this.targetIndex = obj.target_index;
-      recombine();
-    }
@@ -277 +269 @@
-    public function floodFill(x:Number, y:Number, color:uint):void {
-      _a[_targetIndex].floodFill(x, y, color);
+      recombine();
-    }
-    
@@ -296 +289 @@
-
-    public function set targetIndex(i:uint):void {
-
+
+
+
-    }
-    
@@ -313 +308 @@
-      recombine();
-    }
+    public function set targetLayerBlendMode(s:String):void {
+      _a[_targetIndex].blendMode = s;
+      recombine();
+    }
-    public function get targetLayerAlpha():Number {
-      return _a[_targetIndex].alpha;
@@ -319 +318 @@
-      return _a[_targetIndex].blendMode;
-    }
-    public function set targetLayerBlendMode(s:String):void {
-      _a[_targetIndex].blendMode = s;
-      recombine();
-    }
-    
-    public function get view():Sprite {
-      return _view;
-
-
+
-    
-    // 描画用レイヤを一時的に挿入・削除する。
@@ -342 +336 @@
-                                  _a[_targetIndex].blendMode;
-        _targetSprite.alpha = _a[_targetIndex].alpha;
-
-a[_targetIndex].alpha = 1
-/*
-s.blendMode = p.blendMode
-s.alpha = p.alpha
-*/
-_a[_targetIndex].bitmap);      
+
+view.removeChild(_a[_targetIndex].bitmap)
+    var tempTargetLayerBitmap:Bitmap = new Bitmap(_a[_targetIndex].bitmapData);
+tempTargetLayerBitmap.blendMode = flash.display.BlendMode.NORMAL
+tempTargetLayerBitmap.alpha = 1
+    
+tempTargetLayerBitmap);
-        _targetSprite.addChild(s);
-        _view.addChildAt(_targetSprite, _targetIndex);        

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

@@ -5 +5 @@
-package org.libspark.gunyarapaint.entities
-{
+  import flash.display.Bitmap;
-  import flash.display.BitmapData;
-  import flash.errors.EOFError;
@@ -122 +123 @@
-        ret.compatibility_0_0_1 = true;
-        break;
-
-
+ // 0.5ずれバグの修正、ドット描画バグの修正
+ // レイヤ対応初版、最初の数点は0.0.2versionでレイヤのやつがある
-      case '0.0.4:':
-      case '0.0.5:':
-      case '0.0.6:':
+      case '0.0.7:':
+      case '0.0.8:': // undoの挙動変更、bitmapDataをcloneするように
-        break;
-      default:
@@ -144 +147 @@
-      var log:ByteArray = new ByteArray();
-      log.endian = flash.utils.Endian.BIG_ENDIAN;
-6
+8
-      log.writeShort(width);
-      log.writeShort(height);
@@ -150 +153 @@
-      var ret:GPLogger = new GPLogger(log, true, width, height, undoBufferSize, baseLayers, baseInfo);
-      ret.createCanvas();
-      // 初期のペン状態を記録しておく。
-      ret.eventLineStyleThickness(ret._pen.thickness);
-      ret.eventLineStyleColor(ret._pen.color);
-      ret.eventLineStyleAlpha(ret._pen.alpha);
-      ret.eventLineStyleBlendMode(ret._pen.blendMode);
-      ret.eventLineStyleScaleMode(ret._pen.scaleMode);
-      ret.eventLineStyleCapsStyle(ret._pen.capsStyle);
-      ret.eventLineStyleJointStyle(ret._pen.jointStyle);
-      ret.eventLineStyleMiterLimit(ret._pen.miterLimit);
-      ret.eventLineStylePixelHinting(ret._pen.pixelHinting);
-
-      return ret;
@@ -211 +204 @@
-
-    public function drawShapeOnBitmap():void {
-      // 描画
-      _layerArray.draw(_pen.drawShape, null, null, _pen.blendMode, null, false);
-      pushUndoBuffer();

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

@@ -81 +81 @@
-    }
-
+    // これらの初期値は変えないこと！描画ログが崩れます。
-    public function GPPen(logger:GPLogger,
-                          thickness:uint = 3,