Changeset 514 for trunk

Timestamp:

Jan 3, 2024, 3:05:32 PM (12 months ago)

Author:

chronos

Message:

• Modified: LogoBuffer is in fact general DrawBuffer. Use single DrawBuffer for all units.
• Modified: Improved fractional scaling.

Location:

trunk

Files:

• LocalPlayer/MessgEx.pas (modified) (5 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (6 diffs)
• Packages/DpiControls/Dpi.Common.pas (modified) (6 diffs)
• Start.pas (modified) (7 diffs)

trunk/LocalPlayer/MessgEx.pas

@@ -45 +45 @@
   private
     MovieCancelled: Boolean;
-    procedure PaintBook(ca: TCanvas; X, Y, clPage, clCover: Integer);
+    procedure PaintBook(Canvas: TCanvas; X, Y, clPage, clCover: Integer);
     procedure PaintMyArmy;
     procedure PaintEnemyArmy;
@@ -221 +221 @@
 end;
 
-procedure TMessgExDlg.PaintBook(ca: TCanvas; X, Y, clPage, clCover: Integer);
+procedure TMessgExDlg.PaintBook(Canvas: TCanvas; X, Y, clPage, clCover: Integer);
 const
   xScrewed = 77;
@@ -238 +238 @@
   Height: Integer;
 begin
-  Width := 56;
-  Height := 40;
+  Width := xSizeBig;
+  Height := ySizeBig;
   if IconIndex >= 0 then begin
     xIcon := IconIndex mod 7 * xSizeBig;
@@ -292 +292 @@
 
   // paint
-  UnshareBitmap(LogoBuffer);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, BookRect.Width, BookRect.Height, ca, X, Y);
+  UnshareBitmap(DrawBuffer);
+  DrawBufferEnsureSize(BookRect.Width, BookRect.Height);
+  BitBltCanvas(DrawBuffer.Canvas, 0, 0, BookRect.Width, BookRect.Height, Canvas, X, Y);
 
   if IconIndex >= 0 then
@@ -299 +300 @@
       for ix := 0 to wScrewed - 1 do
         if Screwed[ix, iy, 3] > 0.01 then
-          LogoBuffer.Canvas.Pixels[xScrewed + ix, yScrewed + iy] :=
+          DrawBuffer.Canvas.Pixels[xScrewed + ix, yScrewed + iy] :=
             Trunc(Screwed[ix, iy, 2] / Screwed[ix, iy, 3]) +
             Trunc(Screwed[ix, iy, 1] / Screwed[ix, iy, 3]) shl 8 +
             Trunc(Screwed[ix, iy, 0] / Screwed[ix, iy, 3]) shl 16;
 
-  ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), BookRect, clCover, clPage);
-
-  BitBltCanvas(ca, X, Y, BookRect.Width, BookRect.Height, LogoBuffer.Canvas, 0, 0);
+  ImageOp_BCC(DrawBuffer, Templates.Data, Point(0, 0), BookRect, clCover, clPage);
+
+  BitBltCanvas(Canvas, X, Y, BookRect.Width, BookRect.Height, DrawBuffer.Canvas, 0, 0);
 end;
 

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -97 +97 @@
   T: TTexture);
 procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: Integer);
+procedure DrawBufferEnsureSize(Width, Height: Integer);
 procedure LoadPhrases;
 procedure Texturize(Dest, Texture: TBitmap; TransparentColor: Cardinal);
@@ -190 +191 @@
   Paper: TBitmap;
   BigImp: TBitmap;
-  LogoBuffer: TBitmap;
+  DrawBuffer: TBitmap;
   FullScreen: Boolean;
   GenerateNames: Boolean;
@@ -1567 +1568 @@
 procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: Integer);
 begin
-  if not Assigned(LogoBuffer) then Exit;
-  UnshareBitmap(LogoBuffer);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, Logo.Width, Logo.Height, Canvas, X, Y);
-  ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), Logo.BoundsRect,
+  if not Assigned(DrawBuffer) then Exit;
+  DrawBufferEnsureSize(Logo.Width, Logo.Height);
+  UnshareBitmap(DrawBuffer);
+  BitBltCanvas(DrawBuffer.Canvas, 0, 0, Logo.Width, Logo.Height, Canvas, X, Y);
+  ImageOp_BCC(DrawBuffer, Templates.Data, Point(0, 0), Logo.BoundsRect,
     LightColor, ShadeColor);
