This commit is contained in:
codeimp 2007-11-21 12:50:56 +00:00
parent 9733b3ea13
commit 0b333dba8f
6 changed files with 27 additions and 31 deletions

View file

@ -240,13 +240,9 @@ namespace CodeImp.DoomBuilder.Editing
// This redraws the display
public unsafe override void RedrawDisplay()
{
// Start with a clear display
if(renderer.StartRendering(true, true))
// Start rendering
if(renderer.Start(true, false))
{
// Render things
renderer.SetThingsRenderOrder(false);
renderer.RenderThingSet(General.Map.Map.Things);
// Render lines and vertices
renderer.RenderLinedefSet(General.Map.Map.Linedefs);
renderer.RenderVerticesSet(General.Map.Map.Vertices);
@ -257,7 +253,7 @@ namespace CodeImp.DoomBuilder.Editing
renderer.RenderVertex(dragitem, ColorCollection.HIGHLIGHT);
// Done
renderer.FinishRendering();
renderer.Finish();
}
}

View file

@ -111,7 +111,7 @@ namespace CodeImp.DoomBuilder.Editing
public unsafe override void RedrawDisplay()
{
// Start with a clear display
if(renderer.StartRendering(true, true))
if(renderer.Start(true, true))
{
// Render things
renderer.SetThingsRenderOrder(false);
@ -128,7 +128,7 @@ namespace CodeImp.DoomBuilder.Editing
renderer.RenderVerticesSet(General.Map.Map.Vertices);
// Done
renderer.FinishRendering();
renderer.Finish();
}
}
@ -136,7 +136,7 @@ namespace CodeImp.DoomBuilder.Editing
protected void Highlight(Linedef l)
{
// Update display
if(renderer.StartRendering(false, false))
if(renderer.Start(false, false))
{
// Undraw previous highlight
if(highlighted != null)
@ -158,7 +158,7 @@ namespace CodeImp.DoomBuilder.Editing
}
// Done
renderer.FinishRendering();
renderer.Finish();
}
// Show highlight info

View file

@ -109,7 +109,7 @@ namespace CodeImp.DoomBuilder.Editing
public unsafe override void RedrawDisplay()
{
// Start with a clear display
if(renderer.StartRendering(true, true))
if(renderer.Start(true, true))
{
// Render things
renderer.SetThingsRenderOrder(false);
@ -124,7 +124,7 @@ namespace CodeImp.DoomBuilder.Editing
renderer.RenderSector(highlighted, General.Colors.Highlight);
// Done
renderer.FinishRendering();
renderer.Finish();
}
}
@ -132,7 +132,7 @@ namespace CodeImp.DoomBuilder.Editing
protected void Highlight(Sector s)
{
// Update display
if(renderer.StartRendering(false, false))
if(renderer.Start(false, false))
{
// Undraw previous highlight
if(highlighted != null)
@ -160,7 +160,7 @@ namespace CodeImp.DoomBuilder.Editing
*/
// Done
renderer.FinishRendering();
renderer.Finish();
}
// Show highlight info

View file

@ -111,7 +111,7 @@ namespace CodeImp.DoomBuilder.Editing
public unsafe override void RedrawDisplay()
{
// Start with a clear display
if(renderer.StartRendering(true, true))
if(renderer.Start(true, true))
{
// Render lines and vertices
renderer.RenderLinedefSet(General.Map.Map.Linedefs);
@ -126,7 +126,7 @@ namespace CodeImp.DoomBuilder.Editing
renderer.RenderThing(highlighted, General.Colors.Highlight);
// Done
renderer.FinishRendering();
renderer.Finish();
}
}
@ -134,7 +134,7 @@ namespace CodeImp.DoomBuilder.Editing
protected void Highlight(Thing t)
{
// Update display
if(renderer.StartRendering(false, false))
if(renderer.Start(false, false))
{
// Undraw previous highlight
if(highlighted != null)
@ -148,7 +148,7 @@ namespace CodeImp.DoomBuilder.Editing
renderer.RenderThing(highlighted, General.Colors.Highlight);
// Done
renderer.FinishRendering();
renderer.Finish();
}
// Show highlight info

View file

@ -111,7 +111,7 @@ namespace CodeImp.DoomBuilder.Editing
public unsafe override void RedrawDisplay()
{
// Start with a clear display
if(renderer.StartRendering(true, true))
if(renderer.Start(true, true))
{
// Render things
renderer.SetThingsRenderOrder(false);
@ -126,7 +126,7 @@ namespace CodeImp.DoomBuilder.Editing
renderer.RenderVertex(highlighted, ColorCollection.HIGHLIGHT);
// Done
renderer.FinishRendering();
renderer.Finish();
}
}
@ -134,7 +134,7 @@ namespace CodeImp.DoomBuilder.Editing
protected void Highlight(Vertex v)
{
// Update display
if(renderer.StartRendering(false, false))
if(renderer.Start(false, false))
{
// Undraw previous highlight
if(highlighted != null)
@ -148,7 +148,7 @@ namespace CodeImp.DoomBuilder.Editing
renderer.RenderVertex(highlighted, ColorCollection.HIGHLIGHT);
// Done
renderer.FinishRendering();
renderer.Finish();
}
// Show highlight info
@ -205,11 +205,11 @@ namespace CodeImp.DoomBuilder.Editing
}
// Update display
if(renderer.StartRendering(false, false))
if(renderer.Start(false, false))
{
// Undraw highlight to show selection
renderer.RenderVertex(highlighted, renderer.DetermineVertexColor(highlighted));
renderer.FinishRendering();
renderer.Finish();
}
}
}
@ -224,11 +224,11 @@ namespace CodeImp.DoomBuilder.Editing
if(highlighted != null)
{
// Update display
if(renderer.StartRendering(false, false))
if(renderer.Start(false, false))
{
// Render highlighted item
renderer.RenderVertex(highlighted, ColorCollection.HIGHLIGHT);
renderer.FinishRendering();
renderer.Finish();
}
}
}

View file

@ -757,7 +757,7 @@ namespace CodeImp.DoomBuilder.Rendering
#region ================== Rendering
// This begins a drawing session
public unsafe bool StartRendering(bool clearstructs, bool clearthings)
public unsafe bool Start(bool clearstructs, bool clearthings)
{
// Rendertargets available?
if((structtex != null) && (thingstex != null))
@ -791,20 +791,20 @@ namespace CodeImp.DoomBuilder.Rendering
else
{
// Can't render!
FinishRendering();
Finish();
return false;
}
}
else
{
// Can't render!
FinishRendering();
Finish();
return false;
}
}
// This ends a drawing session
public void FinishRendering()
public void Finish()
{
// Stop rendering
graphics.FinishRendering();