Changeset 170

Timestamp:

Jun 15, 2019, 4:07:03 PM (5 years ago)

Author:

chronos

Message:

• Modified: PixelPointer moved to separate unit.

Location:

trunk

Files:

• LocalPlayer/CityScreen.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/IsoEngine.pas (modified) (1 diff)
• LocalPlayer/MessgEx.pas (modified) (1 diff)
• LocalPlayer/TechTree.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (1 diff)
• LocalPlayer/Wonders.pas (modified) (1 diff)
• Packages/CevoComponents/CevoComponents.lpk (modified) (2 diffs)
• Packages/CevoComponents/CevoComponents.pas (modified) (1 diff)
• Packages/CevoComponents/PixelPointer.pas (added)
• Packages/CevoComponents/ScreenTools.pas (modified) (3 diffs)
• Start.pas (modified) (1 diff)

trunk/LocalPlayer/CityScreen.pas

@@ -90 +90 @@
 
 uses
-  Select, Messg, MessgEx, Help, Tribes, Directories, Math;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math, PixelPointer;
 
 {$R *.lfm}

trunk/LocalPlayer/Help.pas

@@ -107 +107 @@
 
 uses
-  Directories, ClientTools, Term, Tribes, Inp, Messg;
+  Directories, ClientTools, Term, Tribes, Inp, Messg, PixelPointer;
 
 {$R *.lfm}

trunk/LocalPlayer/IsoEngine.pas

@@ -7 +7 @@
   Protocol, ClientTools, ScreenTools, Tribes,
 {$IFNDEF SCR}Term, {$ENDIF}
-  LCLIntf, LCLType, SysUtils, Classes, Graphics;
+  LCLIntf, LCLType, SysUtils, Classes, Graphics, PixelPointer;
 
 type

trunk/LocalPlayer/MessgEx.pas

@@ -73 +73 @@
 
 uses
-  ClientTools, BaseWin, Term, Help, UnitStat, Tribes,
+  ClientTools, BaseWin, Term, Help, UnitStat, Tribes, PixelPointer,
   IsoEngine, Diagram;
 

trunk/LocalPlayer/TechTree.pas

@@ -30 +30 @@
   TechTreeDlg: TTechTreeDlg;
 
+
 implementation
 
 uses
-  Directories;
+  Directories, PixelPointer;
 
 {$R *.lfm}

trunk/LocalPlayer/Term.pas

@@ -463 +463 @@
 uses
   Directories, IsoEngine, CityScreen, Draft, MessgEx, Select, CityType, Help,
-  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego,
+  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, PixelPointer,
   Battle, Rates, TechTree, Registry;
 

trunk/LocalPlayer/Wonders.pas

@@ -38 +38 @@
 
 uses
-  Term, ClientTools, Help, Tribes;
+  Term, ClientTools, Help, Tribes, PixelPointer;
 
 {$R *.lfm}

trunk/Packages/CevoComponents/CevoComponents.lpk

@@ -37 +37 @@
     <Description Value="C-evo components"/>
     <Version Major="1" Minor="2"/>
-    <Files Count="13">
+    <Files Count="14">
       <Item1>
         <Filename Value="Area.pas"/>
@@ -96 +96 @@
         <Filename Value="BaseWin.pas"/>
         <HasRegisterProc Value="True"/>
+        <UnitName Value="BaseWin"/>
       </Item13>
+      <Item14>
+        <Filename Value="PixelPointer.pas"/>
+        <UnitName Value="PixelPointer"/>
+      </Item14>
     </Files>
     <RequiredPkgs Count="2">

trunk/Packages/CevoComponents/CevoComponents.pas

@@ -10 +10 @@
 uses
   Area, ButtonA, ButtonB, ButtonC, ButtonN, EOTButton, ButtonBase, DrawDlg, 
-  Sound, BaseWin, LazarusPackageIntf;
+  Sound, BaseWin, PixelPointer, LazarusPackageIntf;
 
 implementation

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -16 +16 @@
     clPage, clCover: TColor;
   end;
-
-  TColor32 = type cardinal;
-  TColor32Component = (ccBlue, ccGreen, ccRed, ccAlpha);
-  TPixel32 = packed record
-    case integer of
-      0: (B, G, R, A: byte);
-      1: (ARGB: TColor32);
-      2: (Planes: array[0..3] of byte);
-      3: (Components: array[TColor32Component] of byte);
-  end;
-  PPixel32 = ^TPixel32;
-
-  { TPixelPointer }
-
-  TPixelPointer = record
-    Base: PPixel32;
-    Pixel: PPixel32;
-    Line: PPixel32;
-    RelLine: PPixel32;
-    BytesPerPixel: integer;
-    BytesPerLine: integer;
-    procedure NextLine; inline; // Move pointer to start of new base line
-    procedure NextPixel; inline; // Move pointer to next pixel
-    procedure SetXY(X, Y: integer); inline; // Set pixel position relative to base
-    procedure SetX(X: integer); inline; // Set horizontal pixel position relative to base
-    procedure Init(Bitmap: TRasterImage; BaseX: integer = 0; BaseY: integer = 0); inline;
-  end;
-  PPixelPointer = ^TPixelPointer;
 
 {$IFDEF WINDOWS}
@@ -218 +190 @@
 
 uses
-  Directories, Sound, Registry;
+  Directories, Sound, Registry, PixelPointer;
 
 var
@@ -1429 +1401 @@
 end;
 
-{ TPixelPointer }
-
-procedure TPixelPointer.NextLine; inline;
-begin
-  Line := Pointer(Line) + BytesPerLine;
-  Pixel := Line;
-end;
-
-procedure TPixelPointer.NextPixel; inline;
-begin
-  Pixel := Pointer(Pixel) + BytesPerPixel;
-end;
-
-procedure TPixelPointer.SetXY(X, Y: Integer); inline;
-begin
-  Line := Pointer(Base) + Y * BytesPerLine;
-  SetX(X);
-end;
-
-procedure TPixelPointer.SetX(X: Integer); inline;
-begin
-  Pixel := Pointer(Line) + X * BytesPerPixel;
-end;
-
-procedure TPixelPointer.Init(Bitmap: TRasterImage; BaseX: Integer = 0;
-  BaseY: integer = 0); inline;
-begin
-  BytesPerLine := Bitmap.RawImage.Description.BytesPerLine;
-  BytesPerPixel := Bitmap.RawImage.Description.BitsPerPixel shr 3;
-  Base := PPixel32(Bitmap.RawImage.Data + BaseX * BytesPerPixel + BaseY * BytesPerLine);
-  SetXY(0, 0);
-end;
-
 procedure LoadPhrases;
 begin

trunk/Start.pas

@@ -155 +155 @@
 
 uses
-  Directories, Direct, ScreenTools, Inp, Back, Locale;
+  Directories, Direct, ScreenTools, Inp, Back, Locale, PixelPointer;
 
 {$R *.lfm}