-  BitBltCanvas(Canvas, X, Y, Logo.Width, Logo.Height, LogoBuffer.Canvas, 0, 0);
+  BitBltCanvas(Canvas, X, Y, Logo.Width, Logo.Height, DrawBuffer.Canvas, 0, 0);
+end;
+
+procedure DrawBufferEnsureSize(Width, Height: Integer);
+begin
+  if (DrawBuffer.Width >= Width) and (DrawBuffer.Height >= Height) then Exit;
+  if (DrawBuffer.Width < Width) and (DrawBuffer.Height < Height) then
+    DrawBuffer.SetSize(Width, Height)
+  else if DrawBuffer.Width < Width then DrawBuffer.Width := Width
+  else if DrawBuffer.Height < Height then DrawBuffer.Height := Height;
+  DrawBuffer.Canvas.FillRect(0, 0, DrawBuffer.Width, DrawBuffer.Height);
 end;
 
@@ -1813 +1825 @@
   end;
 
-  if not Assigned(LogoBuffer) then begin
-    LogoBuffer := TBitmap.Create;
-    LogoBuffer.PixelFormat := TPixelFormat.pf24bit;
-    LogoBuffer.SetSize(BigBook.Width, BigBook.Height);
-  end;
-
   LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
   LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');
@@ -1838 +1844 @@
   for Section := Low(TFontType) to High(TFontType) do
     UniFont[Section] := TFont.Create;
+
+  DrawBuffer := TBitmap.Create;
+  DrawBuffer.PixelFormat := TPixelFormat.pf24bit;
 
   GrExt := TGraphicSets.Create;
@@ -1877 +1886 @@
   FreeAndNil(Phrases);
   FreeAndNil(Phrases2);
-  if Assigned(LogoBuffer) then FreeAndNil(LogoBuffer);
+  FreeAndNil(DrawBuffer);
   FreeAndNil(BigImp);
   FreeAndNil(Paper);

trunk/Packages/DpiControls/Dpi.Common.pas

@@ -5 +5 @@
 uses
   {$IFDEF WINDOWS}Windows,{$ENDIF}
-  Classes, SysUtils, LCLType, Types, LCLIntf, Graphics, Dpi.Graphics;
+  Classes, SysUtils, LCLType, Types, Math, LCLIntf, Graphics, Dpi.Graphics;
 
 const
@@ -100 +100 @@
 function ScaleToNative(Value: Integer): Integer;
 begin
-  Result := Round(Value * ScreenInfo.Dpi / 96);
+  Result := Ceil(Value * ScreenInfo.Dpi / 96);
 end;
 
@@ -110 +110 @@
 function ScaleFromNative(Value: Integer): Integer;
 begin
-  Result := Round(Value * 96 / ScreenInfo.Dpi);
+  Result := Floor(Value * 96 / ScreenInfo.Dpi);
 end;
 
@@ -185 +185 @@
   DstWidth, DstHeight: Integer;
   SrcWidth, SrcHeight: Integer;
+  ReduceWidth, ReduceHeight: Integer;
 begin
   {$IFDEF WINDOWS}
@@ -193 +194 @@
   {$ELSE}
 
-
   DstWidth := ScaleToNativeDist(X, Width);
   DstHeight := ScaleToNativeDist(Y, Height);
   SrcWidth := ScaleToNativeDist(XSrc, Width);
   SrcHeight := ScaleToNativeDist(YSrc, Height);
+  if (Frac(ScaleFloatToNative(XSrc)) > 0) or
+    (Frac(ScaleFloatToNative(X)) > 0) then ReduceWidth := 1
+    else ReduceWidth := 0;
+  if (Frac(ScaleFloatToNative(YSrc)) > 0) or
+    (Frac(ScaleFloatToNative(Y)) > 0) then ReduceHeight := 1
+    else ReduceHeight := 0;
   if (DstWidth = SrcWidth) and (DstHeight = SrcHeight) then begin
     Result := LCLIntf.BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
@@ -204 +210 @@
   end else begin
     Result := LCLIntf.BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
