Changeset 346 for trunk

Timestamp:

Apr 6, 2021, 7:19:02 PM (4 years ago)

Author:

chronos

Message:

• Modified: Optimized help water sign drawing.

Location:

trunk/LocalPlayer

Files:

• Help.pas (modified) (5 diffs)
• PVSB.pas (modified) (4 diffs)
• Select.pas (modified) (3 diffs)
• Term.pas (modified) (2 diffs)

trunk/LocalPlayer/Help.pas

@@ -111 +111 @@
     procedure WaterSign(x0, y0, iix: Integer);
     procedure Search(SearchString: string);
-    procedure OnScroll(var m: TMessage); message WM_VSCROLL;
+    procedure OnScroll(var Msg: TMessage); message WM_VSCROLL;
     procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
   public
@@ -351 +351 @@
 end;
 
-procedure THelpDlg.OnScroll(var m: TMessage);
+procedure THelpDlg.OnScroll(var Msg: TMessage);
 begin
   { TODO: Handled by MouseWheel event
-  if ScrollBar.Process(m) then begin
+  if ScrollBar.Process(Msg) then begin
     Sel := -1;
     SmartUpdateContent(true)
@@ -452 +452 @@
   MaxSum = 9 * 9 * 255 * 75 div 100;
 var
-  x, y, dx, dy, xSrc, ySrc, sum, xx: integer;
+  x, y, dx, dy, xSrc, ySrc, Sum, xx: integer;
   Heaven: array [0..nHeaven] of integer;
-  PaintPtr, CoalPtr: TPixelPointer;
+  PaintPtr: TPixelPointer;
+  CoalPtr: TPixelPointer;
   ImpPtr: array [-1..1] of TPixelPointer;
 begin
@@ -466 +467 @@
   xSrc := iix mod 7 * xSizeBig;
   ySrc := (iix div 7 + 1) * ySizeBig;
-  for y := 0 to ScaleToNative(ySizeBig) * 2 - 1 do
+  PaintPtr := PixelPointer(OffScreen, ScaleToNative(x0), ScaleToNative(y0));
+  CoalPtr := PixelPointer(Templates.Data, ScaleToNative(xCoal), ScaleToNative(yCoal));
+  for dy := -1 to 1 do
+    ImpPtr[dy] := PixelPointer(BigImp, ScaleToNative(xSrc), ScaleToNative(ySrc));
+  for y := 0 to ScaleToNative(ySizeBig) * 2 - 1 do begin
     if ((ScaleToNative(y0) + y) >= 0) and ((ScaleToNative(y0) + y) < ScaleToNative(InnerHeight)) then begin
-      PaintPtr := PixelPointer(OffScreen, 0, ScaleToNative(y0) + y);
-      CoalPtr := PixelPointer(Templates.Data, 0, ScaleToNative(yCoal) + y);
       for dy := -1 to 1 do
         if ((Max(y + ScaleToNative(dy), 0) shr 1) >= 0) and ((Max(y + ScaleToNative(dy), 0) shr 1) < ScaleToNative(ySizeBig)) then
-          ImpPtr[dy] := PixelPointer(BigImp, 0, ScaleToNative(ySrc) + (Max(y + ScaleToNative(dy), 0) shr 1));
-      for x := 0 to ScaleToNative(xSizeBig) * 2 - 1 do begin
-        sum := 0;
+          ImpPtr[dy].SetXY(0, Max(y + ScaleToNative(dy), 0) shr 1);
+      for x := 0 to ScaleToNative(xSizeBig * 2) - 1 do begin
+        Sum := 0;
         for dx := -1 to 1 do begin
-          xx := ScaleToNative(xSrc) + Max((x + ScaleToNative(dx)), 0) shr 1;
+          xx := Max((x + ScaleToNative(dx)), 0) shr 1;
           for dy := -1 to 1 do begin
             ImpPtr[dy].SetX(xx);
@@ -483 +486 @@
               ((y + ScaleToNative(dy)) shr 1 < ScaleToNative(nHeaven)) and
               (ImpPtr[dy].Pixel^.B shl 16 + ImpPtr[dy].Pixel^.G shl 8 +
-              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromNative(y) + dy) shr 1]) then
-              sum := sum + 9 * 255
+              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromNative(y + ScaleToNative(dy))) shr 1]) then
+              Sum := Sum + 9 * 255
             else
-              sum := sum + ImpPtr[dy].Pixel^.B + 5 * ImpPtr[dy].Pixel^.G + 3 *
+              Sum := Sum + ImpPtr[dy].Pixel^.B + 5 * ImpPtr[dy].Pixel^.G + 3 *
                 ImpPtr[dy].Pixel^.R;
           end;
         end;
