This commit is contained in:
Chris Forbes
2010-11-01 20:25:03 +13:00
parent 526cf6059a
commit fa35f6caa4
8 changed files with 47 additions and 23 deletions

View File

@@ -37,8 +37,6 @@ namespace OpenRA.FileFormats.Graphics
Size WindowSize { get; } Size WindowSize { get; }
void Begin();
void End();
void Clear( Color color ); void Clear( Color color );
void Present( IInputHandler inputHandler ); void Present( IInputHandler inputHandler );

View File

@@ -9,14 +9,14 @@
#endregion #endregion
using System; using System;
using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Windows.Forms;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.FileFormats.Graphics; using OpenRA.FileFormats.Graphics;
using OpenRA.Support; using OpenRA.Support;
using System.Windows.Forms;
using System.Collections.Generic;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
@@ -71,7 +71,6 @@ namespace OpenRA.Graphics
public void BeginFrame(float2 scroll) public void BeginFrame(float2 scroll)
{ {
device.Begin();
device.Clear(Color.Black); device.Clear(Color.Black);
float2 r1 = new float2(2f/Resolution.Width, -2f/Resolution.Height); float2 r1 = new float2(2f/Resolution.Width, -2f/Resolution.Height);
@@ -95,7 +94,6 @@ namespace OpenRA.Graphics
public void EndFrame( IInputHandler inputHandler ) public void EndFrame( IInputHandler inputHandler )
{ {
Flush(); Flush();
device.End();
device.Present( inputHandler ); device.Present( inputHandler );
} }

View File

@@ -8,13 +8,7 @@
*/ */
#endregion #endregion
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using OpenRA.Widgets; using OpenRA.Widgets;
using OpenRA.Network;
namespace OpenRA namespace OpenRA
{ {

View File

@@ -1,9 +1,19 @@
using System; #region Copyright & License Information
/*
* Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see LICENSE.
*/
#endregion
using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using System.Collections.Generic;
namespace OpenRA namespace OpenRA
{ {

View File

@@ -1,4 +1,14 @@
using System.Drawing; #region Copyright & License Information
/*
* Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see LICENSE.
*/
#endregion
using System.Drawing;
using OpenRA.Network; using OpenRA.Network;
using OpenRA.Traits; using OpenRA.Traits;

View File

@@ -1,4 +1,14 @@
using System.Drawing; #region Copyright & License Information
/*
* Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see LICENSE.
*/
#endregion
using System.Drawing;
using OpenRA.Network; using OpenRA.Network;
using OpenRA.Traits; using OpenRA.Traits;

View File

@@ -11,7 +11,6 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Windows.Forms;
using OpenRA.FileFormats.Graphics; using OpenRA.FileFormats.Graphics;
using Tao.Cg; using Tao.Cg;
using Tao.OpenGl; using Tao.OpenGl;
@@ -128,9 +127,6 @@ namespace OpenRA.GlRenderer
CheckGlError(); CheckGlError();
} }
public void Begin() { }
public void End() { }
public void Clear( Color c ) public void Clear( Color c )
{ {
Gl.glClearColor( 0, 0, 0, 0 ); Gl.glClearColor( 0, 0, 0, 0 );

View File

@@ -1,4 +1,14 @@
using System.Drawing; #region Copyright & License Information
/*
* Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see LICENSE.
*/
#endregion
using System.Drawing;
using System.IO; using System.IO;
using OpenRA.FileFormats.Graphics; using OpenRA.FileFormats.Graphics;
using OpenRA.Graphics; using OpenRA.Graphics;
@@ -19,8 +29,6 @@ namespace OpenRA.Renderer.Null
public void EnableScissor(int left, int top, int width, int height) { } public void EnableScissor(int left, int top, int width, int height) { }
public void DisableScissor() { } public void DisableScissor() { }
public void Begin() { }
public void End() { }
public void Clear(Color c) { } public void Clear(Color c) { }
public void Present(IInputHandler ih) public void Present(IInputHandler ih)