Changeset 68

Timestamp:

Jan 14, 2017, 8:42:46 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Removed last occurences of Bitmap.ScanLine usage and adjusted to support Linux 32-bit RAW image format.
• Modified: Simplified LoadLocalizedGraphicFile function as it do same thing as LoadGraphicFile just with localized directory.

Location:

trunk

Files:

• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/IsoEngine.pas (modified) (5 diffs)
• ScreenTools.pas (modified) (4 diffs)

trunk/LocalPlayer/Help.pas

@@ -960 +960 @@
             inc(p)
           until (p > length(s)) or (s[p] = '\');
-          if LoadLocalizedGraphicFile(ExtPic, 'Help' + DirectorySeparator + copy(s, 2, p - 2)) then
+          if LoadGraphicFile(ExtPic, LocalizedFilePath('Help' +
+            DirectorySeparator + copy(s, 2, p - 2))) then
           begin
             MainText.AddLine('', pkExternal);

trunk/LocalPlayer/IsoEngine.pas

@@ -104 +104 @@
 
 function ApplyTileSize(xxtNew, yytNew: integer): boolean;
-type
-  TLine = array [0 .. INFIN, 0 .. 2] of Byte;
 var
   i, x, y, xSrc, ySrc, HGrTerrainNew, HGrCitiesNew, age, size: integer;
   LandMore, OceanMore, DitherMask, Mask24: TBitmap;
-  MaskLine: array [0 .. 32 * 3 - 1] of ^TLine; // 32 = assumed maximum for yyt
+  MaskLine: array [0 .. 32 * 3 - 1] of TPixelPointer; // 32 = assumed maximum for yyt
   Border: boolean;
 begin
@@ -346 +344 @@
   begin
     for i := 0 to yyt * 3 - 1 do
-      MaskLine[i] := Mask24.ScanLine[1 + ySrc * (yyt * 3 + 1) + i];
+      MaskLine[i].Init(Mask24, 0, 1 + ySrc * (yyt * 3 + 1) + i);
     for xSrc := 0 to 9 - 1 do
     begin
@@ -353 +351 @@
       repeat
         Border := true;
-        for y := 0 to yyt * 3 - 1 do
-          if MaskLine[y]^[1 + xSrc * (xxt * 2 + 1) + TSpriteSize[i].Left, 0] = 0
-          then
-            Border := false;
-        if Border then
-          inc(TSpriteSize[i].Left);
+        for y := 0 to yyt * 3 - 1 do begin
+          MaskLine[y].SetX(1 + xSrc * (xxt * 2 + 1) + TSpriteSize[i].Left);
+          if MaskLine[y].Pixel^.B = 0 then Border := false;
+        end;
+        if Border then Inc(TSpriteSize[i].Left);
       until not Border or (TSpriteSize[i].Left = xxt * 2 - 1);
       TSpriteSize[i].Top := 0;
       repeat
         Border := true;
-        for x := 0 to xxt * 2 - 1 do
-          if MaskLine[TSpriteSize[i].Top]^[1 + xSrc * (xxt * 2 + 1) + x, 0] = 0
-          then
-            Border := false;
-        if Border then
-          inc(TSpriteSize[i].Top);
+        for x := 0 to xxt * 2 - 1 do begin
+          MaskLine[TSpriteSize[i].Top].SetX(1 + xSrc * (xxt * 2 + 1) + x);
+          if MaskLine[TSpriteSize[i].Top].Pixel^.B = 0 then Border := false;
+        end;
+        if Border then inc(TSpriteSize[i].Top);
       until not Border or (TSpriteSize[i].Top = yyt * 3 - 1);
       TSpriteSize[i].Right := xxt * 2;
       repeat
         Border := true;
-        for y := 0 to yyt * 3 - 1 do
-          if MaskLine[y]^[xSrc * (xxt * 2 + 1) + TSpriteSize[i].Right, 0] = 0
-          then
-            Border := false;
-        if Border then
-          dec(TSpriteSize[i].Right);
+        for y := 0 to yyt * 3 - 1 do begin
+          MaskLine[y].SetX(xSrc * (xxt * 2 + 1) + TSpriteSize[i].Right);
+          if MaskLine[y].Pixel^.B = 0 then Border := false;
+        end;
+        if Border then Dec(TSpriteSize[i].Right);
       until not Border or (TSpriteSize[i].Right = TSpriteSize[i].Left);
       TSpriteSize[i].Bottom := yyt * 3;
       repeat
         Border := true;
-        for x := 0 to xxt * 2 - 1 do
-          if MaskLine[TSpriteSize[i].Bottom - 1]^[1 + xSrc * (xxt * 2 + 1) + x,
-            0] = 0 then
-            Border := false;
-        if Border then
-          dec(TSpriteSize[i].Bottom);
+        for x := 0 to xxt * 2 - 1 do begin
+          MaskLine[TSpriteSize[i].Bottom - 1].SetX(1 + xSrc * (xxt * 2 + 1) + x);
+          if MaskLine[TSpriteSize[i].Bottom - 1].Pixel^.B = 0 then Border := false;
+        end;
+        if Border then Dec(TSpriteSize[i].Bottom);
       until not Border or (TSpriteSize[i].Bottom = TSpriteSize[i].Top);
     end
@@ -930 +924 @@
 procedure TIsoMap.PaintTileObjects(x, y, Loc, CityLoc, CityOwner: integer;
   UseBlink: boolean);
-type
-  TLine = array [0 .. 9 * 65, 0 .. 2] of Byte;
 var
   p1, p2, uix, cix, dy, Loc1, Tile, Multi, Destination: integer;
@@ -1299 +1291 @@
 
   procedure ShadeOutside(x0, y0, x1, y1, xm, ym: integer);
+
+    procedure MakeDark(Line: PPixelPointer; Length: Integer);
+    var
+      I: Integer;
+    begin
+      for I := 0 to Length - 1 do begin
+        Line^.Pixel^.B := (Line^.Pixel^.B shr 1) and $7f;
+        Line^.Pixel^.G := (Line^.Pixel^.G shr 1) and $7f;
+        Line^.Pixel^.R := (Line^.Pixel^.R shr 1) and $7f;
+        Line^.NextPixel;
+      end;
+    end;
+
   const
     rShade = 3.75;
-
-    procedure MakeDark(Line: pointer; length: integer);
-    type
-      TCardArray = array [0 .. 9999] of Cardinal;
-      PCardArray = ^TCardArray;
-      TByteArray = array [0 .. 9999] of Byte;
-      PByteArray = ^TByteArray;
-    var
-      i, rest: integer;
-    begin
-      for i := length * 3 div 4 - 1 downto 0 do
-        PCardArray(Line)[i] := PCardArray(Line)[i] shr 1 and $7F7F7F7F;
-      rest := (length * 3 div 4) * 4;
-      for i := length * 3 mod 4 - 1 downto 0 do
-        PByteArray(Line)[rest + i] := PByteArray(Line)[rest + i] shr 1 and $7F;
-    end;
-
-  type
-    TLine = array [0 .. 99999, 0 .. 2] of Byte;
   var
     y, wBright: integer;
     y_n, w_n: single;
-    Line: ^TLine;
+    Line: TPixelPointer;
   begin
     FOutput.BeginUpdate;
-    for y := y0 to y1 - 1 do
-    begin
-      Line := FOutput.ScanLine[y];
+    for y := y0 to y1 - 1 do begin
+      Line.Init(FOutput, 0, y);
       y_n := (y - ym) / yyt;
-      if abs(y_n) < rShade then
-      begin
+      if abs(y_n) < rShade then begin
+        // Darken left and right parts of elipsis
         w_n := sqrt(sqr(rShade) - sqr(y_n));
         wBright := trunc(w_n * xxt + 0.5);
-        MakeDark(@Line[x0], xm - x0 - wBright);
-        MakeDark(@Line[xm + wBright], x1 - xm - wBright);
-      end
-      else
-        MakeDark(@Line[x0], x1 - x0);
+        Line.SetX(x0);
+        MakeDark(@Line, xm - x0 - wBright);
+        Line.SetX(xm + wBright);
+        MakeDark(@Line, x1 - xm - wBright);
+      end else begin
+        // Darken entire line
+        Line.SetX(x0);
+        MakeDark(@Line, x1 - x0);
+      end;
     end;
     FOutput.EndUpdate;

trunk/ScreenTools.pas

@@ -43 +43 @@
     procedure Init(Bitmap: TBitmap; X: Integer = 0; Y: Integer = 0); inline;
   end;
+  PPixelPointer = ^TPixelPointer;
 
 {$IFDEF WINDOWS}
@@ -59 +60 @@
 function HexStringToColor(s: string): integer;
 function LoadGraphicFile(bmp: TBitmap; Path: string;
-  Options: integer = 0): boolean;
-function LoadLocalizedGraphicFile(bmp: TBitmap; Path: string;
   Options: integer = 0): boolean;
 function LoadGraphicSet(Name: string): integer;
@@ -417 +416 @@
 end;
 
-procedure ApplyGamma(Start, Stop: pbyte);
-begin
-  while Start < Stop do
-  begin
-    Start^ := GammaLUT[Start^];
-    inc(Start);
-  end;
-end;
-
 function LoadGraphicFile(bmp: TBitmap; Path: string; Options: integer): boolean;
-type
-  TLine = array [0 .. 9999, 0 .. 2] of Byte;
-var
-  FirstLine, LastLine: ^TLine;
+var
+  PixelPtr: TPixelPointer;
   jtex: tjpegimage;
+  X, Y: Integer;
 begin
   result := true;
@@ -474 +463 @@
   if (Options and gfNoGamma = 0) and (Gamma <> 100) then
   begin
-    bmp.BeginUpdate;
-    FirstLine := bmp.ScanLine[0];
-    LastLine := bmp.ScanLine[bmp.Height - 1];
-    if FirstLine < LastLine then
-      ApplyGamma(pointer(FirstLine), @LastLine[bmp.Width])
-    else
-      ApplyGamma(pointer(LastLine), @FirstLine[bmp.Width]);
-    bmp.EndUpdate;
-  end
-end;
-
-function LoadLocalizedGraphicFile(bmp: TBitmap; Path: string;
-  Options: integer): boolean;
-type
-  TLine = array [0 .. 9999, 0 .. 2] of Byte;
-var
-  FirstLine, LastLine: ^TLine;
-  jtex: tjpegimage;
-begin
-  result := true;
-  if Options and gfJPG <> 0 then
-  begin
-    jtex := tjpegimage.create;
-    try
-      jtex.loadfromfile(LocalizedFilePath(Path + '.jpg'));
-    except
-      result := false;
-    end;
-    if result then
-    begin
-      if Options and gfNoGamma = 0 then
-        bmp.PixelFormat := pf24bit;
-      bmp.Width := jtex.Width;
-      bmp.Height := jtex.Height;
-      bmp.Canvas.draw(0, 0, jtex);
-    end;
-    jtex.Free;
-  end
-  else
-  begin
-    try
-      bmp.loadfromfile(LocalizedFilePath(Path + '.bmp'));
-    except
-      result := false;
-    end;
-    if result then
-    begin
-      if Options and gfNoGamma = 0 then
-        bmp.PixelFormat := pf24bit;
-    end
-  end;
-  if not result then
-  begin
-    if Options and gfNoError = 0 then
-      Application.MessageBox(PChar(Format(Phrases.Lookup('FILENOTFOUND'),
-        [Path])), 'C-evo', 0);
-    exit;
-  end;
-  if (Options and gfNoGamma = 0) and (Gamma <> 100) then
-  begin
-    bmp.BeginUpdate;
-    FirstLine := bmp.ScanLine[0];
-    LastLine := bmp.ScanLine[bmp.Height - 1];
-    if FirstLine < LastLine then
-      ApplyGamma(Pointer(FirstLine), @LastLine[bmp.Width])
-    else
-      ApplyGamma(Pointer(LastLine), @FirstLine[bmp.Width]);
-    bmp.EndUpdate;
+    Bmp.BeginUpdate;
+    PixelPtr.Init(bmp, 0, 0);
+    for Y := 0 to Bmp.Height - 1 do begin
+      for X := 0 to Bmp.Width - 1 do begin
+        PixelPtr.Pixel^.B := GammaLUT[PixelPtr.Pixel^.B];
+        PixelPtr.Pixel^.G := GammaLUT[PixelPtr.Pixel^.G];
+        PixelPtr.Pixel^.R := GammaLUT[PixelPtr.Pixel^.R];
+        PixelPtr.NextPixel;
+      end;
+      PixelPtr.NextLine;
+    end;
+    Bmp.EndUpdate;
   end
 end;