-      DstWidth, DstHeight, SrcDC,
+      DstWidth - ReduceWidth, DstHeight - ReduceHeight, SrcDC,
       ScaleToNative(XSrc), ScaleToNative(YSrc), Rop);
-{    Result := LCLIntfStretchBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
+
+    // Instead calling StretchBlt for entire region try to draw missing part with BitBlt
+    if DstWidth > SrcWidth then begin
+      LCLIntf.BitBlt(DestDC, ScaleToNative(X) + SrcWidth, ScaleToNative(Y),
+        DstWidth - SrcWidth, DstHeight, SrcDC,
+        ScaleToNative(XSrc) + SrcWidth - (DstWidth - SrcWidth), ScaleToNative(YSrc), Rop);
+    end;
+    if DstHeight > SrcHeight then begin
+      LCLIntf.BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y) + SrcHeight,
+        DstWidth, DstHeight - SrcHeight, SrcDC,
+        ScaleToNative(XSrc), ScaleToNative(YSrc) + SrcHeight - (DstHeight - SrcHeight), Rop);
+    end;
+
+  {  Result := LCLIntf.StretchBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
       DstWidth, DstHeight, SrcDC,
       ScaleToNative(XSrc), ScaleToNative(YSrc),
-      SrcWidth, SrcHeight, Rop);
-}  end;
+      SrcWidth, SrcHeight, Rop);}
+  end;
 
 {  Result := LCLIntf.BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),

trunk/Start.pas

@@ -114 +114 @@
     FormerGames: TStringList;
     Maps: TStringList;
-    LogoBuffer: TBitmap;
     // BookDate: string;
     PlayerSlots: TPlayerSlots;
@@ -181 +180 @@
   ActionSideBorder = 24;
   ActionBottomBorder = 10;
-  wBuffer = 91;
   x0Mini = 437;
   y0Mini = 178;
@@ -308 +306 @@
   EmptyPicture.SetSize(64, 64);
   EmptyPicture.Canvas.FillRect(0, 0, EmptyPicture.Width, EmptyPicture.Height);
-  LogoBuffer := TBitmap.Create;
-  LogoBuffer.PixelFormat := TPixelFormat.pf24bit;
-  LogoBuffer.SetSize(wBuffer, 56);
-  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
 
   MiniMap := TMiniMap.Create;
@@ -336 +330 @@
   FreeAndNil(Maps);
   FreeAndNil(EmptyPicture);
-  FreeAndNil(LogoBuffer);
   FreeAndNil(PlayerSlots);
   FreeAndNil(MiniMap);
@@ -537 +530 @@
     $000000, xAction, Y + 21, Phrases2.Lookup(TextItem));
 
-  UnshareBitmap(LogoBuffer);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, 50, 50, Canvas,
+  UnshareBitmap(DrawBuffer);
+  DrawBufferEnsureSize(50, 50);
+  BitBltCanvas(DrawBuffer.Canvas, 0, 0, 50, 50, Canvas,
     xActionIcon - 2, Y - 2);
-  GlowFrame(LogoBuffer, 8, 8, 34, 34, $202020);
+  GlowFrame(DrawBuffer, 8, 8, 34, 34, $202020);
   BitBltCanvas(Canvas, xActionIcon - 2, Y - 2, 50, 50,
-    LogoBuffer.Canvas, 0, 0);
+    DrawBuffer.Canvas, 0, 0);
   BitBltCanvas(Canvas, xActionIcon, Y, 40, 40, BigImp.Canvas,
     (IconIndex mod 7) * xSizeBig + 8, (IconIndex div 7) * ySizeBig);
@@ -637 +631 @@
 
   // Paint menu logo
-  UnshareBitmap(LogoBuffer);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, MenuLogo.Width, MenuLogo.Height, Canvas, 6,
+  UnshareBitmap(DrawBuffer);
+  DrawBufferEnsureSize(MenuLogo.Width, MenuLogo.Height);
+  BitBltCanvas(DrawBuffer.Canvas, 0, 0, MenuLogo.Width, MenuLogo.Height, Canvas, 6,
     3 + 2 * Integer(Tab <> tbMain));
 