-        if sum < MaxSum then begin // no saturation
-          CoalPtr.SetX(ScaleToNative(xCoal) + x);
-          sum := 1 shl 22 - (MaxSum - sum) * (256 - CoalPtr.Pixel^.B * 2);
-          PaintPtr.SetX(x0 + x);
-          PaintPtr.Pixel^.B := PaintPtr.Pixel^.B * sum shr 22;
-          PaintPtr.Pixel^.G := PaintPtr.Pixel^.G * sum shr 22;
-          PaintPtr.Pixel^.R := PaintPtr.Pixel^.R * sum shr 22;
+        if Sum < MaxSum then begin // no saturation
+          Sum := 1 shl 22 - (MaxSum - Sum) * (256 - CoalPtr.Pixel^.B * 2);
+          PaintPtr.Pixel^.B := Min(PaintPtr.Pixel^.B * Sum shr 22, 255);
+          PaintPtr.Pixel^.G := Min(PaintPtr.Pixel^.G * Sum shr 22, 255);
+          PaintPtr.Pixel^.R := Min(PaintPtr.Pixel^.R * Sum shr 22, 255);
         end;
+        PaintPtr.NextPixel;
+        CoalPtr.NextPixel;
       end;
     end;
+    PaintPtr.NextLine;
+    CoalPtr.NextLine;
+  end;
   Offscreen.EndUpdate;
   BigImp.EndUpdate;

trunk/LocalPlayer/PVSB.pas

@@ -32 +32 @@
     procedure Init(Max, PageSize: Integer);
     procedure SetPos(Pos: Integer);
-    function Process(const m: TMessage): boolean;
+    function Process(const Msg: TMessage): boolean;
     function ProcessMouseWheel(Delta: Integer): Boolean;
     procedure Show(Visible: boolean);
@@ -65 +65 @@
 end;
 
-function TPVScrollBar.Process(const m: TMessage): boolean;
+function TPVScrollBar.Process(const Msg: TMessage): boolean;
 var
   NewPos: integer;
@@ -73 +73 @@
     else
     begin
-      if (m.wParam and $ffff) in [SB_THUMBPOSITION, SB_THUMBTRACK] then
+      if (Msg.wParam and $ffff) in [SB_THUMBPOSITION, SB_THUMBTRACK] then
       begin
-        result := ((m.wParam shr 16) and $ffff) <> ScrollBar.Position;
-        ScrollBar.Position := (m.wParam shr 16) and $ffff;
+        result := ((Msg.wParam shr 16) and $ffff) <> ScrollBar.Position;
+        ScrollBar.Position := (Msg.wParam shr 16) and $ffff;
       end else begin
-        case (m.wParam and $ffff) of
+        case (Msg.wParam and $ffff) of
           SB_LINEUP:
             NewPos := ScrollBar.Position - 1;
@@ -95 +95 @@
           NewPos := Max - ScrollBar.PageSize + 1;
         result := NewPos <> ScrollBar.Position;
-        if (NewPos <> ScrollBar.Position) or ((m.wParam and $ffff) = SB_ENDSCROLL) then
+        if (NewPos <> ScrollBar.Position) or ((Msg.wParam and $ffff) = SB_ENDSCROLL) then
         begin
           ScrollBar.Position := NewPos;

trunk/LocalPlayer/Select.pas

@@ -45 +45 @@
   private
     Kind: TListKind;
-    LineDistance, MaxLines, cixProject, pView, Sel, DispLines, Layer, nColumn,
-      TechNameSpace, ScienceNation: integer;
+    LineDistance: Integer;
+    MaxLines: Integer;
+    cixProject: Integer;
+    pView: Integer;
+    Sel: Integer;
+    DispLines: Integer;
+    Layer: Integer;
+    nColumn: Integer;
+    TechNameSpace: Integer;
+    ScienceNation: Integer;
     sb: TPVScrollbar;
     Lines, FirstShrinkedLine: array [0 .. MaxLayer - 1] of integer;
     code: array [0 .. MaxLayer - 1, 0 .. 4095] of integer;
     Column: array [0 .. nPl - 1] of integer;
-    Closable, MultiPage: boolean;
+    Closable: Boolean;
+    MultiPage: Boolean;
     ScienceNationDotBuffer: TBitmap;
     procedure ScrollBarUpdate(Sender: TObject);
@@ -58 +67 @@
     function RenameCity(cix: integer): boolean;
     function RenameModel(mix: integer): boolean;
-    procedure OnScroll(var m: TMessage); message WM_VSCROLL;
+    procedure OnScroll(var Msg: TMessage); message WM_VSCROLL;
     procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
   public
@@ -133 +142 @@
 end;
 
-procedure TListDlg.OnScroll(var m: TMessage);
+procedure TListDlg.OnScroll(var Msg: TMessage);
 begin
   { TODO: Handled by MouseWheel event
-  if sb.Process(m) then  begin
+  if sb.Process(Msg) then  begin
     Sel := -2;
     SmartUpdateContent(true);

trunk/LocalPlayer/Term.pas

@@ -322 +322 @@
     procedure LoadSettings;
     procedure SaveSettings;
-    procedure OnScroll(var m: TMessage); message WM_VSCROLL;
+    procedure OnScroll(var Msg: TMessage); message WM_VSCROLL;
     procedure OnEOT(var Msg: TMessage); message WM_EOT;
     procedure SoundPreload(Check: TSoundBlocks);
@@ -3668 +3668 @@
 end;
 
-procedure TMainScreen.OnScroll(var m: TMessage);
-begin
-  if sb.Process(m) then begin
+procedure TMainScreen.OnScroll(var Msg: TMessage);
+begin
+  if sb.Process(Msg) then begin
     PanelPaint;
     Update;