- Changed rendering to build the draw list for the whole range
- Added CanBeEdited flag to TWorldItem - Changed list sorting from custom heap sort implementation to the FCL standard (QuickSort)
This commit is contained in:
parent
c20a160543
commit
2f560a7738
|
|
@ -253,10 +253,8 @@
|
|||
</CodeGeneration>
|
||||
<Linking>
|
||||
<Debugging>
|
||||
<UseLineInfoUnit Value="False"/>
|
||||
<StripSymbols Value="True"/>
|
||||
<GenerateDebugInfo Value="True"/>
|
||||
</Debugging>
|
||||
<LinkSmart Value="True"/>
|
||||
<Options>
|
||||
<Win32>
|
||||
<GraphicApplication Value="True"/>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* CDDL HEADER END
|
||||
*
|
||||
*
|
||||
* Portions Copyright 2007 Andreas Schneider
|
||||
* Portions Copyright 2009 Andreas Schneider
|
||||
*)
|
||||
unit ULandscape;
|
||||
|
||||
|
|
@ -103,6 +103,7 @@ type
|
|||
constructor Create(AWidth, AHeight: Word);
|
||||
destructor Destroy; override;
|
||||
protected
|
||||
{ Members }
|
||||
FWidth: Word;
|
||||
FHeight: Word;
|
||||
FCellWidth: Word;
|
||||
|
|
@ -110,7 +111,7 @@ type
|
|||
FBlockCache: TCacheManager;
|
||||
FOnChange: TLandscapeChangeEvent;
|
||||
FOpenRequests: array of Boolean;
|
||||
function Compare(left, right: TObject): Integer;
|
||||
{ Methods }
|
||||
function GetNormals(AX, AY: Word): TNormals;
|
||||
function GetMapCell(AX, AY: Word): TMapCell;
|
||||
function GetStaticList(AX, AY: Word): TList;
|
||||
|
|
@ -118,7 +119,6 @@ type
|
|||
function GetStaticBlock(AX, AY: Word): TSeperatedStaticBlock;
|
||||
procedure UpdateStaticsPriority(AStaticItem: TStaticItem;
|
||||
APrioritySolver: Integer);
|
||||
procedure OnBlockChanged(ABlock: TMulBlock);
|
||||
procedure OnRemoveCachedObject(AObject: TObject);
|
||||
|
||||
procedure OnBlocksPacket(ABuffer: TEnhancedMemoryStream);
|
||||
|
|
@ -129,6 +129,7 @@ type
|
|||
procedure OnMoveStaticPacket(ABuffer: TEnhancedMemoryStream);
|
||||
procedure OnHueStaticPacket(ABuffer: TEnhancedMemoryStream);
|
||||
public
|
||||
{ Fields }
|
||||
property Width: Word read FWidth;
|
||||
property Height: Word read FHeight;
|
||||
property CellWidth: Word read FCellWidth;
|
||||
|
|
@ -137,10 +138,11 @@ type
|
|||
property StaticList[X, Y: Word]: TList read GetStaticList;
|
||||
property Normals[X, Y: Word]: TNormals read GetNormals;
|
||||
property OnChange: TLandscapeChangeEvent read FOnChange write FOnChange;
|
||||
|
||||
function GetDrawList(AX, AY: Word; AMinZ, AMaxZ: ShortInt;
|
||||
{ Methods }
|
||||
function GetDrawList(AX, AY, AWidth, AHeight: Word; AMinZ, AMaxZ: ShortInt;
|
||||
AGhostTile: TWorldItem; AVirtualLayer: TStaticItem; AMap,
|
||||
AStatics: Boolean; ANoDraw:Boolean; AStaticsFilter: TStaticFilter): TList;
|
||||
procedure UpdateDrawListItems(AList: TList);
|
||||
function GetEffectiveAltitude(ATile: TMapCell): ShortInt;
|
||||
function GetLandAlt(AX, AY: Word; ADefault: ShortInt): ShortInt;
|
||||
|
||||
|
|
@ -204,15 +206,6 @@ begin
|
|||
Result := ((AX and $7FFF) shl 15) or (AY and $7FFF);
|
||||
end;
|
||||
|
||||
{operator=(AStaticItem: TStaticItem; AStaticInfo: TStaticInfo): Boolean;
|
||||
begin
|
||||
Result := (AStaticItem.X = AStaticInfo.X) and
|
||||
(AStaticItem.Y = AStaticInfo.Y) and
|
||||
(AStaticItem.Z = AStaticInfo.Z) and
|
||||
(AStaticItem.TileID = AStaticInfo.TileID) and
|
||||
(AStaticItem.Hue = AStaticInfo.Hue);
|
||||
end;}
|
||||
|
||||
{ TLandTextureManager }
|
||||
|
||||
constructor TLandTextureManager.Create;
|
||||
|
|
@ -410,40 +403,50 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
function TLandscape.Compare(left, right: TObject): Integer;
|
||||
function Compare(AItem1, AItem2: Pointer): Integer;
|
||||
begin
|
||||
Result := TWorldItem(right).Priority - TWorldItem(left).Priority;
|
||||
if TWorldItem(AItem1).X <> TWorldItem(AItem2).X then
|
||||
Exit(TWorldItem(AItem1).X - TWorldItem(AItem2).X);
|
||||
|
||||
if TWorldItem(AItem1).Y <> TWorldItem(AItem2).Y then
|
||||
Exit(TWorldItem(AItem1).Y - TWorldItem(AItem2).Y);
|
||||
|
||||
Result := TWorldItem(AItem1).Priority - TWorldItem(AItem2).Priority;
|
||||
if Result = 0 then
|
||||
begin
|
||||
if (left is TMapCell) and (right is TStaticItem) then
|
||||
Result := 1
|
||||
else if (left is TStaticItem) and (right is TMapCell) then
|
||||
Result := -1;
|
||||
if (TObject(AItem1) is TMapCell) and (TObject(AItem2) is TStaticItem) then
|
||||
Result := -1
|
||||
else if (TObject(AItem1) is TStaticItem) and (TObject(AItem2) is TMapCell) then
|
||||
Result := 1;
|
||||
end;
|
||||
|
||||
if Result = 0 then
|
||||
Result := TWorldItem(right).PriorityBonus - TWorldItem(left).PriorityBonus;
|
||||
Result := TWorldItem(AItem1).PriorityBonus - TWorldItem(AItem2).PriorityBonus;
|
||||
|
||||
if Result = 0 then
|
||||
Result := TWorldItem(right).PrioritySolver - TWorldItem(left).PrioritySolver;
|
||||
Result := TWorldItem(AItem1).PrioritySolver - TWorldItem(AItem2).PrioritySolver;
|
||||
end;
|
||||
|
||||
function TLandscape.GetDrawList(AX, AY: Word; AMinZ, AMaxZ: ShortInt;
|
||||
AGhostTile: TWorldItem; AVirtualLayer: TStaticItem; AMap,
|
||||
AStatics: Boolean; ANoDraw:Boolean; AStaticsFilter: TStaticFilter): TList;
|
||||
function TLandscape.GetDrawList(AX, AY, AWidth, AHeight: Word;
|
||||
AMinZ, AMaxZ: ShortInt; AGhostTile: TWorldItem; AVirtualLayer: TStaticItem;
|
||||
AMap, AStatics: Boolean; ANoDraw: Boolean;
|
||||
AStaticsFilter: TStaticFilter): TList;
|
||||
var
|
||||
landAlt: ShortInt;
|
||||
drawMapCell: TMapCell;
|
||||
drawStatics: TList;
|
||||
i: Integer;
|
||||
i, x, y: Integer;
|
||||
begin
|
||||
Result := TList.Create;
|
||||
for x := AX to AX + AWidth do
|
||||
for y := AY to AY + AWidth do
|
||||
begin
|
||||
if AMap then
|
||||
begin
|
||||
landAlt := GetLandAlt(AX, AY, 0);
|
||||
landAlt := GetLandAlt(x, y, 0);
|
||||
if (landAlt >= AMinZ) and (landAlt <= AMaxZ) then
|
||||
begin
|
||||
drawMapCell := GetMapCell(AX, AY);
|
||||
drawMapCell := GetMapCell(x, y);
|
||||
if (drawMapCell <> nil) and (ANoDraw or (drawMapCell.TileID > 2)) then
|
||||
begin
|
||||
drawMapCell.Priority := GetEffectiveAltitude(drawMapCell);
|
||||
|
|
@ -454,8 +457,8 @@ begin
|
|||
|
||||
if AGhostTile is TMapCell then
|
||||
begin
|
||||
AGhostTile.X := AX;
|
||||
AGhostTile.Y := AY;
|
||||
AGhostTile.X := x;
|
||||
AGhostTile.Y := y;
|
||||
AGhostTile.Priority := GetEffectiveAltitude(TMapCell(AGhostTile));
|
||||
AGhostTile.PriorityBonus := 0;
|
||||
AGhostTile.PrioritySolver := 0;
|
||||
|
|
@ -466,7 +469,7 @@ begin
|
|||
|
||||
if AStatics then
|
||||
begin
|
||||
drawStatics := GetStaticList(AX, AY);
|
||||
drawStatics := GetStaticList(x, y);
|
||||
if drawStatics <> nil then
|
||||
for i := 0 to drawStatics.Count - 1 do
|
||||
if (TStaticItem(drawStatics[i]).Z >= AMinZ) and
|
||||
|
|
@ -485,13 +488,28 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
if AVirtualLayer <> nil then
|
||||
//TODO : re add virtual layer
|
||||
{if AVirtualLayer <> nil then
|
||||
begin
|
||||
UpdateStaticsPriority(AVirtualLayer, MaxInt-1);
|
||||
Result.Add(AVirtualLayer);
|
||||
end;}
|
||||
end;
|
||||
|
||||
ListSort(Result, @Compare);
|
||||
Result.Sort(@Compare);
|
||||
//ListSort(Result, @Compare);
|
||||
end;
|
||||
|
||||
procedure TLandscape.UpdateDrawListItems(AList: TList);
|
||||
var
|
||||
worldItem: TWorldItem;
|
||||
i: Integer;
|
||||
begin
|
||||
for i := 0 to AList.Count - 1 do
|
||||
begin
|
||||
worldItem := TWorldItem(AList.Items[i]);
|
||||
worldItem.CanBeEdited := dmNetwork.CanWrite(worldItem.X, worldItem.Y);
|
||||
end;
|
||||
end;
|
||||
|
||||
function TLandscape.GetEffectiveAltitude(ATile: TMapCell): ShortInt;
|
||||
|
|
@ -591,37 +609,6 @@ begin
|
|||
Result[3] := VectorNorm(VectorAdd(VectorAdd(VectorAdd(north, west), east), south));
|
||||
end;
|
||||
|
||||
procedure TLandscape.OnBlockChanged(ABlock: TMulBlock);
|
||||
var
|
||||
block, old: TWorldBlock;
|
||||
mode: Byte;
|
||||
id, blockID: Integer;
|
||||
begin
|
||||
{block := ABlock as TWorldBlock;
|
||||
if block <> nil then
|
||||
begin
|
||||
if block is TSeperatedStaticBlock then
|
||||
mode := mStatics
|
||||
else
|
||||
mode := mMap;
|
||||
id := GetID(block.X, block.Y, mode);
|
||||
blockID := (block.X * FHeight) + block.Y;
|
||||
if block.Changed or (block.RefCount > 0) then
|
||||
begin
|
||||
if FPersistentBlocks[blockID][mode] = nil then
|
||||
begin
|
||||
FPersistentBlocks[blockID][mode] := block;
|
||||
FBlockCache.DiscardID(id);
|
||||
end;
|
||||
end else
|
||||
begin
|
||||
FPersistentBlocks[blockID][mode] := nil;
|
||||
if not FBlockCache.QueryID(id, TObject(old)) then
|
||||
FBlockCache.StoreID(id, block);
|
||||
end;
|
||||
end;}
|
||||
end;
|
||||
|
||||
procedure TLandscape.MoveStatic(AStatic: TStaticItem; AX, AY: Word);
|
||||
var
|
||||
sourceBlock, targetBlock: TSeperatedStaticBlock;
|
||||
|
|
@ -639,7 +626,8 @@ begin
|
|||
targetStaticList.Add(AStatic);
|
||||
for i := 0 to targetStaticList.Count - 1 do
|
||||
UpdateStaticsPriority(TStaticItem(targetStaticList.Items[i]), i);
|
||||
ListSort(targetStaticList, @Compare);
|
||||
targetStaticList.Sort(@Compare);
|
||||
//ListSort(targetStaticList, @Compare);
|
||||
AStatic.UpdatePos(AX, AY, AStatic.Z);
|
||||
AStatic.Owner := targetBlock;
|
||||
end;
|
||||
|
|
@ -788,7 +776,8 @@ begin
|
|||
targetStaticList.Add(staticItem);
|
||||
for i := 0 to targetStaticList.Count - 1 do
|
||||
UpdateStaticsPriority(TStaticItem(targetStaticList.Items[i]), i);
|
||||
ListSort(targetStaticList, @Compare);
|
||||
targetStaticList.Sort(@Compare);
|
||||
//ListSort(targetStaticList, @Compare);
|
||||
staticItem.Owner := block;
|
||||
if Assigned(FOnChange) then FOnChange;
|
||||
end;
|
||||
|
|
@ -846,7 +835,8 @@ begin
|
|||
staticItem.Z := ABuffer.ReadShortInt;
|
||||
for j := 0 to statics.Count - 1 do
|
||||
UpdateStaticsPriority(TStaticItem(statics.Items[j]), j);
|
||||
ListSort(statics, @Compare);
|
||||
statics.Sort(@Compare);
|
||||
//ListSort(statics, @Compare);
|
||||
if Assigned(FOnChange) then FOnChange;
|
||||
Break;
|
||||
end;
|
||||
|
|
@ -906,7 +896,8 @@ begin
|
|||
statics.Add(staticItem);
|
||||
for i := 0 to statics.Count - 1 do
|
||||
UpdateStaticsPriority(TStaticItem(statics.Items[i]), i);
|
||||
ListSort(statics, @Compare);
|
||||
statics.Sort(@Compare);
|
||||
//ListSort(statics, @Compare);
|
||||
staticItem.Owner := targetBlock;
|
||||
end;
|
||||
|
||||
|
|
@ -987,7 +978,6 @@ var
|
|||
pixel: TColor32Rec;
|
||||
begin
|
||||
Result := False;
|
||||
//writeln(FGraphic.Width, ',', FGraphic.Height, ',', AX, ',', AY);
|
||||
if InRange(AX, 0, FGraphic.Width - 1) and
|
||||
InRange(AY, 0, FGraphic.Height - 1) then
|
||||
begin
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
object frmMain: TfrmMain
|
||||
Left = 247
|
||||
Left = 236
|
||||
Height = 603
|
||||
Top = 91
|
||||
Top = 126
|
||||
Width = 766
|
||||
ActiveControl = pcLeft
|
||||
Caption = 'UO CentrED'
|
||||
|
|
@ -41,7 +41,7 @@ object frmMain: TfrmMain
|
|||
Left = 88
|
||||
Height = 14
|
||||
Top = 7
|
||||
Width = 11
|
||||
Width = 10
|
||||
Caption = 'Y:'
|
||||
ParentColor = False
|
||||
end
|
||||
|
|
@ -54,10 +54,10 @@ object frmMain: TfrmMain
|
|||
ParentColor = False
|
||||
end
|
||||
object lblTip: TLabel
|
||||
Left = 554
|
||||
Left = 528
|
||||
Height = 31
|
||||
Top = 0
|
||||
Width = 204
|
||||
Width = 230
|
||||
Align = alRight
|
||||
Alignment = taRightJustify
|
||||
BorderSpacing.Right = 8
|
||||
|
|
@ -66,10 +66,10 @@ object frmMain: TfrmMain
|
|||
ParentColor = False
|
||||
end
|
||||
object lblTipC: TLabel
|
||||
Left = 530
|
||||
Left = 498
|
||||
Height = 31
|
||||
Top = 0
|
||||
Width = 24
|
||||
Width = 30
|
||||
Align = alRight
|
||||
Caption = 'Tip: '
|
||||
Font.Height = -11
|
||||
|
|
@ -80,7 +80,7 @@ object frmMain: TfrmMain
|
|||
end
|
||||
object edX: TSpinEdit
|
||||
Left = 24
|
||||
Height = 23
|
||||
Height = 19
|
||||
Top = 3
|
||||
Width = 55
|
||||
MaxValue = 100000
|
||||
|
|
@ -88,7 +88,7 @@ object frmMain: TfrmMain
|
|||
end
|
||||
object edY: TSpinEdit
|
||||
Left = 104
|
||||
Height = 23
|
||||
Height = 19
|
||||
Top = 3
|
||||
Width = 52
|
||||
MaxValue = 100000
|
||||
|
|
@ -116,31 +116,31 @@ object frmMain: TfrmMain
|
|||
TabOrder = 1
|
||||
object tsTiles: TTabSheet
|
||||
Caption = 'Tiles'
|
||||
ClientHeight = 492
|
||||
ClientWidth = 218
|
||||
ClientHeight = 500
|
||||
ClientWidth = 222
|
||||
object pnlTileListSettings: TPanel
|
||||
Left = 0
|
||||
Height = 56
|
||||
Top = 0
|
||||
Width = 218
|
||||
Width = 222
|
||||
Align = alTop
|
||||
BevelOuter = bvNone
|
||||
ClientHeight = 56
|
||||
ClientWidth = 218
|
||||
ClientWidth = 222
|
||||
TabOrder = 0
|
||||
object lblFilter: TLabel
|
||||
Left = 84
|
||||
Height = 14
|
||||
Top = 8
|
||||
Width = 29
|
||||
Width = 30
|
||||
Caption = 'Filter:'
|
||||
ParentColor = False
|
||||
end
|
||||
object cbTerrain: TCheckBox
|
||||
Left = 4
|
||||
Height = 22
|
||||
Height = 18
|
||||
Top = 8
|
||||
Width = 60
|
||||
Width = 57
|
||||
Caption = 'Terrain'
|
||||
Checked = True
|
||||
OnChange = cbTerrainChange
|
||||
|
|
@ -149,9 +149,9 @@ object frmMain: TfrmMain
|
|||
end
|
||||
object cbStatics: TCheckBox
|
||||
Left = 4
|
||||
Height = 22
|
||||
Height = 18
|
||||
Top = 32
|
||||
Width = 60
|
||||
Width = 56
|
||||
Caption = 'Statics'
|
||||
Checked = True
|
||||
OnChange = cbStaticsChange
|
||||
|
|
@ -160,7 +160,7 @@ object frmMain: TfrmMain
|
|||
end
|
||||
object edFilter: TEdit
|
||||
Left = 84
|
||||
Height = 23
|
||||
Height = 19
|
||||
Top = 24
|
||||
Width = 112
|
||||
OnEditingDone = edFilterEditingDone
|
||||
|
|
@ -170,9 +170,9 @@ object frmMain: TfrmMain
|
|||
object vdtTiles: TVirtualDrawTree
|
||||
Tag = 1
|
||||
Left = 0
|
||||
Height = 238
|
||||
Height = 246
|
||||
Top = 56
|
||||
Width = 218
|
||||
Width = 222
|
||||
Align = alClient
|
||||
DefaultNodeHeight = 44
|
||||
DragMode = dmAutomatic
|
||||
|
|
@ -193,6 +193,7 @@ object frmMain: TfrmMain
|
|||
Text = 'Name'
|
||||
Width = 100
|
||||
end>
|
||||
Header.DefaultHeight = 17
|
||||
Header.MainColumn = 2
|
||||
Header.Options = [hoVisible]
|
||||
Header.ParentFont = True
|
||||
|
|
@ -215,12 +216,12 @@ object frmMain: TfrmMain
|
|||
object gbRandom: TGroupBox
|
||||
Left = 0
|
||||
Height = 193
|
||||
Top = 299
|
||||
Width = 218
|
||||
Top = 307
|
||||
Width = 222
|
||||
Align = alBottom
|
||||
Caption = 'Random pool'
|
||||
ClientHeight = 179
|
||||
ClientWidth = 216
|
||||
ClientWidth = 220
|
||||
TabOrder = 2
|
||||
object vdtRandom: TVirtualDrawTree
|
||||
Tag = 1
|
||||
|
|
@ -228,7 +229,7 @@ object frmMain: TfrmMain
|
|||
Left = 0
|
||||
Height = 127
|
||||
Top = 22
|
||||
Width = 216
|
||||
Width = 220
|
||||
Align = alClient
|
||||
DefaultNodeHeight = 44
|
||||
DragType = dtVCL
|
||||
|
|
@ -248,6 +249,7 @@ object frmMain: TfrmMain
|
|||
Text = 'Name'
|
||||
Width = 100
|
||||
end>
|
||||
Header.DefaultHeight = 17
|
||||
Header.Options = [hoColumnResize, hoDrag, hoVisible]
|
||||
Header.ParentFont = True
|
||||
Header.Style = hsFlatButtons
|
||||
|
|
@ -265,11 +267,11 @@ object frmMain: TfrmMain
|
|||
Left = 0
|
||||
Height = 22
|
||||
Top = 0
|
||||
Width = 216
|
||||
Width = 220
|
||||
Align = alTop
|
||||
BevelOuter = bvNone
|
||||
ClientHeight = 22
|
||||
ClientWidth = 216
|
||||
ClientWidth = 220
|
||||
TabOrder = 1
|
||||
object btnAddRandom: TSpeedButton
|
||||
Left = 2
|
||||
|
|
@ -420,12 +422,12 @@ object frmMain: TfrmMain
|
|||
Left = 4
|
||||
Height = 22
|
||||
Top = 153
|
||||
Width = 208
|
||||
Width = 212
|
||||
Align = alBottom
|
||||
BorderSpacing.Around = 4
|
||||
BevelOuter = bvNone
|
||||
ClientHeight = 22
|
||||
ClientWidth = 208
|
||||
ClientWidth = 212
|
||||
TabOrder = 2
|
||||
object btnRandomPresetSave: TSpeedButton
|
||||
Left = 158
|
||||
|
|
@ -527,7 +529,7 @@ object frmMain: TfrmMain
|
|||
end
|
||||
object cbRandomPreset: TComboBox
|
||||
Left = 0
|
||||
Height = 29
|
||||
Height = 25
|
||||
Top = 0
|
||||
Width = 152
|
||||
AutoComplete = False
|
||||
|
|
@ -543,14 +545,14 @@ object frmMain: TfrmMain
|
|||
Cursor = crVSplit
|
||||
Left = 0
|
||||
Height = 5
|
||||
Top = 294
|
||||
Width = 218
|
||||
Top = 302
|
||||
Width = 222
|
||||
Align = alBottom
|
||||
ResizeAnchor = akBottom
|
||||
end
|
||||
object edSearchID: TEdit
|
||||
Left = 118
|
||||
Height = 23
|
||||
Height = 19
|
||||
Hint = 'Append S or T to restrict the search to Statics or Terrain.'
|
||||
Top = 256
|
||||
Width = 96
|
||||
|
|
@ -565,13 +567,13 @@ object frmMain: TfrmMain
|
|||
end
|
||||
object tsClients: TTabSheet
|
||||
Caption = 'Clients'
|
||||
ClientHeight = 492
|
||||
ClientWidth = 218
|
||||
ClientHeight = 500
|
||||
ClientWidth = 222
|
||||
object lbClients: TListBox
|
||||
Left = 0
|
||||
Height = 492
|
||||
Height = 500
|
||||
Top = 0
|
||||
Width = 218
|
||||
Width = 222
|
||||
Align = alClient
|
||||
ItemHeight = 0
|
||||
OnDblClick = mnuGoToClientClick
|
||||
|
|
@ -583,14 +585,14 @@ object frmMain: TfrmMain
|
|||
end
|
||||
object tsLocations: TTabSheet
|
||||
Caption = 'Locations'
|
||||
ClientHeight = 492
|
||||
ClientWidth = 218
|
||||
ClientHeight = 500
|
||||
ClientWidth = 222
|
||||
object vstLocations: TVirtualStringTree
|
||||
Cursor = 63
|
||||
Left = 4
|
||||
Height = 456
|
||||
Height = 464
|
||||
Top = 4
|
||||
Width = 210
|
||||
Width = 214
|
||||
Align = alClient
|
||||
BorderSpacing.Around = 4
|
||||
BorderStyle = bsSingle
|
||||
|
|
@ -607,6 +609,7 @@ object frmMain: TfrmMain
|
|||
Text = 'Name'
|
||||
Width = 135
|
||||
end>
|
||||
Header.DefaultHeight = 17
|
||||
Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoVisible]
|
||||
Header.ParentFont = True
|
||||
Header.Style = hsFlatButtons
|
||||
|
|
@ -624,13 +627,13 @@ object frmMain: TfrmMain
|
|||
object pnlLocationControls: TPanel
|
||||
Left = 4
|
||||
Height = 24
|
||||
Top = 464
|
||||
Width = 210
|
||||
Top = 472
|
||||
Width = 214
|
||||
Align = alBottom
|
||||
BorderSpacing.Around = 4
|
||||
BevelOuter = bvNone
|
||||
ClientHeight = 24
|
||||
ClientWidth = 210
|
||||
ClientWidth = 214
|
||||
TabOrder = 1
|
||||
object btnClearLocations: TSpeedButton
|
||||
Left = 112
|
||||
|
|
@ -1010,7 +1013,7 @@ object frmMain: TfrmMain
|
|||
object vstChat: TVirtualStringTree
|
||||
Cursor = 63
|
||||
Left = 0
|
||||
Height = 99
|
||||
Height = 103
|
||||
Top = 0
|
||||
Width = 542
|
||||
Align = alClient
|
||||
|
|
@ -1032,6 +1035,7 @@ object frmMain: TfrmMain
|
|||
Text = 'Message'
|
||||
Width = 392
|
||||
end>
|
||||
Header.DefaultHeight = 17
|
||||
Header.MainColumn = 2
|
||||
Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoVisible]
|
||||
Header.ParentFont = True
|
||||
|
|
@ -1047,8 +1051,8 @@ object frmMain: TfrmMain
|
|||
end
|
||||
object edChat: TEdit
|
||||
Left = 0
|
||||
Height = 23
|
||||
Top = 99
|
||||
Height = 19
|
||||
Top = 103
|
||||
Width = 542
|
||||
Align = alBottom
|
||||
OnKeyPress = edChatKeyPress
|
||||
|
|
@ -1343,7 +1347,6 @@ object frmMain: TfrmMain
|
|||
end
|
||||
end
|
||||
object ImageList1: TImageList
|
||||
Masked = False
|
||||
left = 264
|
||||
top = 32
|
||||
Bitmap = {
|
||||
|
|
@ -1991,7 +1994,7 @@ object frmMain: TfrmMain
|
|||
}
|
||||
end
|
||||
object pmTileList: TPopupMenu
|
||||
left = 184
|
||||
left = 185
|
||||
top = 128
|
||||
object mnuAddToRandom: TMenuItem
|
||||
Caption = 'Add to random pool'
|
||||
|
|
@ -1999,13 +2002,6 @@ object frmMain: TfrmMain
|
|||
end
|
||||
end
|
||||
object ApplicationProperties1: TApplicationProperties
|
||||
CaptureExceptions = True
|
||||
HintColor = clInfoBk
|
||||
HintHidePause = 2500
|
||||
HintPause = 500
|
||||
HintShortCuts = True
|
||||
HintShortPause = 0
|
||||
ShowHint = True
|
||||
OnIdle = ApplicationProperties1Idle
|
||||
left = 295
|
||||
top = 33
|
||||
|
|
@ -2375,7 +2371,6 @@ object frmMain: TfrmMain
|
|||
Category = 'Tools'
|
||||
Caption = 'Select'
|
||||
Checked = True
|
||||
DisableIfNoHandler = True
|
||||
GroupIndex = 1
|
||||
Hint = 'Select'
|
||||
ImageIndex = 4
|
||||
|
|
@ -2385,7 +2380,6 @@ object frmMain: TfrmMain
|
|||
object acDraw: TAction
|
||||
Category = 'Tools'
|
||||
Caption = 'Draw tiles'
|
||||
DisableIfNoHandler = True
|
||||
GroupIndex = 1
|
||||
Hint = 'Draw tiles'
|
||||
ImageIndex = 5
|
||||
|
|
@ -2395,7 +2389,6 @@ object frmMain: TfrmMain
|
|||
object acMove: TAction
|
||||
Category = 'Tools'
|
||||
Caption = 'Move tiles'
|
||||
DisableIfNoHandler = True
|
||||
GroupIndex = 1
|
||||
Hint = 'Move tiles'
|
||||
ImageIndex = 6
|
||||
|
|
@ -2405,7 +2398,6 @@ object frmMain: TfrmMain
|
|||
object acElevate: TAction
|
||||
Category = 'Tools'
|
||||
Caption = 'Elevate tiles'
|
||||
DisableIfNoHandler = True
|
||||
GroupIndex = 1
|
||||
Hint = 'Elevate tiles'
|
||||
ImageIndex = 7
|
||||
|
|
@ -2415,7 +2407,6 @@ object frmMain: TfrmMain
|
|||
object acDelete: TAction
|
||||
Category = 'Tools'
|
||||
Caption = 'Delete tiles'
|
||||
DisableIfNoHandler = True
|
||||
GroupIndex = 1
|
||||
Hint = 'Delete tiles'
|
||||
ImageIndex = 8
|
||||
|
|
@ -2425,7 +2416,6 @@ object frmMain: TfrmMain
|
|||
object acHue: TAction
|
||||
Category = 'Tools'
|
||||
Caption = 'Hue tiles'
|
||||
DisableIfNoHandler = True
|
||||
GroupIndex = 1
|
||||
Hint = 'Hue tiles'
|
||||
ImageIndex = 12
|
||||
|
|
@ -2435,7 +2425,6 @@ object frmMain: TfrmMain
|
|||
object acBoundaries: TAction
|
||||
Category = 'Settings'
|
||||
Caption = 'Boundaries'
|
||||
DisableIfNoHandler = True
|
||||
Hint = 'Boundaries'
|
||||
ImageIndex = 9
|
||||
OnExecute = acBoundariesExecute
|
||||
|
|
@ -2445,7 +2434,6 @@ object frmMain: TfrmMain
|
|||
Category = 'Settings'
|
||||
AutoCheck = True
|
||||
Caption = 'Filter'
|
||||
DisableIfNoHandler = True
|
||||
Hint = 'Filter'
|
||||
ImageIndex = 16
|
||||
OnExecute = acFilterExecute
|
||||
|
|
@ -2453,7 +2441,6 @@ object frmMain: TfrmMain
|
|||
object acVirtualLayer: TAction
|
||||
Category = 'Settings'
|
||||
Caption = 'Virtual Layer'
|
||||
DisableIfNoHandler = True
|
||||
Hint = 'Virtual Layer'
|
||||
ImageIndex = 15
|
||||
OnExecute = acVirtualLayerExecute
|
||||
|
|
@ -2462,7 +2449,6 @@ object frmMain: TfrmMain
|
|||
object acFlat: TAction
|
||||
Category = 'Settings'
|
||||
Caption = 'Flat view'
|
||||
DisableIfNoHandler = True
|
||||
Hint = 'Flat view'
|
||||
ImageIndex = 17
|
||||
OnExecute = acFlatExecute
|
||||
|
|
@ -2471,7 +2457,6 @@ object frmMain: TfrmMain
|
|||
Category = 'Settings'
|
||||
Caption = 'NoDraw'
|
||||
Checked = True
|
||||
DisableIfNoHandler = True
|
||||
Hint = 'Display "No Draw" tiles'
|
||||
ImageIndex = 18
|
||||
OnExecute = acNoDrawExecute
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* CDDL HEADER END
|
||||
*
|
||||
*
|
||||
* Portions Copyright 2008 Andreas Schneider
|
||||
* Portions Copyright 2009 Andreas Schneider
|
||||
*)
|
||||
unit UfrmMain;
|
||||
|
||||
|
|
@ -1624,7 +1624,6 @@ end;
|
|||
procedure TfrmMain.Render;
|
||||
var
|
||||
drawDistance: Integer;
|
||||
offsetX, offsetY: Integer;
|
||||
lowOffX, lowOffY, highOffX, highOffY: Integer;
|
||||
z: ShortInt;
|
||||
mat: TMaterial;
|
||||
|
|
@ -1645,6 +1644,7 @@ var
|
|||
staticsFilter: TStaticFilter;
|
||||
editing: Boolean;
|
||||
intensity: GLfloat;
|
||||
item: TWorldItem;
|
||||
|
||||
procedure GetMapDrawOffset(x, y: Integer; out drawX, drawY: Single);
|
||||
begin
|
||||
|
|
@ -1670,37 +1670,31 @@ begin
|
|||
rangeX := highOffX - lowOffX;
|
||||
rangeY := highOffY - lowOffY;
|
||||
|
||||
if acFilter.Checked then
|
||||
{if acFilter.Checked then
|
||||
staticsFilter := @frmFilter.Filter
|
||||
else
|
||||
staticsFilter := nil;
|
||||
staticsFilter := nil;} //TODO : update list on change
|
||||
|
||||
for j := 0 to rangeX + rangeY - 2 do
|
||||
draw := FLandscape.GetDrawList(FX + lowOffX, FY + lowOffY, rangeX, rangeY,
|
||||
frmBoundaries.tbMinZ.Position, frmBoundaries.tbMaxZ.Position,
|
||||
nil, nil, tbTerrain.Down, tbStatics.Down, //TODO : ghost tile and virtual tile!
|
||||
acNoDraw.Checked, nil); //TODO : statics filter!
|
||||
|
||||
for i := 0 to draw.Count - 1 do
|
||||
begin
|
||||
if j > rangeY then
|
||||
begin
|
||||
startOffX := j - rangeY + 1;
|
||||
endOffX := rangeX;
|
||||
end else
|
||||
begin
|
||||
startOffX := 0;
|
||||
endOffX := j;
|
||||
end;
|
||||
for k := startOffX to endOffX do
|
||||
begin
|
||||
offsetY := j - k + lowOffY;
|
||||
offsetX := k + lowOffX;
|
||||
GetMapDrawOffset(offsetX, offsetY, drawX, drawY);
|
||||
item := TWorldItem(draw[i]);
|
||||
|
||||
GetMapDrawOffset(item.X - FX, item.Y - FY, drawX, drawY);
|
||||
|
||||
singleTarget := (CurrentTile <> nil) and
|
||||
(FX + offsetX = CurrentTile.X) and
|
||||
(FY + offsetY = CurrentTile.Y);
|
||||
(item.X = CurrentTile.X) and
|
||||
(item.Y = CurrentTile.Y);
|
||||
multiTarget := (CurrentTile <> nil) and
|
||||
(SelectedTile <> nil) and
|
||||
(CurrentTile <> SelectedTile) and
|
||||
PtInRect(tileRect, Point(FX + offsetX, FY + offsetY));
|
||||
PtInRect(tileRect, Point(item.X, item.Y));
|
||||
|
||||
if acSelect.Checked or dmNetwork.CanWrite(FX + offsetX, FY + offsetY) then
|
||||
if acSelect.Checked or item.CanBeEdited then
|
||||
begin
|
||||
editing := True;
|
||||
intensity := 1.0;
|
||||
|
|
@ -1712,45 +1706,38 @@ begin
|
|||
SetDarkLights;
|
||||
end;
|
||||
|
||||
if editing and acDraw.Checked and (singleTarget or multiTarget) then
|
||||
{if editing and acDraw.Checked and (singleTarget or multiTarget) then
|
||||
begin
|
||||
ghostTile := FGhostTile;
|
||||
if (ghostTile is TMapCell) and (not frmDrawSettings.cbForceAltitude.Checked) then
|
||||
ghostTile.Z := FLandscape.MapCell[FX + offsetX, FY + offsetY].Z;
|
||||
ghostTile.Z := FLandscape.MapCell[item.X, item.Y].Z;
|
||||
end else
|
||||
ghostTile := nil;
|
||||
ghostTile := nil;} //TODO : re add Ghost Tile
|
||||
|
||||
if frmVirtualLayer.cbShowLayer.Checked then
|
||||
{if frmVirtualLayer.cbShowLayer.Checked then
|
||||
begin
|
||||
virtualTile := FVirtualLayer[k, j - k];
|
||||
virtualTile.X := FX + offsetX;
|
||||
virtualTile.Y := FY + offsetY;
|
||||
virtualTile.Z := frmVirtualLayer.seZ.Value;
|
||||
end else
|
||||
virtualTile := nil;
|
||||
virtualTile := nil;}
|
||||
|
||||
draw := FLandscape.GetDrawList(FX + offsetX, FY + offsetY,
|
||||
frmBoundaries.tbMinZ.Position, frmBoundaries.tbMaxZ.Position,
|
||||
ghostTile, virtualTile, tbTerrain.Down, tbStatics.Down,
|
||||
acNoDraw.Checked, staticsFilter);
|
||||
|
||||
for i := 0 to draw.Count - 1 do
|
||||
begin
|
||||
if not editing then
|
||||
highlight := False
|
||||
else if TObject(draw[i]) = virtualTile then
|
||||
highlight := False
|
||||
else if acDelete.Checked and multiTarget and (TObject(draw[i]) is TStaticItem) then
|
||||
{else if item = virtualTile then
|
||||
highlight := False} //todo virtual tile
|
||||
else if acDelete.Checked and multiTarget and (item is TStaticItem) then
|
||||
highlight := True
|
||||
else if ((acElevate.Checked) or (acMove.Checked)) and multiTarget then
|
||||
highlight := True
|
||||
else if (acHue.Checked and multiTarget and (TObject(draw[i]) is TMapCell)) then
|
||||
else if (acHue.Checked and multiTarget and (item is TMapCell)) then
|
||||
highlight := True
|
||||
else
|
||||
highlight := (not acSelect.Checked) and
|
||||
(not acHue.Checked) and
|
||||
((TObject(draw[i]) = CurrentTile) or
|
||||
((TObject(draw[i]) is TMapCell) and (TObject(draw[i]) = ghostTile)));
|
||||
(item = CurrentTile) or
|
||||
((item is TMapCell) and (item = ghostTile));
|
||||
|
||||
if highlight then
|
||||
begin
|
||||
|
|
@ -1761,11 +1748,11 @@ begin
|
|||
if acFlat.Checked then
|
||||
z := 0
|
||||
else
|
||||
z := TWorldItem(draw[i]).Z;
|
||||
z := item.Z;
|
||||
|
||||
glColor4f(intensity, intensity, intensity, 1.0);
|
||||
|
||||
if TObject(draw[i]) = virtualTile then
|
||||
{if TObject(draw[i]) = virtualTile then
|
||||
begin
|
||||
glBindTexture(GL_TEXTURE_2D, FVLayerMaterial.Texture);
|
||||
glBegin(GL_QUADS);
|
||||
|
|
@ -1776,9 +1763,9 @@ begin
|
|||
glEnd;
|
||||
|
||||
FScreenBuffer.Store(Bounds(Trunc(drawX - 22), Trunc(drawY - z * 4), 44, 44), virtualTile, FVLayerMaterial);
|
||||
end else if TObject(draw[i]) is TMapCell then
|
||||
end else} if item is TMapCell then //TODO : virtual tile!
|
||||
begin
|
||||
cell := TMapCell(draw[i]);
|
||||
cell := TMapCell(item);
|
||||
|
||||
{if ResMan.Tiledata.LandTiles[cell.TileID].HasFlag(tdfTranslucent) then
|
||||
glColor4f(intensity, intensity, intensity, 0.5);} //Possible, but probably not like the OSI client
|
||||
|
|
@ -1787,9 +1774,9 @@ begin
|
|||
|
||||
if not acFlat.Checked then
|
||||
begin
|
||||
west := FLandscape.GetLandAlt(FX + offsetX, FY + offsetY + 1, z);
|
||||
south := FLandscape.GetLandAlt(FX + offsetX + 1, FY + offsetY + 1, z);
|
||||
east := FLandscape.GetLandAlt(FX + offsetX + 1, FY + offsetY, z);
|
||||
west := FLandscape.GetLandAlt(item.X, item.Y + 1, z);
|
||||
south := FLandscape.GetLandAlt(item.X + 1, item.Y + 1, z);
|
||||
east := FLandscape.GetLandAlt(item.X + 1, item.Y, z);
|
||||
|
||||
if (west <> z) or (south <> z) or (east <> z) then
|
||||
begin
|
||||
|
|
@ -1801,7 +1788,7 @@ begin
|
|||
begin
|
||||
mat := FTextureManager.GetArtMaterial(cell.TileID);
|
||||
if (not (ghostTile is TMapCell)) or
|
||||
(TObject(draw[i]) = ghostTile) then //when we have a ghosttile, only draw that, but still store the real one
|
||||
(item = ghostTile) then //when we have a ghosttile, only draw that, but still store the real one
|
||||
begin
|
||||
glBindTexture(GL_TEXTURE_2D, mat.Texture);
|
||||
glBegin(GL_QUADS);
|
||||
|
|
@ -1812,18 +1799,18 @@ begin
|
|||
glEnd;
|
||||
end;
|
||||
|
||||
if TObject(draw[i]) <> ghostTile then
|
||||
if item <> ghostTile then
|
||||
FScreenBuffer.Store(Bounds(Trunc(drawX - 22), Trunc(drawY - z * 4), 44, 44), cell, mat);
|
||||
end else // Texture found
|
||||
begin
|
||||
if (not (ghostTile is TMapCell)) or
|
||||
(TObject(draw[i]) = ghostTile) then //when we have a ghosttile, only draw that, but still store the real one
|
||||
(item = ghostTile) then //when we have a ghosttile, only draw that, but still store the real one
|
||||
begin
|
||||
glBindTexture(GL_TEXTURE_2D, mat.Texture);
|
||||
//if (not cell.Selected) and (intensity = 1.0) then
|
||||
if not cell.Selected then
|
||||
glEnable(GL_LIGHTING);
|
||||
normals := FLandscape.Normals[offsetX, offsetY];
|
||||
normals := FLandscape.Normals[item.X, item.Y];
|
||||
glBegin(GL_TRIANGLES);
|
||||
glNormal3f(normals[3].X, normals[3].Y, normals[3].Z);
|
||||
glTexCoord2f(0, 1); glVertex2d(drawX - 22, drawY + 22 - west * 4);
|
||||
|
|
@ -1843,15 +1830,15 @@ begin
|
|||
glDisable(GL_LIGHTING);
|
||||
end;
|
||||
|
||||
if TObject(draw[i]) <> ghostTile then
|
||||
if item <> ghostTile then
|
||||
FScreenBuffer.Store(Rect(Trunc(drawX - 22), Trunc(drawY - z * 4), Trunc(drawX + 22), Trunc(drawY + 44 - south * 4)), cell, mat);
|
||||
end;
|
||||
end else if TObject(draw[i]) is TStaticItem then
|
||||
end else if item is TStaticItem then
|
||||
begin
|
||||
staticItem := TStaticItem(draw[i]);
|
||||
staticItem := TStaticItem(item);
|
||||
|
||||
staticTileData := ResMan.Tiledata.StaticTiles[staticItem.TileID];
|
||||
if tbSetHue.Down and ((singleTarget and (TObject(draw[i]) = CurrentTile)) or multiTarget) then
|
||||
if tbSetHue.Down and ((singleTarget and (item = CurrentTile)) or multiTarget) then
|
||||
begin
|
||||
if frmHueSettings.lbHue.ItemIndex > 0 then
|
||||
hue := ResMan.Hue.Hues[frmHueSettings.lbHue.ItemIndex - 1]
|
||||
|
|
@ -1883,9 +1870,8 @@ begin
|
|||
if highlight then
|
||||
glDisable(GL_COLOR_LOGIC_OP);
|
||||
end;
|
||||
|
||||
draw.Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
FOverlayUI.Draw(oglGameWindow);
|
||||
end;
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ object frmRegionControl: TfrmRegionControl
|
|||
TabOrder = 0
|
||||
object lblX: TLabel
|
||||
Left = 4
|
||||
Height = 13
|
||||
Height = 14
|
||||
Top = 32
|
||||
Width = 8
|
||||
Caption = 'X'
|
||||
|
|
@ -57,7 +57,7 @@ object frmRegionControl: TfrmRegionControl
|
|||
end
|
||||
object lblY: TLabel
|
||||
Left = 4
|
||||
Height = 13
|
||||
Height = 14
|
||||
Top = 60
|
||||
Width = 8
|
||||
Caption = 'Y'
|
||||
|
|
@ -213,7 +213,7 @@ object frmRegionControl: TfrmRegionControl
|
|||
end
|
||||
object seX1: TSpinEdit
|
||||
Left = 20
|
||||
Height = 23
|
||||
Height = 19
|
||||
Top = 29
|
||||
Width = 50
|
||||
Enabled = False
|
||||
|
|
@ -222,7 +222,7 @@ object frmRegionControl: TfrmRegionControl
|
|||
end
|
||||
object seX2: TSpinEdit
|
||||
Left = 84
|
||||
Height = 23
|
||||
Height = 19
|
||||
Top = 29
|
||||
Width = 50
|
||||
Enabled = False
|
||||
|
|
@ -231,7 +231,7 @@ object frmRegionControl: TfrmRegionControl
|
|||
end
|
||||
object seY1: TSpinEdit
|
||||
Left = 20
|
||||
Height = 23
|
||||
Height = 19
|
||||
Top = 56
|
||||
Width = 50
|
||||
Enabled = False
|
||||
|
|
@ -240,7 +240,7 @@ object frmRegionControl: TfrmRegionControl
|
|||
end
|
||||
object seY2: TSpinEdit
|
||||
Left = 84
|
||||
Height = 23
|
||||
Height = 19
|
||||
Top = 56
|
||||
Width = 50
|
||||
Enabled = False
|
||||
|
|
@ -261,6 +261,7 @@ object frmRegionControl: TfrmRegionControl
|
|||
DefaultText = 'Node'
|
||||
Header.AutoSizeIndex = 0
|
||||
Header.Columns = <>
|
||||
Header.DefaultHeight = 17
|
||||
Header.MainColumn = -1
|
||||
Header.Options = [hoColumnResize, hoDrag]
|
||||
TabOrder = 1
|
||||
|
|
@ -304,6 +305,7 @@ object frmRegionControl: TfrmRegionControl
|
|||
Text = 'Regions'
|
||||
Width = 158
|
||||
end>
|
||||
Header.DefaultHeight = 17
|
||||
Header.Options = [hoAutoResize, hoVisible]
|
||||
Header.ParentFont = True
|
||||
Header.Style = hsFlatButtons
|
||||
|
|
@ -442,8 +444,8 @@ object frmRegionControl: TfrmRegionControl
|
|||
Top = 1
|
||||
Width = 458
|
||||
Align = alClient
|
||||
ClientHeight = 378
|
||||
ClientWidth = 458
|
||||
ClientHeight = 374
|
||||
ClientWidth = 454
|
||||
TabOrder = 0
|
||||
object pbArea: TPaintBox
|
||||
Left = 0
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ type
|
|||
FY, FOrgY: Word;
|
||||
FZ, FOrgZ: ShortInt;
|
||||
FSelected: Boolean;
|
||||
FCanBeEdited: Boolean;
|
||||
FLocked: Boolean;
|
||||
FChanged: Boolean;
|
||||
FPriority: Integer;
|
||||
|
|
@ -67,6 +68,7 @@ type
|
|||
property Y: Word read FY write SetY;
|
||||
property Z: ShortInt read FZ write SetZ;
|
||||
property Selected: Boolean read FSelected write SetSelected;
|
||||
property CanBeEdited: Boolean read FCanBeEdited write FCanBeEdited;
|
||||
property Locked: Boolean read FLocked write SetLocked;
|
||||
property Changed: Boolean read FChanged;
|
||||
property Priority: Integer read FPriority write FPriority;
|
||||
|
|
|
|||
Loading…
Reference in New Issue