hedgewars: comparison hedgewars/uLandGraphics.pas

equal deleted inserted replaced

-:667fb58d7f18
+:5164d17b6374
 Left, Right: LongInt;
 end;
 function  addBgColor(OldColor, NewColor: LongWord): LongWord;
 function  SweepDirty: boolean;
-function  Despeckle(X, Y: LongInt; gfxOnly: boolean): LongWord;
+function  Despeckle(X, Y: LongInt): Boolean;
 procedure Smooth(X, Y: LongInt);
 function  CheckLandValue(X, Y: LongInt; LandFlag: Word): boolean;
 function  DrawExplosion(X, Y, Radius: LongInt): Longword;
 procedure DrawHLinesExplosions(ar: PRangeArray; Radius: LongInt; y, dY: LongInt; Count: Byte);
 procedure DrawTunnel(X, Y, dX, dY: hwFloat; ticks, HalfWidth: LongInt);
 if ((ty and LAND_HEIGHT_MASK) = 0) and
 ((tx and LAND_WIDTH_MASK) = 0) and
 (((Land[ty, tx] and lfBasic) <> 0) or
 ((Land[ty, tx] and lfObject) <> 0)) then
 begin
-Land[ty, tx]:= Land[ty, tx] or lfDamaged;
+if despeckle then
-if despeckle then LandDirty[ty div 32, tx div 32]:= 1;
+begin
+Land[ty, tx]:= Land[ty, tx] or lfDamaged;
+LandDirty[ty div 32, tx div 32]:= 1
+end;
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= cExplosionBorderColor
 else LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
 end
 end;
 y:= Max(cpY, topY);
 h:= Min(cpY + Image^.h, LAND_HEIGHT) - y;
 UpdateLandTexture(x, w, y, h)
 end;
-// was experimenting with applying as damage occurred.
+function Despeckle(X, Y: LongInt): boolean;
-function Despeckle(X, Y: LongInt; gfxOnly: boolean): LongWord;
 var nx, ny, i, j, c, xx, yy: LongInt;
 pixelsweep: boolean;
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
 begin
 xx:= X div 2;
 yy:= Y div 2;
 end;
 pixelsweep:= ((Land[Y, X] and $FF00) = 0) and (LandPixels[yy, xx] <> 0);
-if not pixelsweep and gfxOnly then exit(0);
+if (((Land[Y, X] and lfDamaged) <> 0) and ((Land[Y, X] and lfIndestructible) = 0)) or pixelsweep then
-if ((Land[Y, X] > 255) and ((Land[Y, X] and lfIndestructible) = 0)) or pixelsweep then
 begin
 c:= 0;
 for i:= -1 to 1 do
 for j:= -1 to 1 do
 if (i <> 0) or (j <> 0) then
 if LandPixels[ny, nx] <> 0 then inc(c);
 end
 else if Land[ny, nx] > 255 then inc(c);
 end
 end;
-if (c < 2) or
-((c < 4) and (((Land[Y, X] and lfDamaged) <> 0) or pixelsweep)) then
+if c < 4 then // 0-3 neighbours
 begin
 if ((Land[Y, X] and lfBasic) <> 0) and not disableLandBack then
 LandPixels[yy, xx]:= LandBackPixel(X, Y)
 else
 LandPixels[yy, xx]:= 0;
 Land[Y, X]:= 0;
-if not pixelsweep then exit(1)
+if not pixelsweep then exit(true);
-else exit(2)
 end;
 end;
-Despeckle:= 0
+Despeckle:= false
 end;
 procedure Smooth(X, Y: LongInt);
 begin
 // a bit of AA for explosions
 end
 end
 end;
 function SweepDirty: boolean;
-var x, y, xx, yy, ty, tx, d: LongInt;
+var x, y, xx, yy, ty, tx: LongInt;
-bRes, updateBlock, resweepCol, resweepGfx, gfxOnly, recheck, firstpass: boolean;
+bRes, updateBlock, resweep, recheck: boolean;
 begin
 bRes:= false;
 reCheck:= true;
 while recheck do
 recheck:= false;
 for y:= 0 to LAND_HEIGHT div 32 - 1 do
 begin
 for x:= 0 to LAND_WIDTH div 32 - 1 do
 begin
-if LandDirty[y, x] <> 0 then
+if LandDirty[y, x] = 1 then
 begin
 updateBlock:= false;
-resweepCol:= true;
+resweep:= true;
-resweepGfx:= true;
-firstpass:= true;
 ty:= y * 32;
 tx:= x * 32;
-while(resweepCol or resweepGfx) do
+while(resweep) do
 begin
-gfxOnly:= resweepGfx and not resweepCol;
+resweep:= false;
-resweepCol:= false;
-resweepGfx:= false;
 for yy:= ty to ty + 31 do
 for xx:= tx to tx + 31 do
-begin
+if Despeckle(xx, yy) then
-d:= Despeckle(xx, yy, gfxOnly);
-if d <> 0 then
 begin
 bRes:= true;
 updateBlock:= true;
-if d = 1 then resweepCol:= true
+resweep:= true;
-else resweepGfx:= true;
+if (yy = ty) and (y > 0) then
-if d = 1 then
+begin
-if (yy = ty) and (y > 0) then
+LandDirty[y-1, x]:= 1;
-begin
+recheck:= true;
-LandDirty[y-1, x]:= 1;
+end
-recheck:= true;
+else if (yy = ty+31) and (y < LAND_HEIGHT div 32 - 1) then
-end
+begin
-else if (yy = ty+31) and (y < LAND_HEIGHT div 32 - 1) then
+LandDirty[y+1, x]:= 1;
-begin
+recheck:= true;
-LandDirty[y+1, x]:= 1;
+end;
-recheck:= true;
+if (xx = tx) and (x > 0) then
-end;
+begin
-if (xx = tx) and (x > 0) then
+LandDirty[y, x-1]:= 1;
-begin
+recheck:= true;
-LandDirty[y, x-1]:= 1;
+end
-recheck:= true;
+else if (xx = tx+31) and (x < LAND_WIDTH div 32 - 1) then
-end
+begin
-else if (xx = tx+31) and (x < LAND_WIDTH div 32 - 1) then
+LandDirty[y, x+1]:= 1;
-begin
+recheck:= true;
-LandDirty[y, x+1]:= 1;
+end
-recheck:= true;
-end
 end;
-if firstpass then Smooth(xx,yy);
-end;
-firstpass:= false
 end;
 if updateBlock then UpdateLandTexture(tx, 32, ty, 32);
-LandDirty[y, x]:= 0;
+LandDirty[y, x]:= 2;
 end;
 end;
 end;
 end;
+for y:= 0 to LAND_HEIGHT div 32 - 1 do
+for x:= 0 to LAND_WIDTH div 32 - 1 do
+if LandDirty[y, x] <> 0 then
+begin
+LandDirty[y, x]:= 0;
+ty:= y * 32;
+tx:= x * 32;
+for yy:= ty to ty + 31 do
+for xx:= tx to tx + 31 do
+Smooth(xx,yy)
+end;
 SweepDirty:= bRes;
 end;
 // Return true if outside of land or not the value tested, used right now for some X/Y movement that does not use normal hedgehog movement in GSHandlers.inc
 function CheckLandValue(X, Y: LongInt; LandFlag: Word): boolean;
 begin
 CheckLandValue:= ((X and LAND_WIDTH_MASK <> 0) or (Y and LAND_HEIGHT_MASK <> 0)) or ((Land[Y, X] and LandFlag) = 0)

branch	hedgeroid
changeset 5932	5164d17b6374
parent 5895	212d3b459658
child 6011	519f8a58c021