-  ImageOp_BCC(LogoBuffer, Templates.Data, 0, 0, MenuLogo.Left, MenuLogo.Top,
+  ImageOp_BCC(DrawBuffer, Templates.Data, 0, 0, MenuLogo.Left, MenuLogo.Top,
     MenuLogo.Width, MenuLogo.Height - 9, $BFBF20, $4040DF); // logo part 1
-  ImageOp_BCC(LogoBuffer, Templates.Data, 10, 27, MenuLogo.Left + 10,
+  ImageOp_BCC(DrawBuffer, Templates.Data, 10, 27, MenuLogo.Left + 10,
     MenuLogo.Top + 27, MenuLogo.Width - 10, 9, $BFBF20, $4040DF); // logo part 2
   BitBltCanvas(Canvas, 6, 3 + 2 * Integer(Tab <> tbMain), MenuLogo.Width, MenuLogo.Height,
-    LogoBuffer.Canvas, 0, 0);
+    DrawBuffer.Canvas, 0, 0);
 
   if Page = pgMain then begin
-   if SelectedAction <> maNone then // mark selected action
-      for I := 0 to (ClientWidth - 2 * ActionSideBorder) div wBuffer + 1 do
-      begin
-        W := ClientWidth - 2 * ActionSideBorder - I * wBuffer;
-        if W > wBuffer then
-          W := wBuffer;
-        H := ActionPitch;
-        if yAction + Integer(SelectedAction) * ActionPitch - 8 + H > ClientHeight - ActionBottomBorder
-        then
-          H := ClientHeight - ActionBottomBorder -
-            (yAction + Integer(SelectedAction) * ActionPitch - 8);
-
-        UnshareBitmap(LogoBuffer);
-        BitBltCanvas(LogoBuffer.Canvas, 0, 0, W, H, Canvas,
-          ActionSideBorder + I * wBuffer, yAction + Integer(SelectedAction) * ActionPitch
-          - 8);
-        MakeBlue(LogoBuffer, 0, 0, W, H);
-        BitBltCanvas(Canvas, ActionSideBorder + I * wBuffer,
-          yAction + Integer(SelectedAction) * ActionPitch - 8, W, H,
-          LogoBuffer.Canvas, 0, 0);
-      end;
+    if SelectedAction <> maNone then begin
+      // Mark selected action
+      W := ClientWidth - 2 * ActionSideBorder;
+      H := ActionPitch;
+      if yAction + Integer(SelectedAction) * ActionPitch - 8 + H > ClientHeight - ActionBottomBorder
+      then
+        H := ClientHeight - ActionBottomBorder -
+          (yAction + Integer(SelectedAction) * ActionPitch - 8);
+
+      UnshareBitmap(DrawBuffer);
+      DrawBufferEnsureSize(W, H);
+      BitBltCanvas(DrawBuffer.Canvas, 0, 0, W, H, Canvas,
+        ActionSideBorder, yAction + Integer(SelectedAction) * ActionPitch - 8);
+      MakeBlue(DrawBuffer, 0, 0, W, H);
+      BitBltCanvas(Canvas, ActionSideBorder, yAction + Integer(SelectedAction) *
+        ActionPitch - 8, W, H, DrawBuffer.Canvas, 0, 0);
+    end;
     Y := yAction;
     for MainAction := Low(TMainActionSet) to High(TMainActionSet) do
@@ -687 +678 @@
               Canvas.Font.Assign(UniFont[ftNormal]);
 
-              UnshareBitmap(LogoBuffer);
-              BitBltCanvas(LogoBuffer.Canvas, 0, 0, LinkArrows.Width, LinkArrows.Height, Canvas,
+              UnshareBitmap(DrawBuffer);
+              DrawBufferEnsureSize(LinkArrows.Width, LinkArrows.Height);
+              BitBltCanvas(DrawBuffer.Canvas, 0, 0, LinkArrows.Width, LinkArrows.Height, Canvas,
                 xActionIcon, Y + 2);
-              ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), LinkArrows.BoundsRect, 0,
+              ImageOp_BCC(DrawBuffer, Templates.Data, Point(0, 0), LinkArrows.BoundsRect, 0,
                 Colors.Canvas.Pixels[clkAge0 - 1, cliDimmedText]);
               BitBltCanvas(Canvas, xActionIcon, Y + 2, LinkArrows.Width, LinkArrows.Height,
-                LogoBuffer.Canvas, 0, 0);
+                DrawBuffer.Canvas, 0, 0);
             end;
         end;