Changeset 315 for trunk/LocalPlayer

Timestamp:

Mar 18, 2021, 10:58:28 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Gamma was incorrectly applied to images with transparency colors.
• Modified: Change Templates to GraphicSet so it can also have description of its items.
• Modified: Use TextExtent instead of both TextWidth and TextHeight.

Location:

trunk/LocalPlayer

Files:

• Draft.pas (modified) (2 diffs)
• Help.pas (modified) (1 diff)
• IsoEngine.pas (modified) (1 diff)
• MessgEx.pas (modified) (2 diffs)
• NatStat.pas (modified) (1 diff)
• Select.pas (modified) (1 diff)
• TechTree.pas (modified) (3 diffs)
• Term.pas (modified) (7 diffs)
• Tribes.pas (modified) (1 diff)

trunk/LocalPlayer/Draft.pas

@@ -275 +275 @@
           x := xDomain + d * DomainPitch;
           if d = Domain then
-            ImageOp_BCC(offscreen, Templates, x, yDomain, 142, 246 + 37 * d, 36,
+            ImageOp_BCC(offscreen, Templates.Data, x, yDomain, 142, 246 + 37 * d, 36,
               36, 0, $00C0FF)
           else
-            ImageOp_BCC(offscreen, Templates, x, yDomain, 142, 246 + 37 * d, 36,
+            ImageOp_BCC(offscreen, Templates.Data, x, yDomain, 142, 246 + 37 * d, 36,
               36, 0, $606060);
         end;
@@ -300 +300 @@
       for i := 0 to MaxWeight - 1 do
         if i < Weight then
-          ImageOp_BCC(offscreen, Templates, xWeight + 20 * i, yWeight, 123, 400,
+          ImageOp_BCC(offscreen, Templates.Data, xWeight + 20 * i, yWeight, 123, 400,
             18, 20, 0, $949494)
         else
-          ImageOp_BCC(offscreen, Templates, xWeight + 20 * i, yWeight, 105, 400,
+          ImageOp_BCC(offscreen, Templates.Data, xWeight + 20 * i, yWeight, 105, 400,
             18, 20, 0, $949494);
     end;

trunk/LocalPlayer/Help.pas

@@ -465 +465 @@
     if ((ScaleToNative(y0) + y) >= 0) and ((ScaleToNative(y0) + y) < ScaleToNative(InnerHeight)) then begin
       PaintPtr := PixelPointer(OffScreen, 0, ScaleToNative(y0) + y);
-      CoalPtr := PixelPointer(Templates, 0, ScaleToNative(yCoal) + 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

trunk/LocalPlayer/IsoEngine.pas

@@ -628 +628 @@
       if Flags and unFortified <> 0 then
       begin
-        { DataCanvas:=GrExt[HGrTerrain].Data.Canvas;
-          MaskCanvas:=GrExt[HGrTerrain].Mask.Canvas;
+        { DataCanvas:=HGrTerrain.Data.Canvas;
+          MaskCanvas:=HGrTerrain.Mask.Canvas;
           TSprite(x,y+16,12*9+7); }
         Sprite(HGrStdUnits, x, y, xxu * 2, yyu * 2, 1 + 6 * (xxu * 2 + 1), 1);

trunk/LocalPlayer/MessgEx.pas

@@ -310 +310 @@
             Trunc(Screwed[ix, iy, 0] / Screwed[ix, iy, 3]) shl 16;
 
-  ImageOp_BCC(LogoBuffer, Templates, 0, 0, xb, yb, wb, hb, clCover, clPage);
+  ImageOp_BCC(LogoBuffer, Templates.Data, 0, 0, xb, yb, wb, hb, clCover, clPage);
 
   BitBltCanvas(ca, x, y, wb, hb, LogoBuffer.Canvas, 0, 0);
@@ -441 +441 @@
         BitBltCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas,
           (ClientWidth - 140) div 2, 24);
-        ImageOp_BCC(Buffer, Templates, 0, 0, 1, 279, 140, 120, 0, $FFFFFF);
+        ImageOp_BCC(Buffer, Templates.Data, 0, 0, 1, 279, 140, 120, 0, $FFFFFF);
         BitBltCanvas(Canvas, (ClientWidth - 140) div 2, 24, 140, 120,
           Buffer.Canvas, 0, 0);

trunk/LocalPlayer/NatStat.pas

@@ -82 +82 @@
   ReportText := TStringList.Create;
   InitButtons();
-  ContactBtn.Template := Templates;
+  ContactBtn.Template := Templates.Data;
   HelpContext := 'DIPLOMACY';
   ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT');

trunk/LocalPlayer/Select.pas

@@ -819 +819 @@
         BitBltCanvas(ScienceNationDot.Canvas, 0, 0, 17, 17, Canvas,
           xScreen - 10, ClientHeight - 27);
-        ImageOp_BCC(ScienceNationDot, Templates, 0, 0, 114, 211, 17, 17,
+        ImageOp_BCC(ScienceNationDot, Templates.Data, 0, 0, 114, 211, 17, 17,
           MainTexture.clBevelShade, Tribe[ScienceNation].Color);
         BitBltCanvas(Canvas, xScreen - 10, ClientHeight - 27, 17, 17,

trunk/LocalPlayer/TechTree.pas

@@ -131 +131 @@
   NewWidth: Integer;
   NewHeight: Integer;
-const
-  TransparentColor: Cardinal = $7F007F;
 begin
   if Image = nil then begin
@@ -156 +154 @@
             TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, s);
             Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1]
-              := TransparentColor;
+              := TransparentColor2;
           end
         end;
@@ -171 +169 @@
     end;
 
-    Texturize(Image, Paper, TransparentColor);
+    Texturize(Image, Paper, TransparentColor2);
   end;
 

trunk/LocalPlayer/Term.pas

@@ -2547 +2547 @@
           Jump[0] := 999999;
         GameMode := Command;
-        for i := 0 to GrExt.Count - 1 do
-          GrExt[i].ResetPixUsed;
+        GrExt.ResetPixUsed;
         IsoEngine.Reset;
         Tribes.Init;
@@ -3512 +3511 @@
   Canvas.Font.Assign(UniFont[ftSmall]);
   InitButtons;
-  EOT.Template := Templates;
+  EOT.Template := Templates.Data;
 end;
 
@@ -4844 +4843 @@
   end;
   if GameMode <> cMovie then
-    ImageOp_BCC(TopBar, Templates, 2, 1, 145, 38, 36, 36, $BFBF20, $4040DF);
+    ImageOp_BCC(TopBar, Templates.Data, 2, 1, 145, 38, 36, 36, $BFBF20, $4040DF);
   if MyRO.nCity > 0 then
   begin
@@ -4860 +4859 @@
 
     // treasury section
-    ImageOp_BCC(TopBar, Templates, xTreasurySection + 8, 1, 145, 1, 36, 36,
+    ImageOp_BCC(TopBar, Templates.Data, xTreasurySection + 8, 1, 145, 1, 36, 36,
       $40A040, $4030C0);
     s := IntToStr(TrueMoney);
@@ -4867 +4866 @@
     if MyRO.Government <> gAnarchy then
     begin
-      ImageOp_BCC(TopBar, Templates, xTreasurySection + 48, 22, 124, 1, 14, 14,
+      ImageOp_BCC(TopBar, Templates.Data, xTreasurySection + 48, 22, 124, 1, 14, 14,
         $0000C0, $0080C0);
       if TaxSum >= 0 then
@@ -4878 +4877 @@
 
     // research section
-    ImageOp_BCC(TopBar, Templates, xResearchSection + 8, 1, 145, 75, 36, 36,
+    ImageOp_BCC(TopBar, Templates.Data, xResearchSection + 8, 1, 145, 75, 36, 36,
       $FF0000, $00FFE0);
     if MyData.FarTech <> adNexus then
@@ -4929 +4928 @@
     if (MyData.FarTech <> adNexus) and (ScienceSum > 0) then
     begin
-      ImageOp_BCC(TopBar, Templates, xResearchSection + 48 + CostFactor + 11,
+      ImageOp_BCC(TopBar, Templates.Data, xResearchSection + 48 + CostFactor + 11,
         22, 124, 1, 14, 14, $0000C0, $0080C0);
       s := Format(Phrases.Lookup('TECHGAIN'), [ScienceSum]);

trunk/LocalPlayer/Tribes.pas

@@ -466 +466 @@
             facepix div 10 * 49 + 48] := $000000;
           Gray := $B8B8B8;
-          ImageOp_BCC(faceHGr.Data, Templates,
+          ImageOp_BCC(faceHGr.Data, Templates.Data,
             facepix mod 10 * 65 + 1, facepix div 10 * 49 + 1, 1, 25, 64, 48,
             Gray, Color);