チェンジセット 3524: as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework
- コミット日時:
- 2010/03/12 01:23:37 (3 年前)
- ファイル:
-
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/CommandContext.as (移動) (as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/CommandCollection.as から 移動) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Painter.as (移動) (as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/CanvasContext.as から 移動) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Parser.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Player.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Recorder.as (更新) (4 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/UndoStack.as (更新) (4 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/BeginFillCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/CompositeCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/DrawCircleCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/EndFillCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/FloodFillCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/HorizontalMirrorCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/ICommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/LineToCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/MoveToCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/PenCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/PixelCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/RedoCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/UndoCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/VerticalMirrorCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/CopyLayerCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/CreateLayerCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/MergeLayerCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/RemoveLayerCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerAlphaCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerBlendModeCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerIndexCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerVisibleCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SwapLayerCommand.as (更新) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/CanvasModule.as (移動) (as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/DrawModule.as から 移動) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/CanvasModuleContext.as (移動) (as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/DrawModuleFactory.as から 移動) (2 diffs)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/CircleModule.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/DropperModule.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/EllipseModule.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/EraserModule.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/FloodFillModule.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/FreeHandModule.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/ICanvasModule.as (移動) (as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/IDrawable.as から 移動) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/LineModule.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/PixelModule.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/RectModule.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/RoundRectModule.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/ui/IApplication.as (更新) (2 diffs)
凡例:
- 変更無し
- 追加
- 削除
- 更新
- コピー
- 移動
as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/CommandContext.as
r3521 r3524 30 30 /** 31 31 * コマンドを管理する 32 * TODO: CommandContext という名前に変更する33 32 * 34 33 */ 35 public class CommandCo llectionextends EventDispatcher34 public class CommandContext extends EventDispatcher 36 35 { 37 36 public static const MAX_COMMANDS:uint = 256; 38 37 39 public function CommandCo llection()38 public function CommandContext() 40 39 { 41 40 m_commands = new Vector.<ICommand>(MAX_COMMANDS, true); as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Painter.as
r3521 r3524 16 16 * 再生及び記録のための共通基盤 17 17 * 18 * TODO: やっぱり Painter という名前にする19 18 */ 20 public class CanvasContextextends EventDispatcher19 public class Painter extends EventDispatcher 21 20 { 22 21 /** … … 38 37 public static const PAINTER_VERSION_STRING:String = "ver." + PAINTER_VERSION; 39 38 40 public function CanvasContext(width:uint, height:uint, version:uint, paintEngine:PaintEngine)39 public function Painter(width:uint, height:uint, version:uint, paintEngine:PaintEngine) 41 40 { 42 41 m_layers = new LayerBitmapCollection(width, height); as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Parser.as
r3501 r3524 18 18 * 19 19 */ 20 public final class Parser extends CommandCo llection20 public final class Parser extends CommandContext 21 21 { 22 22 public static const EOH:uint = 26; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Player.as
r3511 r3524 13 13 * 14 14 */ 15 public final class Player extends CanvasContext15 public final class Player extends Painter 16 16 { 17 17 public function Player(parser:Parser) as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Recorder.as
r3511 r3524 11 11 * 12 12 */ 13 public final class Recorder extends CanvasContext13 public final class Recorder extends Painter 14 14 { 15 15 /** … … 19 19 public static const DEFAULT_UNDO_MAX:uint = 16; 20 20 21 public function Recorder(width:uint, height:uint, bytes:ByteArray, commands:CommandCo llection)21 public function Recorder(width:uint, height:uint, bytes:ByteArray, commands:CommandContext) 22 22 { 23 23 m_bytes = bytes; … … 37 37 { 38 38 var bytes:ByteArray = new ByteArray(); 39 var commands:CommandCo llection = new CommandCollection();39 var commands:CommandContext = new CommandContext(); 40 40 var version:uint = PAINTER_LOG_VERSION; 41 41 bytes.endian = Endian.BIG_ENDIAN; … … 69 69 } 70 70 71 private var m_command:CommandCo llection;71 private var m_command:CommandContext; 72 72 private var m_bytes:ByteArray; 73 73 } as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/UndoStack.as
r3506 r3524 10 10 internal final class UndoStack 11 11 { 12 public function UndoStack(painter: CanvasContext,12 public function UndoStack(painter:Painter, 13 13 size:uint = 16) 14 14 { … … 23 23 } 24 24 25 public function undo( cc:CanvasContext):void25 public function undo(painter:Painter):void 26 26 { 27 27 if (m_index === m_first) { … … 34 34 m_index--; 35 35 } 36 cc.restoreState(m_buffer[m_index]);36 painter.restoreState(m_buffer[m_index]); 37 37 } 38 38 39 public function redo( cc:CanvasContext):void39 public function redo(painter:Painter):void 40 40 { 41 41 if (m_index === m_last) { … … 43 43 } 44 44 m_index = (m_index + 1) % m_buffer.length; 45 cc.restoreState(m_buffer[m_index]);45 painter.restoreState(m_buffer[m_index]); 46 46 } 47 47 48 public function push(painter: CanvasContext):void48 public function push(painter:Painter):void 49 49 { 50 50 m_index = (m_index + 1) % m_buffer.length; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/BeginFillCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 35 35 } 36 36 37 public function execute( canvas:CanvasContext):void37 public function execute(painter:Painter):void 38 38 { 39 canvas.beginFill(m_color, m_alpha);39 painter.beginFill(m_color, m_alpha); 40 40 } 41 41 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/CompositeCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 26 26 } 27 27 28 public function execute( canvas:CanvasContext):void28 public function execute(painter:Painter):void 29 29 { 30 canvas.composite();31 canvas.pushUndo();32 canvas.stopDrawingSession();30 painter.composite(); 31 painter.pushUndo(); 32 painter.stopDrawingSession(); 33 33 } 34 34 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/DrawCircleCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 30 30 } 31 31 32 public function execute( canvas:CanvasContext):void32 public function execute(painter:Painter):void 33 33 { 34 canvas.drawCircle(m_radius);34 painter.drawCircle(m_radius); 35 35 } 36 36 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/EndFillCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 26 26 } 27 27 28 public function execute( canvas:CanvasContext):void28 public function execute(painter:Painter):void 29 29 { 30 canvas.endFill();30 painter.endFill(); 31 31 } 32 32 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/FloodFillCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 26 26 } 27 27 28 public function execute( canvas:CanvasContext):void28 public function execute(painter:Painter):void 29 29 { 30 canvas.floodFill();31 canvas.pushUndo();32 canvas.stopDrawingSession();30 painter.floodFill(); 31 painter.pushUndo(); 32 painter.stopDrawingSession(); 33 33 } 34 34 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/HorizontalMirrorCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 31 31 } 32 32 33 public function execute( canvas:CanvasContext):void33 public function execute(painter:Painter):void 34 34 { 35 canvas.transformWithHorizontalMirrorAt(m_index);35 painter.transformWithHorizontalMirrorAt(m_index); 36 36 } 37 37 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/ICommand.as
r3501 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 31 31 * キャンバスに描写を実行する 32 32 * 33 * @param canvasキャンバス33 * @param painter キャンバス 34 34 */ 35 function execute( canvas:CanvasContext):void;35 function execute(painter:Painter):void; 36 36 37 37 /** as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/LineToCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 64 64 } 65 65 66 public function execute( canvas:CanvasContext):void66 public function execute(painter:Painter):void 67 67 { 68 canvas.lineTo(68 painter.lineTo( 69 69 readCoordinate.x || writeCoordinate.x, 70 70 readCoordinate.y || writeCoordinate.y as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/MoveToCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 54 54 } 55 55 56 public function execute( canvas:CanvasContext):void56 public function execute(painter:Painter):void 57 57 { 58 canvas.moveTo(58 painter.moveTo( 59 59 readCoordinate.x || writeCoordinate.x, 60 60 readCoordinate.y || writeCoordinate.y 61 61 ); 62 canvas.startDrawingSession();62 painter.startDrawingSession(); 63 63 } 64 64 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/PenCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 import org.libspark.gunyarapaint.framework.Pen; 7 7 … … 129 129 } 130 130 131 public function execute( canvas:CanvasContext):void131 public function execute(painter:Painter):void 132 132 { 133 canvas.pen = m_pen;133 painter.pen = m_pen; 134 134 } 135 135 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/PixelCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 35 35 } 36 36 37 public function execute( canvas:CanvasContext):void37 public function execute(painter:Painter):void 38 38 { 39 canvas.setPixel(m_x, m_y);40 canvas.pushUndo();39 painter.setPixel(m_x, m_y); 40 painter.pushUndo(); 41 41 } 42 42 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/RedoCommand.as
r3501 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 26 26 } 27 27 28 public function execute( canvas:CanvasContext):void28 public function execute(painter:Painter):void 29 29 { 30 canvas.redo();30 painter.redo(); 31 31 } 32 32 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/UndoCommand.as
r3501 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 26 26 } 27 27 28 public function execute( canvas:CanvasContext):void28 public function execute(painter:Painter):void 29 29 { 30 canvas.undo();30 painter.undo(); 31 31 } 32 32 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/VerticalMirrorCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 7 7 /** … … 31 31 } 32 32 33 public function execute( canvas:CanvasContext):void33 public function execute(painter:Painter):void 34 34 { 35 canvas.transformWithVerticalMirrorAt(m_index);35 painter.transformWithVerticalMirrorAt(m_index); 36 36 } 37 37 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/CopyLayerCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 import org.libspark.gunyarapaint.framework.commands.ICommand; 7 7 … … 27 27 } 28 28 29 public function execute( canvas:CanvasContext):void29 public function execute(painter:Painter):void 30 30 { 31 canvas.layers.copy();32 canvas.pushUndoIfNeed();31 painter.layers.copy(); 32 painter.pushUndoIfNeed(); 33 33 } 34 34 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/CreateLayerCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 import org.libspark.gunyarapaint.framework.commands.ICommand; 7 7 … … 27 27 } 28 28 29 public function execute( canvas:CanvasContext):void29 public function execute(painter:Painter):void 30 30 { 31 canvas.layers.add();32 canvas.pushUndoIfNeed();31 painter.layers.add(); 32 painter.pushUndoIfNeed(); 33 33 } 34 34 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/MergeLayerCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 import org.libspark.gunyarapaint.framework.commands.ICommand; 7 7 … … 27 27 } 28 28 29 public function execute( canvas:CanvasContext):void29 public function execute(painter:Painter):void 30 30 { 31 canvas.layers.merge();32 canvas.pushUndoIfNeed();31 painter.layers.merge(); 32 painter.pushUndoIfNeed(); 33 33 } 34 34 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/RemoveLayerCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 import org.libspark.gunyarapaint.framework.commands.ICommand; 7 7 … … 27 27 } 28 28 29 public function execute( canvas:CanvasContext):void29 public function execute(painter:Painter):void 30 30 { 31 canvas.layers.remove();32 canvas.pushUndoIfNeed();31 painter.layers.remove(); 32 painter.pushUndoIfNeed(); 33 33 } 34 34 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerAlphaCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 import org.libspark.gunyarapaint.framework.commands.ICommand; 7 7 … … 34 34 } 35 35 36 public function execute( canvas:CanvasContext):void36 public function execute(painter:Painter):void 37 37 { 38 canvas.currentLayerAlpha = m_alpha;39 canvas.pushUndoIfNeed();38 painter.currentLayerAlpha = m_alpha; 39 painter.pushUndoIfNeed(); 40 40 } 41 41 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerBlendModeCommand.as
r3505 r3524 4 4 import flash.utils.ByteArray; 5 5 6 import org.libspark.gunyarapaint.framework. CanvasContext;6 import org.libspark.gunyarapaint.framework.Painter; 7 7 import org.libspark.gunyarapaint.framework.commands.ICommand; 8 8 … … 35 35 } 36 36 37 public function execute( canvas:CanvasContext):void37 public function execute(painter:Painter):void 38 38 { 39 canvas.currentLayerBlendMode = m_blendMode;40 canvas.pushUndoIfNeed();39 painter.currentLayerBlendMode = m_blendMode; 40 painter.pushUndoIfNeed(); 41 41 } 42 42 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerIndexCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 import org.libspark.gunyarapaint.framework.commands.ICommand; 7 7 … … 34 34 } 35 35 36 public function execute( canvas:CanvasContext):void36 public function execute(painter:Painter):void 37 37 { 38 canvas.layers.currentIndex = m_index;38 painter.layers.currentIndex = m_index; 39 39 } 40 40 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerVisibleCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 import org.libspark.gunyarapaint.framework.commands.ICommand; 7 7 … … 36 36 } 37 37 38 public function execute( canvas:CanvasContext):void38 public function execute(painter:Painter):void 39 39 { 40 canvas.layers.at(m_index).visible = m_visible;41 canvas.pushUndoIfNeed();40 painter.layers.at(m_index).visible = m_visible; 41 painter.pushUndoIfNeed(); 42 42 } 43 43 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SwapLayerCommand.as
r3505 r3524 3 3 import flash.utils.ByteArray; 4 4 5 import org.libspark.gunyarapaint.framework. CanvasContext;5 import org.libspark.gunyarapaint.framework.Painter; 6 6 import org.libspark.gunyarapaint.framework.commands.ICommand; 7 7 … … 36 36 } 37 37 38 public function execute( canvas:CanvasContext):void38 public function execute(painter:Painter):void 39 39 { 40 canvas.layers.swap(m_from, m_to);41 canvas.pushUndoIfNeed();40 painter.layers.swap(m_from, m_to); 41 painter.pushUndoIfNeed(); 42 42 } 43 43 as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/CanvasModule.as
r3521 r3524 21 21 import org.libspark.gunyarapaint.framework.errors.LockedLayerError; 22 22 23 // CanvasModule 24 public class DrawModule 23 public class CanvasModule 25 24 { 26 public function DrawModule(recorder:Recorder)25 public function CanvasModule(recorder:Recorder) 27 26 { 28 27 m_recorder = recorder; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/CanvasModuleContext.as
r3521 r3524 4 4 5 5 // TODO: CanvasModuleContext 6 public final class DrawModuleFactory6 public final class CanvasModuleContext 7 7 { 8 public function DrawModuleFactory(recorder:Recorder)8 public function CanvasModuleContext(recorder:Recorder) 9 9 { 10 10 m_modules = {}; … … 21 21 } 22 22 23 public function add(module:I Drawable):void23 public function add(module:ICanvasModule):void 24 24 { 25 25 m_modules[module.name] = module; 26 26 } 27 27 28 public function getModule(name:String):I Drawable28 public function getModule(name:String):ICanvasModule 29 29 { 30 30 return m_modules[name]; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/CircleModule.as
r3512 r3524 8 8 import org.libspark.gunyarapaint.framework.commands.MoveToCommand; 9 9 10 public final class CircleModule extends DrawModule implements IDrawable10 public final class CircleModule extends CanvasModule implements ICanvasModule 11 11 { 12 12 public static const CIRCLE:String = "circle"; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/DropperModule.as
r3512 r3524 4 4 import org.libspark.gunyarapaint.framework.commands.PenCommand; 5 5 6 public final class DropperModule extends DrawModule implements IDrawable6 public final class DropperModule extends CanvasModule implements ICanvasModule 7 7 { 8 8 public static const DROPPER:String = "dropper"; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/EllipseModule.as
r3512 r3524 3 3 import org.libspark.gunyarapaint.framework.Recorder; 4 4 5 public final class EllipseModule extends DrawModule implements IDrawable5 public final class EllipseModule extends CanvasModule implements ICanvasModule 6 6 { 7 7 public static const ELLIPSE:String = "ellipse"; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/EraserModule.as
r3512 r3524 3 3 import org.libspark.gunyarapaint.framework.Recorder; 4 4 5 public final class EraserModule extends DrawModule implements IDrawable5 public final class EraserModule extends CanvasModule implements ICanvasModule 6 6 { 7 7 public static const ERASER:String = "eraser"; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/FloodFillModule.as
r3512 r3524 5 5 import org.libspark.gunyarapaint.framework.commands.MoveToCommand; 6 6 7 public final class FloodFillModule extends DrawModule implements IDrawable7 public final class FloodFillModule extends CanvasModule implements ICanvasModule 8 8 { 9 9 public static const FLOOD_FILL:String = "floodFill"; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/FreeHandModule.as
r3512 r3524 11 11 import org.libspark.gunyarapaint.framework.commands.PenCommand; 12 12 13 public final class FreeHandModule extends DrawModule implements IDrawable13 public final class FreeHandModule extends CanvasModule implements ICanvasModule 14 14 { 15 15 public static const FREE_HAND:String = "freeHand"; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/ICanvasModule.as
r3521 r3524 5 5 * ICanvasModule 6 6 */ 7 public interface I Drawable7 public interface ICanvasModule 8 8 { 9 9 /** as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/LineModule.as
r3512 r3524 6 6 import org.libspark.gunyarapaint.framework.commands.MoveToCommand; 7 7 8 public final class LineModule extends DrawModule implements IDrawable8 public final class LineModule extends CanvasModule implements ICanvasModule 9 9 { 10 10 public static const LINE:String = "line"; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/PixelModule.as
r3512 r3524 4 4 import org.libspark.gunyarapaint.framework.commands.PixelCommand; 5 5 6 public final class PixelModule extends DrawModule implements IDrawable6 public final class PixelModule extends CanvasModule implements ICanvasModule 7 7 { 8 8 public static const PIXEL:String = "pixel"; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/RectModule.as
r3512 r3524 3 3 import org.libspark.gunyarapaint.framework.Recorder; 4 4 5 public final class RectModule extends DrawModule implements IDrawable5 public final class RectModule extends CanvasModule implements ICanvasModule 6 6 { 7 7 public static const RECT:String = "rect"; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/RoundRectModule.as
r3512 r3524 3 3 import org.libspark.gunyarapaint.framework.Recorder; 4 4 5 public final class RoundRectModule extends DrawModule implements IDrawable5 public final class RoundRectModule extends CanvasModule implements ICanvasModule 6 6 { 7 7 public static const ROUND_RECT:String = "roundRect"; as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/ui/IApplication.as
r3500 r3524 5 5 import org.libspark.gunyarapaint.framework.LayerBitmapCollection; 6 6 import org.libspark.gunyarapaint.framework.Pen; 7 import org.libspark.gunyarapaint.framework.modules.I Drawable;7 import org.libspark.gunyarapaint.framework.modules.ICanvasModule; 8 8 9 9 /** … … 23 23 * 24 24 */ 25 function get module():I Drawable;25 function get module():ICanvasModule; 26 26 27 27 /**

