Changeset 5 for trunk

Timestamp:

Sep 16, 2014, 1:21:18 PM (10 years ago)

Author:

chronos

Message:

• Added: 8-bit grayscale color format for testing.
• Added: Canvas, Pen, Brush, line draw test code.

Location:

trunk

Files:

• ColorFormats/UColorGray8.pas (added)
• Forms/UFormMain.lfm (modified) (1 diff)
• LibrePaint.lpi (modified) (2 diffs)
• LibrePaint.lpr (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• UGraphic.pas (modified) (7 diffs)

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 594
+  Left = 514
   Height = 640
-  Top = 327
+  Top = 299
   Width = 920
   Caption = 'LibrePaint'

trunk/LibrePaint.lpi

@@ -33 +33 @@
       </Item1>
     </RequiredPackages>
-    <Units Count="7">
+    <Units Count="8">
       <Unit0>
         <Filename Value="LibrePaint.lpr"/>
@@ -75 +75 @@
         <UnitName Value="UFormMain"/>
       </Unit6>
+      <Unit7>
+        <Filename Value="ColorFormats/UColorGray8.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UColorGray8"/>
+      </Unit7>
     </Units>
   </ProjectOptions>

trunk/LibrePaint.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UCore, UGraphic, UProject, UFormNew, UFormMain, UColorRGBA8
+  Forms, UCore, UGraphic, UProject, UFormNew, UFormMain, UColorRGBA8, 
+UColorGray8
   { you can add units after this };
 

trunk/UCore.pas

@@ -37 +37 @@
 
 uses
-  UFormNew, UFormMain, UColorRGBA8, Forms;
+  UFormNew, UFormMain, Forms, UColorRGBA8, UColorGray8;
 
 { TCore }
@@ -46 +46 @@
 
   ColorManager.RegisterFormat(TGColorFormatRGBA8);
+  ColorManager.RegisterFormat(TGColorFormatGray8);
 
   // Set default
@@ -74 +75 @@
 begin
   Project.Bitmap.Clear;
+  Project.Bitmap.Canvas.Pen.Color.Format := Project.Bitmap.ColorFormat;
+  Project.Bitmap.Canvas.Pen.Color.FromTColor(clWhite);
+  Project.Bitmap.Canvas.Pen.MoveTo(Point(100, 100));
+  Project.Bitmap.Canvas.Pen.LineTo(Point(700, 500));
   FormMain.Redraw;
 end;

trunk/UGraphic.pas

@@ -12 +12 @@
 
   TGColor = class;
+  TGCanvas = class;
 
   TGColorClass = class of TGColor;
@@ -45 +46 @@
     procedure FromTColor(Color: TColor);
     procedure Assign(Source: TGColor); virtual;
+    constructor Create;
     property Channels[Channel: TGColorChannel]: TGColor read GetChannel;
     property Data: PByte read FData;
@@ -56 +58 @@
   private
     FBackgroundColor: TGColor;
+    FCanvas: TGCanvas;
     FColorFormat: TGColorFormatClass;
     FDPI: Integer;
@@ -79 +82 @@
     property Size: TPoint read FSize write SetSize;
     property Pixels[X, Y: Integer]: TGColor read GetPixel write SetPixel;
+    property Canvas: TGCanvas read FCanvas write FCanvas;
   published
   end;
@@ -96 +100 @@
   end;
 
+  { TGPen }
+
+  TGPen = class
+    Canvas: TGCanvas;
+    Color: TGColor;
+    Position: TPoint;
+    procedure MoveTo(Pos: TPoint);
+    procedure LineTo(Pos: TPoint);
+    constructor Create; virtual;
+    destructor Destroy; override;
+  end;
+
+  { TGBrush }
+
+  TGBrush = class
+    Canvas: TGCanvas;
+    Color: TGColor;
+    constructor Create; virtual;
+    destructor Destroy; override;
+  end;
+
+  { TGCanvas }
+
+  TGCanvas = class
+    Brush: TGBrush;
+    Pen: TGPen;
+    Bitmap: TGBitmap;
+    constructor Create; virtual;
+    destructor Destroy; override;
+  end;
+
+
 var
   ColorManager: TGColorManager;
 
 implementation
+
+{ TGBrush }
+
+constructor TGBrush.Create;
+begin
+  Color := TGColor.Create;
+end;
+
+destructor TGBrush.Destroy;
+begin
+  Color.Free;
+  inherited Destroy;
+end;
+
+{ TGPen }
+
+procedure TGPen.MoveTo(Pos: TPoint);
+begin
+  Position := Pos;
+end;
+
+procedure TGPen.LineTo(Pos: TPoint);
+var
+  I: Integer;
+  Len: Integer;
+begin
+  Len := Trunc(Sqrt(Sqr(Position.X - Pos.X) + Sqr(Position.Y - Pos.Y)));
+  for I := 0 to Len - 1 do
+    Canvas.Bitmap.Pixels[Trunc(Position.X + I * (Pos.X - Position.X) / Len),
+      Trunc(Position.Y + I * (Pos.Y - Position.Y) / Len)] := Color;
+end;
+
+constructor TGPen.Create;
+begin
+  Color := TGColor.Create;
+end;
+
+destructor TGPen.Destroy;
+begin
+  Color.Free;
+  inherited Destroy;
+end;
+
+{ TGCanvas }
+
+constructor TGCanvas.Create;
+begin
+  Pen := TGPen.Create;
+  Pen.Canvas := Self;
+  Brush := TGBrush.Create;
+  Brush.Canvas := Self;
+end;
+
+destructor TGCanvas.Destroy;
+begin
+  Pen.Free;
+  Brush.Free;
+  inherited Destroy;
+end;
 
 { TGColorManager }
@@ -233 +328 @@
 procedure TGColor.Assign(Source: TGColor);
 begin
+end;
+
+constructor TGColor.Create;
+begin
+  Format := TGColorFormat;
 end;
 
@@ -343 +443 @@
   ColorFormat := TGColorFormat;
   FBackgroundColor.Format := ColorFormat;
+  FBackgroundColor.FromTColor(clBlack);
+  Canvas := TGCanvas.Create;
+  Canvas.Bitmap := Self;
 end;