Changeset 251

Timestamp:

May 22, 2020, 11:52:44 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Drawing start screen ornament under Windows.

Location:

branches/highdpi

Files:

• LocalPlayer/Term.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (1 diff)
• Packages/CevoComponents/UPixelPointer.pas (modified) (2 diffs)

branches/highdpi/LocalPlayer/Term.pas

@@ -532 +532 @@
 
   SaveOption: array [0 .. nSaveOption - 1] of integer;
-  MiniColors: array [0 .. 11, 0 .. 1] of TColor;
+  MiniColors: array [0 .. $1f, 0 .. 1] of TColor;
   MainMap: TIsoMap;
   CurrentMoveInfo: record AfterMovePaintRadius, AfterAttackExpeller: integer;

branches/highdpi/Packages/CevoComponents/ScreenTools.pas

@@ -981 +981 @@
 var
   P: TColor;
-  X, Y, Light, Shade: Integer;
+  X, Y: Integer;
+  Light, Shade: TColor32;
   PixelPtr: TPixelPointer;
 begin
   if InitOrnamentDone then Exit;
-  Light := MainTexture.clBevelLight;
+  Light := ColorToColor32(MainTexture.clBevelLight);
   // and $FCFCFC shr 2*3+MainTexture.clBevelShade and $FCFCFC shr 2;
-  Shade := MainTexture.clBevelShade and $FCFCFC shr 2 * 3 +
-    MainTexture.clBevelLight and $FCFCFC shr 2;
+  Shade := ColorToColor32(MainTexture.clBevelShade and $FCFCFC shr 2 * 3 +
+    MainTexture.clBevelLight and $FCFCFC shr 2);
   GrExt[HGrSystem2].Data.BeginUpdate;
   PixelPtr := PixelPointer(GrExt[HGrSystem2].Data, ScaleToNative(xOrna), ScaleToNative(yOrna));
-  for Y := 0 to ScaleToNative(hOrna) - 1 do begin
-    for X := 0 to ScaleToNative(wOrna) - 1 do begin
-      P := Color32ToColor(PixelPtr.Pixel^.ARGB);
-      if P = $0000FF then PixelPtr.Pixel^.ARGB := ColorToColor32(Light)
-      else if P = $FF0000 then PixelPtr.Pixel^.ARGB := ColorToColor32(Shade);
-      PixelPtr.NextPixel;
-    end;
-    PixelPtr.NextLine;
+  if PixelPtr.BytesPerPixel = 3 then begin
+    for Y := 0 to ScaleToNative(hOrna) - 1 do begin
+      for X := 0 to ScaleToNative(wOrna) - 1 do begin
+        P := Color32ToColor(PixelPtr.Pixel^.GetRGB);
+        if P = $0000FF then PixelPtr.Pixel^.SetRGB(Light)
+        else if P = $FF0000 then PixelPtr.Pixel^.SetRGB(Shade);
+        PixelPtr.NextPixel;
+      end;
+      PixelPtr.NextLine;
+    end;
+  end else begin
+    for Y := 0 to ScaleToNative(hOrna) - 1 do begin
+      for X := 0 to ScaleToNative(wOrna) - 1 do begin
+        P := Color32ToColor(PixelPtr.Pixel^.ARGB);
+        if P = $0000FF then PixelPtr.Pixel^.ARGB := Light
+        else if P = $FF0000 then PixelPtr.Pixel^.ARGB := Shade;
+        PixelPtr.NextPixel;
+      end;
+      PixelPtr.NextLine;
+    end;
   end;
   InitOrnamentDone := True;

branches/highdpi/Packages/CevoComponents/UPixelPointer.pas

@@ -9 +9 @@
   TColor32 = type Cardinal;
   TColor32Component = (ccBlue, ccGreen, ccRed, ccAlpha);
+
+  { TPixel32 }
+
   TPixel32 = packed record
+    procedure SetRGB(Color: TColor32);
+    function GetRGB: TColor32;
     case Integer of
       0: (B, G, R, A: Byte);
@@ -42 +47 @@
 
 implementation
+
+{ TPixel32 }
+
+procedure TPixel32.SetRGB(Color: TColor32);
+begin
+  B := Color and $ff;
+  G := (Color shr 8) and $ff;
+  R := (Color shr 16) and $ff;
+end;
+
+function TPixel32.GetRGB: TColor32;
+begin
+  Result := ARGB and $ffffff;
+end;
 
 { TPixelPointer }