epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing more renderer code duplication; cleanup

Browse Source
This commit is contained in:
Chris Forbes
2011-10-29 18:26:01 +13:00
parent 9279161de6
commit 77ebd5d6de
5 changed files with 76 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
OpenRA.Renderer.Cg/GraphicsDevice.cs
View File

@@ -10,9 +10,6 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using OpenRA.FileFormats.Graphics; using OpenRA.FileFormats.Graphics;
using OpenRA.Renderer.SdlCommon; using OpenRA.Renderer.SdlCommon;
using Tao.Cg; using Tao.Cg;
@@ -55,7 +52,7 @@ namespace OpenRA.Renderer.Cg
Console.WriteLine("Using Cg renderer"); Console.WriteLine("Using Cg renderer");
windowSize = size; windowSize = size;
var extensions = new string[] var extensions = new []
{ {
"GL_ARB_vertex_program", "GL_ARB_vertex_program",
"GL_ARB_fragment_program", "GL_ARB_fragment_program",
@@ -87,6 +84,7 @@ namespace OpenRA.Renderer.Cg
{ {
if (width < 0) width = 0; if (width < 0) width = 0;
if (height < 0) height = 0; if (height < 0) height = 0;
Gl.glScissor(left, windowSize.Height - ( top + height ), width, height); Gl.glScissor(left, windowSize.Height - ( top + height ), width, height);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
Gl.glEnable(Gl.GL_SCISSOR_TEST); Gl.glEnable(Gl.GL_SCISSOR_TEST);
@@ -99,40 +97,13 @@ namespace OpenRA.Renderer.Cg
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
} }
public void Clear() public void Clear() { SdlGraphics.Clear(); }
{ public void Present() { Sdl.SDL_GL_SwapBuffers(); }
Gl.glClearColor( 0, 0, 0, 0 ); public void PumpInput(IInputHandler inputHandler) { input.PumpInput(inputHandler); }
ErrorHandler.CheckGlError();
Gl.glClear( Gl.GL_COLOR_BUFFER_BIT );
ErrorHandler.CheckGlError();
}
public void Present()
{
Sdl.SDL_GL_SwapBuffers();
}
public void PumpInput( IInputHandler inputHandler )
{
input.PumpInput( inputHandler );
}
public void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices) public void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices)
{ {
Gl.glDrawArrays( ModeFromPrimitiveType( pt ), firstVertex, numVertices ); SdlGraphics.DrawPrimitives(pt, firstVertex, numVertices);
ErrorHandler.CheckGlError();
}
static int ModeFromPrimitiveType( PrimitiveType pt )
{
switch( pt )
{
case PrimitiveType.PointList: return Gl.GL_POINTS;
case PrimitiveType.LineList: return Gl.GL_LINES;
case PrimitiveType.TriangleList: return Gl.GL_TRIANGLES;
case PrimitiveType.QuadList: return Gl.GL_QUADS;
}
throw new NotImplementedException();
} }
public void SetLineWidth(float width) public void SetLineWidth(float width)

42
OpenRA.Renderer.Gl/GraphicsDevice.cs
View File

@@ -9,11 +9,7 @@
#endregion #endregion
using System; using System;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using OpenRA.FileFormats.Graphics; using OpenRA.FileFormats.Graphics;
using OpenRA.Renderer.SdlCommon; using OpenRA.Renderer.SdlCommon;
using Tao.OpenGl; using Tao.OpenGl;
@@ -44,7 +40,7 @@ namespace OpenRA.Renderer.Glsl
Console.WriteLine("Using Gl renderer"); Console.WriteLine("Using Gl renderer");
windowSize = size; windowSize = size;
var extensions = new string[] var extensions = new []
{ {
"GL_ARB_vertex_shader", "GL_ARB_vertex_shader",
"GL_ARB_fragment_shader", "GL_ARB_fragment_shader",
@@ -67,6 +63,7 @@ namespace OpenRA.Renderer.Glsl
{ {
if (width < 0) width = 0; if (width < 0) width = 0;
if (height < 0) height = 0; if (height < 0) height = 0;
Gl.glScissor(left, windowSize.Height - ( top + height ), width, height); Gl.glScissor(left, windowSize.Height - ( top + height ), width, height);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
Gl.glEnable(Gl.GL_SCISSOR_TEST); Gl.glEnable(Gl.GL_SCISSOR_TEST);
@@ -79,40 +76,13 @@ namespace OpenRA.Renderer.Glsl
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
} }
public void Clear() public void Clear() { SdlGraphics.Clear(); }
{ public void Present() { Sdl.SDL_GL_SwapBuffers(); }
Gl.glClearColor( 0, 0, 0, 0 ); public void PumpInput(IInputHandler inputHandler) { input.PumpInput(inputHandler); }
ErrorHandler.CheckGlError();
Gl.glClear( Gl.GL_COLOR_BUFFER_BIT );
ErrorHandler.CheckGlError();
}
public void Present()
{
Sdl.SDL_GL_SwapBuffers();
}
public void PumpInput( IInputHandler inputHandler )
{
input.PumpInput(inputHandler);
}
public void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices) public void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices)
{ {
Gl.glDrawArrays( ModeFromPrimitiveType( pt ), firstVertex, numVertices ); SdlGraphics.DrawPrimitives(pt, firstVertex, numVertices);
ErrorHandler.CheckGlError();
}
static int ModeFromPrimitiveType( PrimitiveType pt )
{
switch( pt )
{
case PrimitiveType.PointList: return Gl.GL_POINTS;
case PrimitiveType.LineList: return Gl.GL_LINES;
case PrimitiveType.TriangleList: return Gl.GL_TRIANGLES;
case PrimitiveType.QuadList: return Gl.GL_QUADS;
}
throw new NotImplementedException();
} }
public void SetLineWidth( float width ) public void SetLineWidth( float width )

1
OpenRA.Renderer.SdlCommon/ErrorHandler.cs
View File

@@ -11,7 +11,6 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using Tao.OpenGl; using Tao.OpenGl;
using OpenRA.FileFormats;
namespace OpenRA.Renderer.SdlCommon namespace OpenRA.Renderer.SdlCommon
{ {

29
OpenRA.Renderer.SdlCommon/SdlGraphics.cs
View File

@@ -10,12 +10,11 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using OpenRA.FileFormats.Graphics;
using Tao.OpenGl; using Tao.OpenGl;
using Tao.Sdl; using Tao.Sdl;
using OpenRA.FileFormats.Graphics;
namespace OpenRA.Renderer.SdlCommon namespace OpenRA.Renderer.SdlCommon
{ {
@@ -86,6 +85,32 @@ namespace OpenRA.Renderer.SdlCommon
return surf; return surf;
} }
static int ModeFromPrimitiveType(PrimitiveType pt)
{
switch(pt)
{
case PrimitiveType.PointList: return Gl.GL_POINTS;
case PrimitiveType.LineList: return Gl.GL_LINES;
case PrimitiveType.TriangleList: return Gl.GL_TRIANGLES;
case PrimitiveType.QuadList: return Gl.GL_QUADS;
}
throw new NotImplementedException();
}
public static void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices)
{
Gl.glDrawArrays(ModeFromPrimitiveType(pt), firstVertex, numVertices);
ErrorHandler.CheckGlError();
}
public static void Clear()
{
Gl.glClearColor(0, 0, 0, 0);
ErrorHandler.CheckGlError();
Gl.glClear(Gl.GL_COLOR_BUFFER_BIT);
ErrorHandler.CheckGlError();
}
} }
} }

2
OpenRA.Renderer.SdlCommon/SdlInput.cs
View File

@@ -9,9 +9,7 @@
#endregion #endregion
using System; using System;
using System.Drawing;
using System.IO; using System.IO;
using Tao.OpenGl;
using Tao.Sdl; using Tao.Sdl;
namespace OpenRA.Renderer.SdlCommon namespace OpenRA.Renderer.SdlCommon