- Added TTileDataFlag enum
- Added TTileDataFlags set - Changed TTiledata.Flags to use the TTileDataFlags set - Added hue highlighting to TfrmMain - Added TTextureManager.GetStaticMaterial to handle tiledata and hues
This commit is contained in:
parent
b90ea02421
commit
d5e5510760
|
|
@ -56,7 +56,7 @@
|
|||
<MinVersion Major="4" Minor="5" Release="1" Valid="True"/>
|
||||
</Item5>
|
||||
</RequiredPackages>
|
||||
<Units Count="31">
|
||||
<Units Count="34">
|
||||
<Unit0>
|
||||
<Filename Value="CentrED.lpr"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
|
|
@ -253,6 +253,21 @@
|
|||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="Logging"/>
|
||||
</Unit30>
|
||||
<Unit31>
|
||||
<Filename Value="../UOLib/UStatics.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="UStatics"/>
|
||||
</Unit31>
|
||||
<Unit32>
|
||||
<Filename Value="../UOLib/UWorldItem.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="UWorldItem"/>
|
||||
</Unit32>
|
||||
<Unit33>
|
||||
<Filename Value="../UOLib/UMap.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="UMap"/>
|
||||
</Unit33>
|
||||
</Units>
|
||||
</ProjectOptions>
|
||||
<CompilerOptions>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ uses
|
|||
UfrmLargeScaleCommand, UfrmVirtualLayer, UfrmFilter, UfrmTileInfo,
|
||||
UGUIPlatformUtils, UPlatformTypes, UfrmRegionControl, UPackets,
|
||||
UPacketHandlers, UAdminHandling, UGameResources, ULandscape, UfrmToolWindow,
|
||||
Logging;
|
||||
Logging, UMap, UWorldItem, UStatics;
|
||||
|
||||
{$IFDEF WINDOWS}{$R CentrED.rc}{$ENDIF}
|
||||
|
||||
|
|
|
|||
|
|
@ -72,15 +72,18 @@ type
|
|||
TLandTextureManager = class
|
||||
constructor Create;
|
||||
destructor Destroy; override;
|
||||
function GetArtMaterial(ATileID: Word): TMaterial; overload;
|
||||
function GetArtMaterial(ATileID: Word; AHue: THue;
|
||||
APartialHue: Boolean): TMaterial; overload;
|
||||
function GetFlatLandMaterial(ATileID: Word): TMaterial;
|
||||
function GetTexMaterial(ATileID: Word): TMaterial;
|
||||
protected
|
||||
FArtCache: TCacheManager;
|
||||
FFlatLandArtCache: TCacheManager;
|
||||
FTexCache: TCacheManager;
|
||||
public
|
||||
function GetArtMaterial(ATileID: Word): TMaterial; overload;
|
||||
function GetArtMaterial(ATileID: Word; AHue: THue;
|
||||
APartialHue: Boolean): TMaterial; overload;
|
||||
function GetFlatLandMaterial(ATileID: Word): TMaterial;
|
||||
function GetStaticMaterial(AStaticItem: TStaticItem;
|
||||
AOverrideHue: Integer = -1): TMaterial;
|
||||
function GetTexMaterial(ATileID: Word): TMaterial;
|
||||
end;
|
||||
|
||||
{ TSeperatedStaticBlock }
|
||||
|
|
@ -205,6 +208,7 @@ type
|
|||
Normals: PNormals;
|
||||
State: TScreenState;
|
||||
Highlighted: Boolean;
|
||||
HueOverride: Boolean;
|
||||
Next: PBlockInfo;
|
||||
end;
|
||||
|
||||
|
|
@ -290,7 +294,8 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
function TLandTextureManager.GetArtMaterial(ATileID: Word; AHue: THue; APartialHue: Boolean): TMaterial;
|
||||
function TLandTextureManager.GetArtMaterial(ATileID: Word; AHue: THue;
|
||||
APartialHue: Boolean): TMaterial;
|
||||
var
|
||||
artEntry: TArt;
|
||||
id: Integer;
|
||||
|
|
@ -330,6 +335,25 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
function TLandTextureManager.GetStaticMaterial(AStaticItem: TStaticItem;
|
||||
AOverrideHue: Integer = -1): TMaterial;
|
||||
var
|
||||
staticTiledata: TStaticTiledata;
|
||||
hue: THue;
|
||||
begin
|
||||
staticTiledata := ResMan.Tiledata.StaticTiles[AStaticItem.TileID];
|
||||
if AOverrideHue < 0 then
|
||||
AOverrideHue := AStaticItem.Hue;
|
||||
|
||||
if AOverrideHue > 0 then
|
||||
hue := ResMan.Hue.Hues[AOverrideHue]
|
||||
else
|
||||
hue := nil;
|
||||
|
||||
Result := GetArtMaterial($4000 + AStaticItem.TileID, hue,
|
||||
tdfPartialHue in staticTiledata.Flags);
|
||||
end;
|
||||
|
||||
function TLandTextureManager.GetTexMaterial(ATileID: Word): TMaterial;
|
||||
var
|
||||
texEntry: TTexture;
|
||||
|
|
@ -706,8 +730,8 @@ begin
|
|||
(staticItem.Hue = staticInfo.Hue) then
|
||||
begin
|
||||
if Assigned(FOnStaticDeleted) then FOnStaticDeleted(staticItem);
|
||||
statics.Delete(i);
|
||||
staticItem.Delete;
|
||||
statics.Delete(i);
|
||||
|
||||
Break;
|
||||
end;
|
||||
|
|
@ -785,8 +809,8 @@ begin
|
|||
if staticItem <> nil then
|
||||
begin
|
||||
if Assigned(FOnStaticDeleted) then FOnStaticDeleted(staticItem);
|
||||
statics.Remove(staticItem);
|
||||
staticItem.Delete;
|
||||
statics.Remove(staticItem);
|
||||
end;
|
||||
end;
|
||||
|
||||
|
|
|
|||
|
|
@ -1733,8 +1733,6 @@ var
|
|||
west, south, east: Single;
|
||||
z: SmallInt;
|
||||
staticItem: TStaticItem;
|
||||
hue: THue;
|
||||
staticTiledata: TStaticTiledata;
|
||||
begin
|
||||
//add normals to map tiles and materials where possible
|
||||
|
||||
|
|
@ -1806,13 +1804,8 @@ begin
|
|||
begin
|
||||
staticItem := TStaticItem(item);
|
||||
|
||||
staticTiledata := ResMan.Tiledata.StaticTiles[staticItem.TileID];
|
||||
if staticItem.Hue > 0 then
|
||||
hue := ResMan.Hue.Hues[staticItem.Hue - 1]
|
||||
else
|
||||
hue := nil;
|
||||
|
||||
ABlockInfo^.LowRes := FTextureManager.GetArtMaterial($4000 + staticItem.TileID, hue, (staticTileData.Flags and tdfPartialHue) = tdfPartialHue);
|
||||
ABlockInfo^.LowRes := FTextureManager.GetStaticMaterial(staticItem);
|
||||
ABlockInfo^.HueOverride := False;
|
||||
ABlockInfo^.ScreenRect := Bounds(Trunc(drawX - ABlockInfo^.LowRes.RealWidth / 2),
|
||||
Trunc(drawY + 44 - ABlockInfo^.LowRes.RealHeight - z * 4),
|
||||
ABlockInfo^.LowRes.RealWidth,
|
||||
|
|
@ -2292,6 +2285,27 @@ procedure TfrmMain.UpdateSelection;
|
|||
var
|
||||
selectedRect: TRect;
|
||||
blockInfo: PBlockInfo;
|
||||
|
||||
procedure SetHighlight(ABlockInfo: PBlockInfo; AHighlighted: Boolean);
|
||||
begin
|
||||
if (ABlockInfo^.Item is TStaticItem) and acHue.Checked then
|
||||
begin
|
||||
if ABlockInfo^.HueOverride <> AHighlighted then
|
||||
begin
|
||||
ABlockInfo^.HueOverride := AHighlighted;
|
||||
if AHighlighted then
|
||||
ABlockInfo^.LowRes := FTextureManager.GetStaticMaterial(
|
||||
TStaticItem(ABlockInfo^.Item), frmHueSettings.lbHue.ItemIndex)
|
||||
else
|
||||
ABlockInfo^.LowRes := FTextureManager.GetStaticMaterial(
|
||||
TStaticItem(ABlockInfo^.Item));
|
||||
end;
|
||||
end else
|
||||
begin
|
||||
ABlockInfo^.Highlighted := AHighlighted;
|
||||
end;
|
||||
end;
|
||||
|
||||
begin
|
||||
Logger.EnterMethod([lcClient, lcDebug], 'UpdateSelection');
|
||||
if (CurrentTile <> nil) and (not acSelect.Checked) then
|
||||
|
|
@ -2303,14 +2317,15 @@ begin
|
|||
selectedRect := GetSelectedRect;
|
||||
Logger.Send([lcClient, lcDebug], 'SelectedRect', selectedRect);
|
||||
while FScreenBuffer.Iterate(blockInfo) do
|
||||
if blockInfo^.State = ssNormal then
|
||||
blockInfo^.Highlighted := PtInRect(selectedRect, Point(blockInfo^.Item.X, blockInfo^.Item.Y));
|
||||
if (blockInfo^.State = ssNormal) then
|
||||
SetHighlight(blockInfo, PtInRect(selectedRect,
|
||||
Point(blockInfo^.Item.X, blockInfo^.Item.Y)));
|
||||
end else
|
||||
begin
|
||||
Logger.Send([lcClient, lcDebug], 'Single Target');
|
||||
while FScreenBuffer.Iterate(blockInfo) do
|
||||
if blockInfo^.State = ssNormal then
|
||||
blockInfo^.Highlighted := (blockInfo^.Item = CurrentTile);
|
||||
SetHighlight(blockInfo, (blockInfo^.Item = CurrentTile));
|
||||
end;
|
||||
end;
|
||||
Logger.ExitMethod([lcClient, lcDebug], 'UpdateSelection');
|
||||
|
|
|
|||
|
|
@ -80,9 +80,9 @@ var
|
|||
tileData: TTiledata;
|
||||
prefix, flags: string;
|
||||
|
||||
procedure UpdateFlags(AFlag: LongWord; AName: string);
|
||||
procedure UpdateFlags(AFlag: TTileDataFlag; AName: string);
|
||||
begin
|
||||
if tileData.HasFlag(AFlag) then
|
||||
if AFlag in tileData.Flags then
|
||||
begin
|
||||
if flags <> '' then
|
||||
flags := flags + ', ' + AName
|
||||
|
|
@ -111,9 +111,9 @@ begin
|
|||
tileData := ResMan.Tiledata.StaticTiles[ATileID];
|
||||
end;
|
||||
|
||||
if tileData.HasFlag(tdfArticleA) then
|
||||
if tdfArticleA in tileData.Flags then
|
||||
prefix := 'a '
|
||||
else if tileData.HasFlag(tdfArticleAn) then
|
||||
else if tdfArticleAn in tileData.Flags then
|
||||
prefix := 'an '
|
||||
else
|
||||
prefix := '';
|
||||
|
|
|
|||
|
|
@ -36,7 +36,8 @@ type
|
|||
{ TStaticItem }
|
||||
|
||||
TStaticItem = class(TWorldItem)
|
||||
constructor Create(AOwner: TWorldBlock; AData: TStream; ABlockX, ABlockY: Word); overload;
|
||||
constructor Create(AOwner: TWorldBlock; AData: TStream; ABlockX,
|
||||
ABlockY: Word); overload;
|
||||
constructor Create(AOwner: TWorldBlock; AData: TStream); overload;
|
||||
protected
|
||||
{ Members }
|
||||
|
|
@ -63,7 +64,8 @@ type
|
|||
{ TStaticBlock}
|
||||
|
||||
TStaticBlock = class(TWorldBlock)
|
||||
constructor Create(AData: TStream; AIndex: TGenericIndex; AX, AY: Word); overload;
|
||||
constructor Create(AData: TStream; AIndex: TGenericIndex; AX, AY: Word);
|
||||
overload;
|
||||
constructor Create(AData: TStream; AIndex: TGenericIndex); overload;
|
||||
destructor Destroy; override;
|
||||
protected
|
||||
|
|
@ -92,12 +94,14 @@ end;
|
|||
|
||||
{ TStaticItem }
|
||||
|
||||
constructor TStaticItem.Create(AOwner: TWorldBlock; AData: TStream; ABlockX, ABlockY: Word);
|
||||
constructor TStaticItem.Create(AOwner: TWorldBlock; AData: TStream; ABlockX,
|
||||
ABlockY: Word);
|
||||
var
|
||||
iX, iY: Byte;
|
||||
begin
|
||||
inherited Create(AOwner);
|
||||
if assigned(AData) then
|
||||
|
||||
if AData <> nil then
|
||||
begin
|
||||
AData.Read(FTileID, SizeOf(SmallInt));
|
||||
AData.Read(iX, SizeOf(Byte));
|
||||
|
|
@ -108,6 +112,7 @@ begin
|
|||
FX := ABlockX * 8 + iX;
|
||||
FY := ABlockY * 8 + iY;
|
||||
end;
|
||||
|
||||
InitOriginalState;
|
||||
end;
|
||||
|
||||
|
|
@ -152,7 +157,7 @@ procedure TStaticItem.UpdatePriorities(ATileData: TStaticTiledata;
|
|||
ASolver: Integer);
|
||||
begin
|
||||
FPriorityBonus := 0;
|
||||
if not ((ATileData.Flags and tdfBackground) = tdfBackground) then
|
||||
if not (tdfBackground in ATileData.Flags) then
|
||||
Inc(FPriorityBonus);
|
||||
if ATileData.Height > 0 then
|
||||
Inc(FPriorityBonus);
|
||||
|
|
@ -176,7 +181,8 @@ end;
|
|||
|
||||
{ TStaticBlock }
|
||||
|
||||
constructor TStaticBlock.Create(AData: TStream; AIndex: TGenericIndex; AX, AY: Word);
|
||||
constructor TStaticBlock.Create(AData: TStream; AIndex: TGenericIndex;
|
||||
AX, AY: Word);
|
||||
var
|
||||
i: Integer;
|
||||
block: TMemoryStream;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* CDDL HEADER END
|
||||
*
|
||||
*
|
||||
* Portions Copyright 2008 Andreas Schneider
|
||||
* Portions Copyright 2009 Andreas Schneider
|
||||
*)
|
||||
unit UTiledata;
|
||||
|
||||
|
|
@ -33,58 +33,35 @@ uses
|
|||
Classes, SysUtils, UMulBlock;
|
||||
|
||||
const
|
||||
tdfBackground = $00000001;
|
||||
tdfWeapon = $00000002;
|
||||
tdfTransparent = $00000004;
|
||||
tdfTranslucent = $00000008;
|
||||
tdfWall = $00000010;
|
||||
tdfDamaging = $00000020;
|
||||
tdfImpassable = $00000040;
|
||||
tdfWet = $00000080;
|
||||
tdfUnknown1 = $00000100;
|
||||
tdfSurface = $00000200;
|
||||
tdfBridge = $00000400;
|
||||
tdfGeneric = $00000800;
|
||||
tdfWindow = $00001000;
|
||||
tdfNoShoot = $00002000;
|
||||
tdfArticleA = $00004000;
|
||||
tdfArticleAn = $00008000;
|
||||
tdfInternal = $00010000;
|
||||
tdfFoliage = $00020000;
|
||||
tdfPartialHue = $00040000;
|
||||
tdfUnknown2 = $00080000;
|
||||
tdfMap = $00100000;
|
||||
tdfContainer = $00200000;
|
||||
tdfWearable = $00400000;
|
||||
tdfLightSource = $00800000;
|
||||
tdfAnimation = $01000000;
|
||||
tdfNoDiagonal = $02000000;
|
||||
tdfArtUsed = $04000000;
|
||||
tdfArmor = $08000000;
|
||||
tdfRoof = $10000000;
|
||||
tdfDoor = $20000000;
|
||||
tdfStairBack = $40000000;
|
||||
tdfStairRight = $80000000;
|
||||
|
||||
LandTileDataSize = 26;
|
||||
LandTileGroupSize = 4 + 32 * LandTileDataSize;
|
||||
StaticTileDataSize = 37;
|
||||
StaticTileGroupSize = 4 + 32 * StaticTileDataSize;
|
||||
|
||||
type
|
||||
TTileDataFlag = (tdfBackground, tdfWeapon, tdfTransparent, tdfTranslucent,
|
||||
tdfWall, tdfDamaging, tdfImpassable, tdfWet, tdfUnknown1,
|
||||
tdfSurface, tdfBridge, tdfGeneric, tdfWindow, tdfNoShoot,
|
||||
tdfArticleA, tdfArticleAn, tdfInternal, tdfFoliage,
|
||||
tdfPartialHue, tdfUnknown2, tdfMap, tdfContainer,
|
||||
tdfWearable, tdfLightSource, tdfAnimation, tdfNoDiagonal,
|
||||
tdfArtUsed, tdfArmor, tdfRoof, tdfDoor, tdfStairBack,
|
||||
tdfStairRight);
|
||||
TTileDataFlags = set of TTileDataFlag;
|
||||
|
||||
{ TTiledata }
|
||||
|
||||
TTiledata = class(TMulBlock)
|
||||
protected
|
||||
FFlags: LongWord;
|
||||
FFlags: TTileDataFlags;
|
||||
FTileName: string;
|
||||
public
|
||||
property Flags: LongWord read FFlags write FFlags;
|
||||
property Flags: TTileDataFlags read FFlags write FFlags;
|
||||
property TileName: string read FTileName write FTileName;
|
||||
|
||||
function HasFlag(AFlag: LongWord): Boolean;
|
||||
end;
|
||||
|
||||
{ TLandTiledata }
|
||||
|
||||
TLandTiledata = class(TTiledata)
|
||||
constructor Create(AData: TStream);
|
||||
destructor Destroy; override;
|
||||
|
|
@ -96,6 +73,9 @@ type
|
|||
public
|
||||
property TextureID: Word read FTextureID write FTextureID;
|
||||
end;
|
||||
|
||||
{ TStaticTiledata }
|
||||
|
||||
TStaticTiledata = class(TTiledata)
|
||||
constructor Create(AData: TStream);
|
||||
destructor Destroy; override;
|
||||
|
|
@ -125,6 +105,9 @@ type
|
|||
property Unknown4: Word read FUnknown4 write FUnknown4;
|
||||
property Height: Byte read FHeight write FHeight;
|
||||
end;
|
||||
|
||||
{ TLandTileGroup }
|
||||
|
||||
TLandTileGroup = class(TMulBlock)
|
||||
constructor Create(AData: TStream);
|
||||
destructor Destroy; override;
|
||||
|
|
@ -137,6 +120,9 @@ type
|
|||
LandTileData: array[0..31] of TLandTiledata;
|
||||
property Unknown: LongInt read FUnknown write FUnknown;
|
||||
end;
|
||||
|
||||
{ TStaticTileGroup }
|
||||
|
||||
TStaticTileGroup = class(TMulBlock)
|
||||
constructor Create(AData: TStream);
|
||||
destructor Destroy; override;
|
||||
|
|
@ -174,6 +160,8 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
{ TLandTiledata }
|
||||
|
||||
constructor TLandTiledata.Create(AData: TStream);
|
||||
begin
|
||||
SetLength(FTileName, 20);
|
||||
|
|
@ -217,6 +205,8 @@ begin
|
|||
GetSize := LandTileDataSize;
|
||||
end;
|
||||
|
||||
{ TStaticTiledata}
|
||||
|
||||
constructor TStaticTiledata.Create(AData: TStream);
|
||||
begin
|
||||
SetLength(FTileName, 20);
|
||||
|
|
@ -287,6 +277,8 @@ begin
|
|||
GetSize := StaticTileDataSize;
|
||||
end;
|
||||
|
||||
{ TLandTileGroup }
|
||||
|
||||
constructor TLandTileGroup.Create(AData: TStream);
|
||||
var
|
||||
i: Integer;
|
||||
|
|
@ -332,6 +324,8 @@ begin
|
|||
GetSize := LandTileGroupSize;
|
||||
end;
|
||||
|
||||
{ TStaticTileGroup }
|
||||
|
||||
constructor TStaticTileGroup.Create(AData: TStream);
|
||||
var
|
||||
i: Integer;
|
||||
|
|
@ -377,12 +371,5 @@ begin
|
|||
GetSize := StaticTileGroupSize;
|
||||
end;
|
||||
|
||||
{ TTiledata }
|
||||
|
||||
function TTiledata.HasFlag(AFlag: LongWord): Boolean;
|
||||
begin
|
||||
Result := (FFlags and AFlag) = AFlag;
|
||||
end;
|
||||
|
||||
end.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue