- Realigned TfrmLargeScaleCommand
- Fixed overlay being drawn with correct color and alpha
This commit is contained in:
parent
5d7c40d579
commit
ff87bdea15
|
@ -338,8 +338,8 @@
|
||||||
</CodeGeneration>
|
</CodeGeneration>
|
||||||
<Linking>
|
<Linking>
|
||||||
<Debugging>
|
<Debugging>
|
||||||
<UseLineInfoUnit Value="False"/>
|
<GenerateDebugInfo Value="True"/>
|
||||||
<StripSymbols Value="True"/>
|
<UseExternalDbgSyms Value="True"/>
|
||||||
</Debugging>
|
</Debugging>
|
||||||
<LinkSmart Value="True"/>
|
<LinkSmart Value="True"/>
|
||||||
<Options>
|
<Options>
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -42,14 +42,17 @@ type
|
||||||
{ TfrmLargeScaleCommand }
|
{ TfrmLargeScaleCommand }
|
||||||
|
|
||||||
TfrmLargeScaleCommand = class(TForm)
|
TfrmLargeScaleCommand = class(TForm)
|
||||||
btnClearTerrain: TSpeedButton;
|
btnAddArea: TSpeedButton;
|
||||||
btnClearIStaticsTiles: TSpeedButton;
|
btnClearArea: TSpeedButton;
|
||||||
btnClearDStaticsTiles: TSpeedButton;
|
btnClearDStaticsTiles: TSpeedButton;
|
||||||
btnDeleteTerrain: TSpeedButton;
|
btnClearIStaticsTiles: TSpeedButton;
|
||||||
btnDeleteIStaticsTiles: TSpeedButton;
|
btnClearTerrain: TSpeedButton;
|
||||||
btnDeleteDStaticsTiles: TSpeedButton;
|
|
||||||
btnExecute: TButton;
|
|
||||||
btnClose: TButton;
|
btnClose: TButton;
|
||||||
|
btnDeleteArea: TSpeedButton;
|
||||||
|
btnDeleteDStaticsTiles: TSpeedButton;
|
||||||
|
btnDeleteIStaticsTiles: TSpeedButton;
|
||||||
|
btnDeleteTerrain: TSpeedButton;
|
||||||
|
btnExecute: TButton;
|
||||||
cbCMEraseTarget: TCheckBox;
|
cbCMEraseTarget: TCheckBox;
|
||||||
gbDrawTerrainTiles: TGroupBox;
|
gbDrawTerrainTiles: TGroupBox;
|
||||||
gbDeleteStaticsTiles: TGroupBox;
|
gbDeleteStaticsTiles: TGroupBox;
|
||||||
|
@ -78,12 +81,6 @@ type
|
||||||
pgDeleteStatics: TPage;
|
pgDeleteStatics: TPage;
|
||||||
pgInsertStatics: TPage;
|
pgInsertStatics: TPage;
|
||||||
pgModifyAltitude: TPage;
|
pgModifyAltitude: TPage;
|
||||||
pnlControls: TPanel;
|
|
||||||
pnlDrawTerrainTilesControls: TPanel;
|
|
||||||
pnlAreaControls: TPanel;
|
|
||||||
pnlDrawTerrainTilesControls1: TPanel;
|
|
||||||
pnlDrawTerrainTilesControls2: TPanel;
|
|
||||||
pnlLeft: TPanel;
|
|
||||||
pbArea: TPaintBox;
|
pbArea: TPaintBox;
|
||||||
pgArea: TPage;
|
pgArea: TPage;
|
||||||
pgDrawTerrain: TPage;
|
pgDrawTerrain: TPage;
|
||||||
|
@ -94,15 +91,8 @@ type
|
||||||
rbSetTerrainAltitude: TRadioButton;
|
rbSetTerrainAltitude: TRadioButton;
|
||||||
rbRelativeAltitudeChange: TRadioButton;
|
rbRelativeAltitudeChange: TRadioButton;
|
||||||
sbArea: TScrollBox;
|
sbArea: TScrollBox;
|
||||||
btnAddArea: TSpeedButton;
|
|
||||||
btnDeleteArea: TSpeedButton;
|
|
||||||
seDeleteStaticsZ1: TSpinEdit;
|
seDeleteStaticsZ1: TSpinEdit;
|
||||||
seDeleteStaticsZ2: TSpinEdit;
|
seDeleteStaticsZ2: TSpinEdit;
|
||||||
seX1: TSpinEdit;
|
|
||||||
seX2: TSpinEdit;
|
|
||||||
seY1: TSpinEdit;
|
|
||||||
seY2: TSpinEdit;
|
|
||||||
btnClearArea: TSpeedButton;
|
|
||||||
seTerrainAltitude1: TSpinEdit;
|
seTerrainAltitude1: TSpinEdit;
|
||||||
seTerrainAltitude2: TSpinEdit;
|
seTerrainAltitude2: TSpinEdit;
|
||||||
seRelativeAltitude: TSpinEdit;
|
seRelativeAltitude: TSpinEdit;
|
||||||
|
@ -110,11 +100,15 @@ type
|
||||||
seInsertStaticsZ: TSpinEdit;
|
seInsertStaticsZ: TSpinEdit;
|
||||||
seCMOffsetX: TSpinEdit;
|
seCMOffsetX: TSpinEdit;
|
||||||
seCMOffsetY: TSpinEdit;
|
seCMOffsetY: TSpinEdit;
|
||||||
|
seX1: TSpinEdit;
|
||||||
|
seX2: TSpinEdit;
|
||||||
|
seY1: TSpinEdit;
|
||||||
|
seY2: TSpinEdit;
|
||||||
vdtTerrainTiles: TVirtualDrawTree;
|
vdtTerrainTiles: TVirtualDrawTree;
|
||||||
vdtInsertStaticsTiles: TVirtualDrawTree;
|
vdtInsertStaticsTiles: TVirtualDrawTree;
|
||||||
vdtDeleteStaticsTiles: TVirtualDrawTree;
|
vdtDeleteStaticsTiles: TVirtualDrawTree;
|
||||||
vstArea: TVirtualStringTree;
|
|
||||||
vstActions: TVirtualStringTree;
|
vstActions: TVirtualStringTree;
|
||||||
|
vstArea: TVirtualStringTree;
|
||||||
procedure FormShow(Sender: TObject);
|
procedure FormShow(Sender: TObject);
|
||||||
procedure btnAddAreaClick(Sender: TObject);
|
procedure btnAddAreaClick(Sender: TObject);
|
||||||
procedure btnClearDStaticsTilesClick(Sender: TObject);
|
procedure btnClearDStaticsTilesClick(Sender: TObject);
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
object frmMain: TfrmMain
|
object frmMain: TfrmMain
|
||||||
Left = 257
|
Left = 257
|
||||||
Height = 603
|
Height = 579
|
||||||
Top = 135
|
Top = 135
|
||||||
Width = 766
|
Width = 755
|
||||||
ActiveControl = oglGameWindow
|
ActiveControl = oglGameWindow
|
||||||
Caption = 'UO CentrED'
|
Caption = 'UO CentrED'
|
||||||
ClientHeight = 580
|
ClientHeight = 556
|
||||||
ClientWidth = 766
|
ClientWidth = 755
|
||||||
Constraints.MinHeight = 603
|
Constraints.MinHeight = 500
|
||||||
Constraints.MinWidth = 766
|
Constraints.MinWidth = 750
|
||||||
Font.Height = -11
|
Font.Height = -11
|
||||||
Menu = MainMenu1
|
Menu = MainMenu1
|
||||||
OnActivate = FormActivate
|
OnActivate = FormActivate
|
||||||
|
@ -23,12 +23,12 @@ object frmMain: TfrmMain
|
||||||
object pnlBottom: TPanel
|
object pnlBottom: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 31
|
Height = 31
|
||||||
Top = 549
|
Top = 525
|
||||||
Width = 766
|
Width = 755
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
ClientHeight = 31
|
ClientHeight = 31
|
||||||
ClientWidth = 766
|
ClientWidth = 755
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
object lblX: TLabel
|
object lblX: TLabel
|
||||||
Left = 11
|
Left = 11
|
||||||
|
@ -55,7 +55,7 @@ object frmMain: TfrmMain
|
||||||
ParentColor = False
|
ParentColor = False
|
||||||
end
|
end
|
||||||
object lblTip: TLabel
|
object lblTip: TLabel
|
||||||
Left = 528
|
Left = 517
|
||||||
Height = 31
|
Height = 31
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 230
|
Width = 230
|
||||||
|
@ -67,7 +67,7 @@ object frmMain: TfrmMain
|
||||||
ParentColor = False
|
ParentColor = False
|
||||||
end
|
end
|
||||||
object lblTipC: TLabel
|
object lblTipC: TLabel
|
||||||
Left = 498
|
Left = 487
|
||||||
Height = 31
|
Height = 31
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 30
|
Width = 30
|
||||||
|
@ -108,7 +108,7 @@ object frmMain: TfrmMain
|
||||||
end
|
end
|
||||||
object pcLeft: TPageControl
|
object pcLeft: TPageControl
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 525
|
Height = 501
|
||||||
Top = 24
|
Top = 24
|
||||||
Width = 224
|
Width = 224
|
||||||
ActivePage = tsTiles
|
ActivePage = tsTiles
|
||||||
|
@ -117,7 +117,7 @@ object frmMain: TfrmMain
|
||||||
TabOrder = 1
|
TabOrder = 1
|
||||||
object tsTiles: TTabSheet
|
object tsTiles: TTabSheet
|
||||||
Caption = 'Tiles'
|
Caption = 'Tiles'
|
||||||
ClientHeight = 492
|
ClientHeight = 468
|
||||||
ClientWidth = 218
|
ClientWidth = 218
|
||||||
object lblFilter: TLabel
|
object lblFilter: TLabel
|
||||||
AnchorSideLeft.Control = cbTerrain
|
AnchorSideLeft.Control = cbTerrain
|
||||||
|
@ -140,7 +140,7 @@ object frmMain: TfrmMain
|
||||||
AnchorSideRight.Side = asrBottom
|
AnchorSideRight.Side = asrBottom
|
||||||
AnchorSideBottom.Control = spTileList
|
AnchorSideBottom.Control = spTileList
|
||||||
Left = 4
|
Left = 4
|
||||||
Height = 242
|
Height = 218
|
||||||
Top = 56
|
Top = 56
|
||||||
Width = 210
|
Width = 210
|
||||||
Anchors = [akTop, akLeft, akRight, akBottom]
|
Anchors = [akTop, akLeft, akRight, akBottom]
|
||||||
|
@ -194,7 +194,7 @@ object frmMain: TfrmMain
|
||||||
AnchorSideBottom.Side = asrBottom
|
AnchorSideBottom.Side = asrBottom
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 189
|
Height = 189
|
||||||
Top = 303
|
Top = 279
|
||||||
Width = 218
|
Width = 218
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
Anchors = [akTop, akLeft, akRight, akBottom]
|
Anchors = [akTop, akLeft, akRight, akBottom]
|
||||||
|
@ -543,7 +543,7 @@ object frmMain: TfrmMain
|
||||||
Cursor = crVSplit
|
Cursor = crVSplit
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 5
|
Height = 5
|
||||||
Top = 298
|
Top = 274
|
||||||
Width = 218
|
Width = 218
|
||||||
Align = alNone
|
Align = alNone
|
||||||
Anchors = [akLeft, akRight, akBottom]
|
Anchors = [akLeft, akRight, akBottom]
|
||||||
|
@ -557,7 +557,7 @@ object frmMain: TfrmMain
|
||||||
Left = 110
|
Left = 110
|
||||||
Height = 19
|
Height = 19
|
||||||
Hint = 'Append S or T to restrict the search to Statics or Terrain.'
|
Hint = 'Append S or T to restrict the search to Statics or Terrain.'
|
||||||
Top = 271
|
Top = 247
|
||||||
Width = 96
|
Width = 96
|
||||||
Anchors = [akRight, akBottom]
|
Anchors = [akRight, akBottom]
|
||||||
BorderSpacing.Right = 8
|
BorderSpacing.Right = 8
|
||||||
|
@ -844,7 +844,7 @@ object frmMain: TfrmMain
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 24
|
Height = 24
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 766
|
Width = 755
|
||||||
Caption = 'tbMain'
|
Caption = 'tbMain'
|
||||||
Images = ImageList1
|
Images = ImageList1
|
||||||
ParentShowHint = False
|
ParentShowHint = False
|
||||||
|
@ -1029,13 +1029,13 @@ object frmMain: TfrmMain
|
||||||
AnchorSideBottom.Control = spChat
|
AnchorSideBottom.Control = spChat
|
||||||
Left = 224
|
Left = 224
|
||||||
Height = 22
|
Height = 22
|
||||||
Top = 413
|
Top = 389
|
||||||
Width = 542
|
Width = 531
|
||||||
Anchors = [akLeft, akRight, akBottom]
|
Anchors = [akLeft, akRight, akBottom]
|
||||||
BevelInner = bvRaised
|
BevelInner = bvRaised
|
||||||
BevelOuter = bvLowered
|
BevelOuter = bvLowered
|
||||||
ClientHeight = 22
|
ClientHeight = 22
|
||||||
ClientWidth = 542
|
ClientWidth = 531
|
||||||
TabOrder = 3
|
TabOrder = 3
|
||||||
object lblChatHeaderCaption: TLabel
|
object lblChatHeaderCaption: TLabel
|
||||||
Cursor = crHandPoint
|
Cursor = crHandPoint
|
||||||
|
@ -1063,12 +1063,12 @@ object frmMain: TfrmMain
|
||||||
AnchorSideBottom.Control = pnlBottom
|
AnchorSideBottom.Control = pnlBottom
|
||||||
Left = 224
|
Left = 224
|
||||||
Height = 109
|
Height = 109
|
||||||
Top = 440
|
Top = 416
|
||||||
Width = 542
|
Width = 531
|
||||||
Anchors = [akTop, akLeft, akRight, akBottom]
|
Anchors = [akTop, akLeft, akRight, akBottom]
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
ClientHeight = 109
|
ClientHeight = 109
|
||||||
ClientWidth = 542
|
ClientWidth = 531
|
||||||
TabOrder = 4
|
TabOrder = 4
|
||||||
Visible = False
|
Visible = False
|
||||||
object vstChat: TVirtualStringTree
|
object vstChat: TVirtualStringTree
|
||||||
|
@ -1076,7 +1076,7 @@ object frmMain: TfrmMain
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 90
|
Height = 90
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 542
|
Width = 531
|
||||||
Align = alClient
|
Align = alClient
|
||||||
DefaultText = 'Node'
|
DefaultText = 'Node'
|
||||||
Header.AutoSizeIndex = 2
|
Header.AutoSizeIndex = 2
|
||||||
|
@ -1094,7 +1094,7 @@ object frmMain: TfrmMain
|
||||||
item
|
item
|
||||||
Position = 2
|
Position = 2
|
||||||
Text = 'Message'
|
Text = 'Message'
|
||||||
Width = 392
|
Width = 381
|
||||||
end>
|
end>
|
||||||
Header.DefaultHeight = 17
|
Header.DefaultHeight = 17
|
||||||
Header.MainColumn = 2
|
Header.MainColumn = 2
|
||||||
|
@ -1114,7 +1114,7 @@ object frmMain: TfrmMain
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 19
|
Height = 19
|
||||||
Top = 90
|
Top = 90
|
||||||
Width = 542
|
Width = 531
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
OnKeyPress = edChatKeyPress
|
OnKeyPress = edChatKeyPress
|
||||||
TabOrder = 1
|
TabOrder = 1
|
||||||
|
@ -1128,8 +1128,8 @@ object frmMain: TfrmMain
|
||||||
Cursor = crVSplit
|
Cursor = crVSplit
|
||||||
Left = 224
|
Left = 224
|
||||||
Height = 5
|
Height = 5
|
||||||
Top = 435
|
Top = 411
|
||||||
Width = 542
|
Width = 531
|
||||||
Align = alNone
|
Align = alNone
|
||||||
Anchors = [akLeft, akRight, akBottom]
|
Anchors = [akLeft, akRight, akBottom]
|
||||||
AutoSnap = False
|
AutoSnap = False
|
||||||
|
@ -1145,9 +1145,9 @@ object frmMain: TfrmMain
|
||||||
AnchorSideRight.Side = asrBottom
|
AnchorSideRight.Side = asrBottom
|
||||||
AnchorSideBottom.Control = pnlChatHeader
|
AnchorSideBottom.Control = pnlChatHeader
|
||||||
Left = 224
|
Left = 224
|
||||||
Height = 389
|
Height = 365
|
||||||
Top = 24
|
Top = 24
|
||||||
Width = 542
|
Width = 531
|
||||||
Anchors = [akTop, akLeft, akRight, akBottom]
|
Anchors = [akTop, akLeft, akRight, akBottom]
|
||||||
OnDblClick = oglGameWindowDblClick
|
OnDblClick = oglGameWindowDblClick
|
||||||
OnKeyDown = oglGameWindowKeyDown
|
OnKeyDown = oglGameWindowKeyDown
|
||||||
|
|
|
@ -2312,6 +2312,7 @@ begin
|
||||||
blockInfo^.Text.Render(blockInfo^.ScreenRect);
|
blockInfo^.Text.Render(blockInfo^.ScreenRect);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
glColor4f(1.0, 1.0, 1.0, 1.0);
|
||||||
FOverlayUI.Draw(oglGameWindow);
|
FOverlayUI.Draw(oglGameWindow);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue