stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-23 12:22:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Classic modes: event lines were rendered inconsistently while panning the view.

Browse source 
Sectors mode: event lines were not rendered for things targeting highlighted sector.
Added "DropItem" and "CheckFlag" definitions to ACS and DECORATE script configurations.
This commit is contained in:
MaxED 2013-12-03 14:40:40 +00:00
parent 55fb9f872d
commit b27716ce6b
5 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Build/Scripting/ZDoom_ACS.cfg
View file

@ -95,6 +95,7 @@ keywords
CheckActorFloorTexture = "CheckActorFloorTexture(tid, texture)"; CheckActorFloorTexture = "CheckActorFloorTexture(tid, texture)";
CheckActorInventory = "CheckActorInventory(tid, inventoryitem)"; CheckActorInventory = "CheckActorInventory(tid, inventoryitem)";
CheckActorProperty = "CheckActorProperty(tid, property, value)"; CheckActorProperty = "CheckActorProperty(tid, property, value)";
CheckFlag = "bool CheckFlag(int tid, string flag)";
CheckInventory = "CheckInventory(inventoryitem)"; CheckInventory = "CheckInventory(inventoryitem)";
CheckPlayerCamera = "CheckPlayerCamera(player)"; CheckPlayerCamera = "CheckPlayerCamera(player)";
CheckSight = "CheckSight(source, dest, flags)"; CheckSight = "CheckSight(source, dest, flags)";
@ -121,6 +122,7 @@ keywords
Door_LockedRaise = "Door_LockedRaise(tag, speed, delay, lock, lighttag)"; Door_LockedRaise = "Door_LockedRaise(tag, speed, delay, lock, lighttag)";
Door_Open = "Door_Open(tag, speed, lighttag)"; Door_Open = "Door_Open(tag, speed, lighttag)";
Door_Raise = "Door_Raise(tag, speed, delay, lighttag)"; Door_Raise = "Door_Raise(tag, speed, delay, lighttag)";
DropItem = "int DropItem(int tid, string item, int dropamount == -1, int chance == 256)";
Elevator_LowerToNearest = "Elevator_LowerToNearest(tag, speed)"; Elevator_LowerToNearest = "Elevator_LowerToNearest(tag, speed)";
Elevator_MoveToFloor = "Elevator_MoveToFloor(tag, speed)"; Elevator_MoveToFloor = "Elevator_MoveToFloor(tag, speed)";
Elevator_RaiseToNearest = "Elevator_RaiseToNearest(tag, speed)"; Elevator_RaiseToNearest = "Elevator_RaiseToNearest(tag, speed)";

2
Build/Scripting/ZDoom_DECORATE.cfg
View file

@ -129,6 +129,7 @@ keywords
A_ActiveAndUnblock = "A_ActiveAndUnblock"; A_ActiveAndUnblock = "A_ActiveAndUnblock";
A_ChangeFlag = "A_ChangeFlag(string flagname, bool value)"; A_ChangeFlag = "A_ChangeFlag(string flagname, bool value)";
A_ChangeVelocity = "A_ChangeVelocity(float x, float y, float z, int flags)"; A_ChangeVelocity = "A_ChangeVelocity(float x, float y, float z, int flags)";
A_CheckFlag = "A_CheckFlag(string flagname, state label, int check_pointer = AAPTR_DEFAULT)";
A_ClearShadow = "A_ClearShadow"; A_ClearShadow = "A_ClearShadow";
A_CopyFriendliness = "A_CopyFriendliness[(pointer copyfrom)]"; A_CopyFriendliness = "A_CopyFriendliness[(pointer copyfrom)]";
A_DeQueueCorpse = "A_DeQueueCorpse"; A_DeQueueCorpse = "A_DeQueueCorpse";
@ -189,6 +190,7 @@ keywords
A_GiveInventory = "A_GiveInventory(string type, int count[, pointer giveto])"; A_GiveInventory = "A_GiveInventory(string type, int count[, pointer giveto])";
A_GiveToTarget = "A_GiveToTarget(string type, int count[, pointer giveto])"; A_GiveToTarget = "A_GiveToTarget(string type, int count[, pointer giveto])";
A_TakeInventory = "A_TakeInventory(string type, int count[, int flags[, pointer takefrom]])"; A_TakeInventory = "A_TakeInventory(string type, int count[, int flags[, pointer takefrom]])";
A_DropItem = "A_DropItem(string item[, int dropamount [, int chance]])";
A_TakeFromTarget = "A_TakeFromTarget(string type, int count[, pointer takefrom])"; A_TakeFromTarget = "A_TakeFromTarget(string type, int count[, pointer takefrom])";
A_DropInventory = "A_DropInventory(string type)"; A_DropInventory = "A_DropInventory(string type)";
A_SelectWeapon = "A_SelectWeapon(string type)"; A_SelectWeapon = "A_SelectWeapon(string type)";

12
Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs
View file

