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

87
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;
@@ -27,7 +24,7 @@ namespace OpenRA.Renderer.Cg
{ {
public IGraphicsDevice Create(Size size, WindowMode windowMode) public IGraphicsDevice Create(Size size, WindowMode windowMode)
{ {
return new GraphicsDevice( size, windowMode ); return new GraphicsDevice(size, windowMode);
} }
} }
@@ -50,12 +47,12 @@ namespace OpenRA.Renderer.Cg
throw new InvalidOperationException("CG Error. See graphics.log for details"); throw new InvalidOperationException("CG Error. See graphics.log for details");
}; };
public GraphicsDevice( Size size, WindowMode window ) public GraphicsDevice(Size size, WindowMode window)
{ {
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",
@@ -66,85 +63,59 @@ namespace OpenRA.Renderer.Cg
cgContext = Tao.Cg.Cg.cgCreateContext(); cgContext = Tao.Cg.Cg.cgCreateContext();
Tao.Cg.Cg.cgSetErrorCallback( CgErrorCallback ); Tao.Cg.Cg.cgSetErrorCallback(CgErrorCallback);
Tao.Cg.CgGl.cgGLRegisterStates( cgContext ); Tao.Cg.CgGl.cgGLRegisterStates(cgContext);
Tao.Cg.CgGl.cgGLSetManageTextureParameters( cgContext, true ); Tao.Cg.CgGl.cgGLSetManageTextureParameters(cgContext, true);
vertexProfile = CgGl.cgGLGetLatestProfile( CgGl.CG_GL_VERTEX ); vertexProfile = CgGl.cgGLGetLatestProfile(CgGl.CG_GL_VERTEX);
fragmentProfile = CgGl.cgGLGetLatestProfile( CgGl.CG_GL_FRAGMENT ); fragmentProfile = CgGl.cgGLGetLatestProfile(CgGl.CG_GL_FRAGMENT);
Gl.glEnableClientState( Gl.GL_VERTEX_ARRAY ); Gl.glEnableClientState(Gl.GL_VERTEX_ARRAY);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
Gl.glEnableClientState( Gl.GL_TEXTURE_COORD_ARRAY ); Gl.glEnableClientState(Gl.GL_TEXTURE_COORD_ARRAY);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
Sdl.SDL_SetModState( 0 ); // i have had enough. Sdl.SDL_SetModState(0); // i have had enough.
input = new SdlInput( surf ); input = new SdlInput(surf);
} }
public void EnableScissor( int left, int top, int width, int height ) public void EnableScissor(int left, int top, int width, int height)
{ {
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);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
} }
public void DisableScissor() public void DisableScissor()
{ {
Gl.glDisable( Gl.GL_SCISSOR_TEST ); Gl.glDisable(Gl.GL_SCISSOR_TEST);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
} }
public void Clear() public void Clear() { SdlGraphics.Clear(); }
public void Present() { Sdl.SDL_GL_SwapBuffers(); }
public void PumpInput(IInputHandler inputHandler) { input.PumpInput(inputHandler); }
public void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices)
{ {
Gl.glClearColor( 0, 0, 0, 0 ); SdlGraphics.DrawPrimitives(pt, firstVertex, numVertices);
ErrorHandler.CheckGlError();
Gl.glClear( Gl.GL_COLOR_BUFFER_BIT );
ErrorHandler.CheckGlError();
} }
public void Present() public void SetLineWidth(float width)
{
Sdl.SDL_GL_SwapBuffers();
}
public void PumpInput( IInputHandler inputHandler )
{
input.PumpInput( inputHandler );
}
public void DrawPrimitives( PrimitiveType pt, int firstVertex, int numVertices )
{
Gl.glDrawArrays( ModeFromPrimitiveType( 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 )
{ {
Gl.glLineWidth(width); Gl.glLineWidth(width);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
} }
public IVertexBuffer<Vertex> CreateVertexBuffer( int size ) { return new VertexBuffer<Vertex>( size ); } public IVertexBuffer<Vertex> CreateVertexBuffer(int size) { return new VertexBuffer<Vertex>(size); }
public ITexture CreateTexture() { return new Texture(); } public ITexture CreateTexture() { return new Texture(); }
public ITexture CreateTexture( Bitmap bitmap ) { return new Texture( bitmap ); } public ITexture CreateTexture(Bitmap bitmap) { return new Texture(bitmap); }
public IShader CreateShader( string name ) { return new Shader( this, name ); } public IShader CreateShader(string name) { return new Shader(this, name); }
public int GpuMemoryUsed { get { return 0; } } public int GpuMemoryUsed { get { return 0; } }
} }

70
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;
@@ -27,7 +23,7 @@ namespace OpenRA.Renderer.Glsl
{ {
public IGraphicsDevice Create(Size size, WindowMode windowMode) public IGraphicsDevice Create(Size size, WindowMode windowMode)
{ {
return new GraphicsDevice( size, windowMode ); return new GraphicsDevice(size, windowMode);
} }
} }
@@ -39,80 +35,54 @@ namespace OpenRA.Renderer.Glsl
public Size WindowSize { get { return windowSize; } } public Size WindowSize { get { return windowSize; } }
public GraphicsDevice( Size size, WindowMode window ) public GraphicsDevice(Size size, WindowMode window)
{ {
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",
"GL_ARB_vertex_buffer_object", "GL_ARB_vertex_buffer_object",
}; };
surf = SdlGraphics.InitializeSdlGl( ref windowSize, window, extensions ); surf = SdlGraphics.InitializeSdlGl(ref windowSize, window, extensions);
Gl.glEnableClientState( Gl.GL_VERTEX_ARRAY ); Gl.glEnableClientState(Gl.GL_VERTEX_ARRAY);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
Gl.glEnableClientState( Gl.GL_TEXTURE_COORD_ARRAY ); Gl.glEnableClientState(Gl.GL_TEXTURE_COORD_ARRAY);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
Sdl.SDL_SetModState( 0 ); Sdl.SDL_SetModState(0);
input = new SdlInput( surf ); input = new SdlInput(surf);
} }
public void EnableScissor( int left, int top, int width, int height ) public void EnableScissor(int left, int top, int width, int height)
{ {
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);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
} }
public void DisableScissor() public void DisableScissor()
{ {
Gl.glDisable( Gl.GL_SCISSOR_TEST ); Gl.glDisable(Gl.GL_SCISSOR_TEST);
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() public void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices)
{ {
Sdl.SDL_GL_SwapBuffers(); SdlGraphics.DrawPrimitives(pt, firstVertex, numVertices);
}
public void PumpInput( IInputHandler inputHandler )
{
input.PumpInput(inputHandler);
}
public void DrawPrimitives( PrimitiveType pt, int firstVertex, int numVertices )
{
Gl.glDrawArrays( ModeFromPrimitiveType( 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