Changeset 196 for trunk

Timestamp:

May 7, 2020, 11:42:52 PM (5 years ago)

Author:

chronos

Message:

• Modified: Optimized drawing using BitBlt directly instead of CopyRect which is slower due to additional code.

Location:

trunk

Files:

• Packages/CevoComponents/ScreenTools.pas (modified) (7 diffs)
• Start.pas (modified) (5 diffs)

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -38 +38 @@
 procedure ImageOp_B(dst, Src: TBitmap; xDst, yDst, xSrc, ySrc, w, h: integer);
 procedure ImageOp_BCC(dst, Src: TBitmap;
-  xDst, yDst, xSrc, ySrc, w, h, Color1, Color2: integer);
+  xDst, yDst, xSrc, ySrc, Width, Height, Color1, Color2: integer);
 procedure ImageOp_CCC(bmp: TBitmap; x, y, w, h, Color0, Color1, Color2: integer);
 function BitBltCanvas(DestCanvas: TCanvas; X, Y, Width, Height: Integer;
@@ -615 +615 @@
 end;
 
-procedure ImageOp_BCC(dst, Src: TBitmap;
-  xDst, yDst, xSrc, ySrc, w, h, Color1, Color2: integer);
+procedure ImageOp_BCC(dst, Src: TBitmap; xDst, yDst, xSrc, ySrc, Width, Height,
+  Color1, Color2: integer);
 // Src is template
 // B channel = background amp (old Dst content), 128=original brightness
@@ -626 +626 @@
 begin
   if xDst < 0 then begin
-    w := w + xDst;
+    Width := Width + xDst;
     xSrc := xSrc - xDst;
     xDst := 0;
   end;
   if yDst < 0 then begin
-    h := h + yDst;
+    Height := Height + yDst;
     ySrc := ySrc - yDst;
     yDst := 0;
   end;
-  if xDst + w > dst.Width then
-    w := dst.Width - xDst;
-  if yDst + h > dst.Height then
-    h := dst.Height - yDst;
-  if (w < 0) or (h < 0) then
+  if xDst + Width > dst.Width then
+    Width := dst.Width - xDst;
+  if yDst + Height > dst.Height then
+    Height := dst.Height - yDst;
+  if (Width < 0) or (Height < 0) then
     exit;
 
@@ -646 +646 @@
   SrcPixel.Init(Src, xSrc, ySrc);
   DstPixel.Init(Dst, xDst, yDst);
-  for iy := 0 to h - 1 do begin
-    for ix := 0 to w - 1 do begin
+  for iy := 0 to Height - 1 do begin
+    for ix := 0 to Width - 1 do begin
       trans := SrcPixel.Pixel^.B * 2; // green channel = transparency
       amp1 := SrcPixel.Pixel^.G * 2;
@@ -654 +654 @@
         Value := (DstPixel.Pixel^.B * trans + ((Color2 shr 16) and $FF) *
           amp2 + ((Color1 shr 16) and $FF) * amp1) div $FF;
-        if Value < 256 then
-          DstPixel.Pixel^.B := Value
-        else
-          DstPixel.Pixel^.B := 255;
+        DstPixel.Pixel^.B := Min(Value, 255);
+
         Value := (DstPixel.Pixel^.G * trans + ((Color2 shr 8) and $FF) *
           amp2 + ((Color1 shr 8) and $FF) * amp1) div $FF;
-        if Value < 256 then
-          DstPixel.Pixel^.G := Value
-        else
-          DstPixel.Pixel^.G := 255;
+        DstPixel.Pixel^.G := Min(Value, 255);
+
         Value := (DstPixel.Pixel^.R * trans + (Color2 and $FF) *
           amp2 + (Color1 and $FF) * amp1) div $FF;
-        if Value < 256 then
-          DstPixel.Pixel^.R := Value
-        else
-          DstPixel.Pixel^.R := 255;
+        DstPixel.Pixel^.R := Min(Value, 255);
       end;
+
       SrcPixel.NextPixel;
       DstPixel.NextPixel;
@@ -733 +727 @@
   SrcCanvas: TCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
 begin
-  {Assert(Rop = SRCCOPY);}
-  if Rop = SRCCOPY then begin
-    DestCanvas.CopyRect(Rect(X, Y, X + Width, Y + Height), SrcCanvas,
-      Rect(XSrc, YSrc, XSrc + Width, YSrc + Height));
-    Result := True;
-  end else Result := BitBlt(DestCanvas.Handle, X, Y, Width, Height, SrcCanvas.Handle, XSrc, YSrc, Rop);
+  Result := BitBlt(DestCanvas.Handle, X, Y, Width, Height, SrcCanvas.Handle, XSrc, YSrc, Rop);
 end;
 
@@ -1376 +1365 @@
 procedure PaintLogo(ca: TCanvas; x, y, clLight, clShade: Integer);
 begin
+  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
   BitBltCanvas(LogoBuffer.Canvas, 0, 0, wLogo, hLogo, ca, x, y);
   ImageOp_BCC(LogoBuffer, Templates, 0, 0, 1, 1, wLogo, hLogo,

trunk/Start.pas

@@ -721 +721 @@
   BiColorTextOut(Canvas, Colors.Canvas.Pixels[clkAge0 - 1, cliDimmedText],
     $000000, xAction, y + 21, Phrases2.Lookup(TextItem));
+
+  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
   BitBltCanvas(LogoBuffer.Canvas, 0, 0, 50, 50, Canvas,
     xActionIcon - 2, y - 2);
@@ -817 +820 @@
       TabOffset + (Integer(Tab) + 1) * TabSize + 2, TabHeight, MainTexture.clBevelShade,
       MainTexture.clBevelShade); // Tab shadow
+  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
   BitBltCanvas(LogoBuffer.Canvas, 0, 0, 36, 36, Canvas, 6,
     3 + 2 * integer(Tab <> tbMain));
@@ -827 +832 @@
     LogoBuffer.Canvas, 0, 0);
 
-  if Page = pgMain then
-  begin
+  if Page = pgMain then begin
     if SelectedAction <> maNone then // mark selected action
       for i := 0 to (ClientWidth - 2 * ActionSideBorder) div wBuffer + 1 do
@@ -840 +844 @@
           h := ClientHeight - ActionBottomBorder -
             (yAction + Integer(SelectedAction) * ActionPitch - 8);
+        // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+        LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
         BitBltCanvas(LogoBuffer.Canvas, 0, 0, w, h, Canvas,
           ActionSideBorder + i * wBuffer, yAction + Integer(SelectedAction) * ActionPitch
@@ -864 +870 @@
                 Phrases2.Lookup('ACTIONHEADER_WEB'));
               Canvas.Font.Assign(UniFont[ftNormal]);
+              // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+              LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
               BitBltCanvas(LogoBuffer.Canvas, 0, 0, 91, 25, Canvas,
                 xActionIcon, y + 2);