Changeset 69 for trunk

Timestamp:

Feb 3, 2020, 12:24:17 AM (5 years ago)

Author:

chronos

Message:

• Modified: Draw to Canvas through TMetaCanvas class.

Location:

trunk

Files:

• Packages/Common/Common.lpk (modified) (2 diffs)
• Packages/Common/Common.pas (modified) (1 diff)
• Packages/Common/UGeometric.pas (added)
• Packages/Common/UMetaCanvas.pas (added)
• UGame.pas (modified) (9 diffs)

trunk/Packages/Common/Common.lpk

@@ -40 +40 @@
     <License Value="GNU/GPL"/>
     <Version Minor="7"/>
-    <Files Count="24">
+    <Files Count="26">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -140 +140 @@
       </Item22>
       <Item23>
-        <Filename Value="ULanguages.pas"/>
-        <UnitName Value="ULanguages"/>
+        <Filename Value="UMetaCanvas.pas"/>
+        <UnitName Value="UMetaCanvas"/>
       </Item23>
       <Item24>
+        <Filename Value="UGeometric.pas"/>
+        <UnitName Value="UGeometric"/>
+      </Item24>
+      <Item25>
         <Filename Value="UTranslator.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="UTranslator"/>
-      </Item24>
+      </Item25>
+      <Item26>
+        <Filename Value="ULanguages.pas"/>
+        <UnitName Value="ULanguages"/>
+      </Item26>
     </Files>
     <i18n>

trunk/Packages/Common/Common.pas

@@ -12 +12 @@
   UMemory, UResetableThread, UPool, ULastOpenedList, URegistry, 
   UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort, 
-  UPersistentForm, UFindFile, UScaleDPI, UTheme, UStringTable, ULanguages, 
-  UTranslator, LazarusPackageIntf;
+  UPersistentForm, UFindFile, UScaleDPI, UTheme, UStringTable, UMetaCanvas, 
+  UGeometric, UTranslator, ULanguages, LazarusPackageIntf;
 
 implementation

trunk/UGame.pas

@@ -195 +195 @@
 
 uses
-  UCore;
+  UCore, UMetaCanvas;
 
 procedure Translate;
@@ -618 +618 @@
   TileCenter: TPoint;
   S: TPoint;
-begin
+  MetaCanvas: TMetaCanvas;
+begin
+  MetaCanvas := TMetaCanvas.Create;
+
   TopBarHeight := ScaleY(24, 96);
-  Canvas.Brush.Style := bsSolid;
-  Canvas.Brush.Color := Core.ThemeManager1.Theme.ColorControl;
-  Canvas.FillRect(0, 0, Canvas.Width, Canvas.Height);
+  MetaCanvas.Brush.Style := bsSolid;
+  MetaCanvas.Brush.Color := Core.ThemeManager1.Theme.ColorControl;
+  MetaCanvas.FillRect(0, 0, MetaCanvas.Width, MetaCanvas.Height);
 
   ValueStr := SScore + ': ' + IntToStr(Score);
-  Canvas.Font.Color := Core.ThemeManager1.Theme.ColorControlText;
-  Canvas.Font.Height := Trunc(TopBarHeight * 0.7);
-  Canvas.TextOut(ScaleY(16, 96), (TopBarHeight - Canvas.TextHeight(ValueStr)) div 2, ValueStr);
+  MetaCanvas.Font.Color := Core.ThemeManager1.Theme.ColorControlText;
+  MetaCanvas.Font.Height := Trunc(TopBarHeight * 0.7);
+  MetaCanvas.TextOut(ScaleY(16, 96), (TopBarHeight - MetaCanvas.TextHeight(ValueStr)) div 2, ValueStr);
 
   ValueStr := STopScore + ': ' + IntToStr(TopScore);
-  Canvas.Font.Color := Core.ThemeManager1.Theme.ColorControlText;
-  Canvas.Font.Height := Trunc(TopBarHeight * 0.7);
-  Canvas.TextOut(ScaleY(136, 96), (TopBarHeight - Canvas.TextHeight(ValueStr)) div 2, ValueStr);
+  MetaCanvas.Font.Color := Core.ThemeManager1.Theme.ColorControlText;
+  MetaCanvas.Font.Height := Trunc(TopBarHeight * 0.7);
+  MetaCanvas.TextOut(ScaleY(136, 96), (TopBarHeight - MetaCanvas.TextHeight(ValueStr)) div 2, ValueStr);
 
   // Form.Canvas.Width and Form.Canvas.Height is not working correctly under Windows.
@@ -647 +650 @@
   TileMargin := Round(Frame.Width / Board.Size.X * 0.03);
 
