Changeset 13 for trunk/Packages/Kernel/UScreen.pas

Timestamp:

Sep 25, 2017, 2:48:08 PM (7 years ago)

Author:

chronos

Message:

• Added: Drawing relative to Canvas. In case of Window drawing relative to Window.
• Modified: Use custom TPoint and TRectangle if possible.

File:

• trunk/Packages/Kernel/UScreen.pas (modified) (5 diffs)

trunk/Packages/Kernel/UScreen.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Math;
+  SysUtils, Math, UGraphics;
 
 type
-  TColorFormat = (cfRGBA8, cfGray8);
-  TColor = Integer;
+  TScreen = class;
+
+  TScreenCanvas = class(TCanvas)
+    Screen: TScreen;
+    procedure DrawText(Pos: TPoint; Text: string; Color: TColor); override;
+    procedure DrawLine(P1, P2: TPoint; Color: TColor); override;
+    procedure DrawRect(Rect: TRectangle; Color: TColor); override;
+    procedure SetPixel(P: TPoint; Color: TColor); override;
+  end;
 
   { TScreen }
@@ -22 +29 @@
     BytesPerLine: Integer;
     VideoMemory: PByte;
-    procedure DrawText(Pos: TPoint; Text: string; Color: TColor);
-    procedure DrawLine(P1, P2: TPoint; Color: TColor);
-    procedure DrawRect(Rect: TRect; Color: TColor);
-    procedure SetPixel(P: TPoint; Color: TColor);
+    Canvas: TCanvas;
     procedure VideoMemoryUpdated;
   end;
@@ -34 +38 @@
   UDevice;
 
-{ TScreen }
+{ TScreenCanvas }
 
-procedure TScreen.DrawText(Pos: TPoint; Text: string; Color: TColor);
+procedure TScreenCanvas.DrawText(Pos: TPoint; Text: string; Color: TColor);
 begin
 
 end;
 
-procedure TScreen.DrawLine(P1, P2: TPoint; Color: TColor);
+procedure TScreenCanvas.DrawLine(P1, P2: TPoint; Color: TColor);
 var
   I: Integer;
@@ -47 +51 @@
   if Abs(P2.X - P1.X) > Abs(P2.Y - P1.Y) then begin
     for I := 0 to Abs(P2.X - P1.X) - 1 do
-      SetPixel(Point(Trunc(P1.X + I * Sign(P2.X - P1.X)),
+      SetPixel(TPoint.Create(Trunc(P1.X + I * Sign(P2.X - P1.X)),
         Trunc(P1.Y + (P2.Y - P1.Y) / Abs(P2.X - P1.X) * I)), Color);
   end else begin
     for I := 0 to Abs(P2.Y - P1.Y) - 1 do
-      SetPixel(Point(Trunc(P1.X + (P2.X - P1.X) / Abs(P2.Y - P1.Y) * I),
+      SetPixel(TPoint.Create(Trunc(P1.X + (P2.X - P1.X) / Abs(P2.Y - P1.Y) * I),
         Trunc(P1.Y + I * Sign(P2.Y - P1.Y))), Color);
   end;
-  VideoMemoryUpdated;
+  Screen.VideoMemoryUpdated;
 end;
 
-procedure TScreen.DrawRect(Rect: TRect; Color: TColor);
+procedure TScreenCanvas.DrawRect(Rect: TRectangle; Color: TColor);
 var
   X, Y: Integer;
@@ -63 +67 @@
   for Y := Rect.Top to Rect.Bottom do
   for X := Rect.Left to Rect.Right do
-    SetPixel(Point(X, Y), Color);
+    SetPixel(TPoint.Create(X, Y), Color);
 end;
 
-procedure TScreen.SetPixel(P: TPoint; Color: TColor);
+procedure TScreenCanvas.SetPixel(P: TPoint; Color: TColor);
 begin
-  if Assigned(VideoMemory) then
-    PInteger(VideoMemory + P.X * BytesPerPixel + P.Y * BytesPerLine)^ := Color;
+  if Assigned(Screen.VideoMemory) and
+    TRectangle.Create(TPoint.Create(0, 0), Screen.Size).PointInside(P) then
+    PInteger(Screen.VideoMemory + P.X * Screen.BytesPerPixel + P.Y * Screen.BytesPerLine)^ := Color;
 end;
+
+
+{ TScreen }
 
 procedure TScreen.VideoMemoryUpdated;