@ -339,11 +339,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(renderer.StartPlotter(true)) if(renderer.StartPlotter(true))
{ {
renderer.PlotLinedefSet(General.Map.Map.Linedefs); renderer.PlotLinedefSet(General.Map.Map.Linedefs);
for(int i = 0; i < Linedef.NUM_ARGS; i++) BuilderPlug.Me.PlotAssociations(renderer, association[i]); if(!panning) //mxd
for(int i = 0; i < Linedef.NUM_ARGS; i++) BuilderPlug.Me.PlotAssociations(renderer, association[i]);
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
{ {
BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso); if(!panning) BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso);
renderer.PlotLinedef(highlighted, General.Colors.Highlight); renderer.PlotLinedef(highlighted, General.Colors.Highlight);
} }
renderer.PlotVerticesSet(General.Map.Map.Vertices); renderer.PlotVerticesSet(General.Map.Map.Vertices);
@ -361,9 +362,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Render selection // Render selection
if(renderer.StartOverlay(true)) if(renderer.StartOverlay(true))
{ {
if(!panning) //mxd if (!panning) { //mxd
for(int i = 0; i < Linedef.NUM_ARGS; i++) BuilderPlug.Me.RenderAssociations(renderer, association[i]); for (int i = 0; i < Linedef.NUM_ARGS; i++) BuilderPlug.Me.RenderAssociations(renderer, association[i]);
if(!panning && (highlighted != null) && !highlighted.IsDisposed) BuilderPlug.Me.RenderReverseAssociations(renderer, highlightasso); //mxd if ((highlighted != null) && !highlighted.IsDisposed) BuilderPlug.Me.RenderReverseAssociations(renderer, highlightasso); //mxd
}
if(selecting) RenderMultiSelection(); if(selecting) RenderMultiSelection();
renderer.Finish(); renderer.Finish();
} }

12
Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs
View file

@ -606,7 +606,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
{ {
renderer.PlotSector(highlighted, General.Colors.Highlight); renderer.PlotSector(highlighted, General.Colors.Highlight);
BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso); if(!panning) BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso);
} }
renderer.Finish(); renderer.Finish();
} }
@ -619,17 +619,17 @@ namespace CodeImp.DoomBuilder.BuilderModes
renderer.Finish(); renderer.Finish();
} }
// Render overlay
UpdateOverlay();
// Render selection // Render selection
if(renderer.StartOverlay(true)) if(renderer.StartOverlay(false))
{ {
if(highlighted != null && !highlighted.IsDisposed) BuilderPlug.Me.RenderReverseAssociations(renderer, highlightasso); //mxd if(!panning && highlighted != null && !highlighted.IsDisposed) BuilderPlug.Me.RenderReverseAssociations(renderer, highlightasso); //mxd
if(selecting) RenderMultiSelection(); if(selecting) RenderMultiSelection();
renderer.Finish(); renderer.Finish();
} }
// Render overlay
UpdateOverlay();
renderer.Present(); renderer.Present();
} }

13
Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
View file

@ -143,12 +143,13 @@ namespace CodeImp.DoomBuilder.BuilderModes
renderer.RedrawSurface(); renderer.RedrawSurface();
// Render lines and vertices // Render lines and vertices
if(renderer.StartPlotter(true)) if (renderer.StartPlotter(true)) {
{
renderer.PlotLinedefSet(General.Map.Map.Linedefs); renderer.PlotLinedefSet(General.Map.Map.Linedefs);
renderer.PlotVerticesSet(General.Map.Map.Vertices); renderer.PlotVerticesSet(General.Map.Map.Vertices);
for (int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.Me.PlotAssociations(renderer, association[i]); if(!panning) { //mxd
if ((highlighted != null) && !highlighted.IsDisposed) BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso); for(int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.Me.PlotAssociations(renderer, association[i]);
if((highlighted != null) && !highlighted.IsDisposed) BuilderPlug.Me.PlotReverseAssociations(renderer, highlightasso);
}
renderer.Finish(); renderer.Finish();
} }
@ -161,12 +162,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
for(int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.Me.RenderAssociations(renderer, association[i]); for(int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.Me.RenderAssociations(renderer, association[i]);
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
{ {
if(!panning) BuilderPlug.Me.RenderReverseAssociations(renderer, highlightasso); //mxd
renderer.RenderThing(highlighted, General.Colors.Highlight, 1.0f); renderer.RenderThing(highlighted, General.Colors.Highlight, 1.0f);
if(!panning) BuilderPlug.Me.RenderReverseAssociations(renderer, highlightasso); //mxd
} }
//mxd //mxd
if(General.Settings.GZShowEventLines) { if(!panning && General.Settings.GZShowEventLines) {
List<Line3D> lines = GZBuilder.Data.LinksCollector.GetThingLinks(General.Map.ThingsFilter.VisibleThings); List<Line3D> lines = GZBuilder.Data.LinksCollector.GetThingLinks(General.Map.ThingsFilter.VisibleThings);
foreach(Line3D l in lines) { foreach(Line3D l in lines) {