-  Canvas.Brush.Style := bsSolid;
-  Canvas.Brush.Color := clGray;
-  Canvas.Pen.Style := psClear;
-  Canvas.RoundRect(Frame, ScaleX(Frame.Width div (20 * Board.Size.X), 96),
+  MetaCanvas.Brush.Style := bsSolid;
+  MetaCanvas.Brush.Color := clGray;
+  MetaCanvas.Pen.Style := psClear;
+  MetaCanvas.RoundRect(Frame, ScaleX(Frame.Width div (20 * Board.Size.X), 96),
     ScaleY(Frame.Height div (20 * Board.Size.Y), 96));
 
@@ -657 +660 @@
   TileSize := Point(Frame.Width div Board.Size.X, Frame.Height div Board.Size.Y);
 
-  Canvas.Font.Color := clBlack;
+  MetaCanvas.Font.Color := clBlack;
 
   // Draw static tiles
   for Y := 0 to Board.Size.Y - 1 do
     for X := 0 to Board.Size.X - 1 do begin
-      if (Board.Tiles[Y, X].Action <> taNone) then Canvas.Brush.Color := GetTileColor(0)
-        else Canvas.Brush.Color := GetTileColor(Board.Tiles[Y, X].Value);
-      Canvas.Brush.Style := bsSolid;
+      if (Board.Tiles[Y, X].Action <> taNone) then MetaCanvas.Brush.Color := GetTileColor(0)
+        else MetaCanvas.Brush.Color := GetTileColor(Board.Tiles[Y, X].Value);
+      MetaCanvas.Brush.Style := bsSolid;
       TileRect := Bounds(
         Frame.Left + X * TileSize.X + TileMargin,
         Frame.Top + Y * TileSize.Y + TileMargin,
         TileSize.X - 2 * TileMargin, TileSize.Y - 2 * TileMargin);
-      RenderTile(Canvas, Board.Tiles[Y, X], TileRect, Board.Tiles[Y, X].Action = taNone);
+      RenderTile(MetaCanvas, Board.Tiles[Y, X], TileRect, Board.Tiles[Y, X].Action = taNone);
     end;
 
@@ -676 +679 @@
     for X := 0 to Board.Size.X - 1 do
     if Board.Tiles[Y, X].Action = taMove then begin
-      Canvas.Brush.Color := GetTileColor(Board.Tiles[Y, X].Value);
-      Canvas.Brush.Style := bsSolid;
+      MetaCanvas.Brush.Color := GetTileColor(Board.Tiles[Y, X].Value);
+      MetaCanvas.Brush.Style := bsSolid;
       TileRect := Bounds(
         Frame.Left + X * TileSize.X + Trunc(Board.Tiles[Y, X].Shift.X / 100 * TileSize.X + TileMargin),
         Frame.Top + Y * TileSize.Y + Trunc(Board.Tiles[Y, X].Shift.Y / 100 * TileSize.Y + TileMargin),
         TileSize.X - 2 * TileMargin, TileSize.Y - 2 * TileMargin);
-      RenderTile(Canvas, Board.Tiles[Y, X], TileRect, True);
+      RenderTile(MetaCanvas, Board.Tiles[Y, X], TileRect, True);
     end;
 
@@ -689 +692 @@
     for X := 0 to Board.Size.X - 1 do
     if Board.Tiles[Y, X].Action = taAppear then begin
-      Canvas.Brush.Color := GetTileColor(Board.Tiles[Y, X].Value);
-      Canvas.Brush.Style := bsSolid;
+      MetaCanvas.Brush.Color := GetTileColor(Board.Tiles[Y, X].Value);
+      MetaCanvas.Brush.Style := bsSolid;
       TileRect := Bounds(
         Frame.Left + X * TileSize.X + TileMargin,
@@ -703 +706 @@
       TileRect := Rect(TileCenter.X - S.X div 2, TileCenter.Y - S.Y div 2,
         TileCenter.X + S.X div 2, TileCenter.Y + S.Y div 2);
-      RenderTile(Canvas, Board.Tiles[Y, X], TileRect, True);
+      RenderTile(MetaCanvas, Board.Tiles[Y, X], TileRect, True);
     end;
 
@@ -710 +713 @@
     for X := 0 to Board.Size.X - 1 do
     if Board.Tiles[Y, X].Action = taMerge then begin
-      Canvas.Brush.Color := GetTileColor(Board.Tiles[Y, X].Value);
-      Canvas.Brush.Style := bsSolid;
+      MetaCanvas.Brush.Color := GetTileColor(Board.Tiles[Y, X].Value);
+      MetaCanvas.Brush.Style := bsSolid;
       TileRect := Bounds(
         Frame.Left + X * TileSize.X + TileMargin,
@@ -723 +726 @@
       TileRect := Rect(TileRect.Left - S.X, TileRect.Top - S.Y,
         TileRect.Right + S.X, TileRect.Bottom + S.Y);
-      RenderTile(Canvas, Board.Tiles[Y, X], TileRect, True);
-    end;
+      RenderTile(MetaCanvas, Board.Tiles[Y, X], TileRect, True);
+    end;
+
+  MetaCanvas.DrawTo(Canvas);
+  MetaCanvas.Free;
 end;