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

inverting the Engine <-> GL project dependency.

Browse Source
This commit is contained in:
Bob
2010-02-17 19:52:54 +13:00
parent 680f2a1bc7
commit e6120238c7
12 changed files with 214 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -23,3 +23,5 @@ log.txt
cg.dll
cgGL.dll
glfw.dll
/OpenRa.Gl.dll

80
OpenRa.FileFormats/Graphics/IGraphicsDevice.cs Executable file
View File

@@ -0,0 +1,80 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Drawing;
using System.IO;
namespace OpenRa.FileFormats.Graphics
{
[AttributeUsage( AttributeTargets.Assembly )]
public class RendererAttribute : Attribute
{
public readonly Type Type;
public RendererAttribute( Type graphicsDeviceType )
{
if( !typeof( IGraphicsDevice ).IsAssignableFrom( graphicsDeviceType ) )
throw new InvalidOperationException( "Incorrect type in RendererAttribute" );
Type = graphicsDeviceType;
}
}
public interface IGraphicsDevice
{
IVertexBuffer<T> CreateVertexBuffer<T>( int length ) where T : struct;
IIndexBuffer CreateIndexBuffer( int length );
ITexture CreateTexture( Bitmap bitmap );
IShader CreateShader( Stream stream );
void Begin();
void End();
void Clear( Color color );
void Present();
void DrawIndexedPrimitives( PrimitiveType type, Range<int> vertexRange, Range<int> indexRange );
void DrawIndexedPrimitives( PrimitiveType type, int vertexPool, int numPrimitives );
void EnableScissor( int left, int top, int width, int height );
void DisableScissor();
}
public interface IVertexBuffer<T>
{
void Bind();
void SetData( T[] vertices );
}
public interface IIndexBuffer
{
void Bind();
void SetData( ushort[] indices );
}
public interface IShader
{
void SetValue( string name, float x, float y );
void SetValue( string param, ITexture texture );
void Commit();
void Render( Action a );
}
public interface ITexture
{
void SetData( Bitmap bitmap );
}
public enum PrimitiveType
{
PointList,
LineList,
TriangleList,
}
public struct Range<T>
{
public readonly T Start, End;
public Range( T start, T end ) { Start = start; End = end; }
}
}

1
OpenRa.FileFormats/OpenRa.FileFormats.csproj
View File

@@ -59,6 +59,7 @@
<Compile Include="Format2.cs" />
<Compile Include="Format40.cs" />
<Compile Include="Format80.cs" />
<Compile Include="Graphics\IGraphicsDevice.cs" />
<Compile Include="IniFile.cs" />
<Compile Include="int2.cs" />
<Compile Include="IPaletteRemap.cs" />

10
OpenRa.Game/Graphics/LineRenderer.cs
View File

@@ -19,15 +19,15 @@
#endregion
using System.Drawing;
using OpenRa.GlRenderer;
using OpenRa.FileFormats.Graphics;
namespace OpenRa.Graphics
{
class LineRenderer
{
Renderer renderer;
VertexBuffer<Vertex> vertexBuffer;
IndexBuffer indexBuffer; /* kindof a waste of space, but the GPU likes indexing, oh well */
IVertexBuffer<Vertex> vertexBuffer;
IIndexBuffer indexBuffer; /* kindof a waste of space, but the GPU likes indexing, oh well */
const int linesPerBatch = 1024;
@@ -39,8 +39,8 @@ namespace OpenRa.Graphics
public LineRenderer( Renderer renderer )
{
this.renderer = renderer;
vertexBuffer = new VertexBuffer<Vertex>( renderer.Device, vertices.Length, Vertex.Format );
indexBuffer = new IndexBuffer( renderer.Device, indices.Length );
vertexBuffer = renderer.Device.CreateVertexBuffer<Vertex>(vertices.Length );
indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
}
public void Flush()

53
OpenRa.Game/Graphics/Renderer.cs
View File

@@ -18,12 +18,15 @@
*/
#endregion
using System;
using System.Drawing;
using System.Drawing.Text;
using System.Reflection;
using System.Windows.Forms;
using OpenRa.FileFormats;
using OpenRa.GlRenderer;
using OpenRa.FileFormats.Graphics;
using OpenRa.Support;
using System.IO;
namespace OpenRa.Graphics
{
@@ -31,14 +34,14 @@ namespace OpenRa.Graphics
{
internal static int SheetSize;
readonly GraphicsDevice device;
readonly IGraphicsDevice device;
public Shader SpriteShader { get; private set; } /* note: shared shader params */
public Shader LineShader { get; private set; }
public Shader RgbaSpriteShader { get; private set; }
public Shader WorldSpriteShader { get; private set; }
public IShader SpriteShader { get; private set; } /* note: shared shader params */
public IShader LineShader { get; private set; }
public IShader RgbaSpriteShader { get; private set; }
public IShader WorldSpriteShader { get; private set; }
public Texture PaletteTexture;
public ITexture PaletteTexture;
readonly Font fDebug, fTitle;
@@ -49,16 +52,12 @@ namespace OpenRa.Graphics
public Renderer(Control control, Size resolution, bool windowed)
{
control.ClientSize = resolution;
device = new GraphicsDevice(control, resolution.Width, resolution.Height, windowed, false);
device = CreateDevice( Assembly.LoadFile( Path.GetFullPath( "OpenRa.Gl.dll" ) ), control, resolution.Width, resolution.Height, windowed, false );
SpriteShader = new Shader(device, FileSystem.Open("world-shp.fx"));
SpriteShader.Quality = ShaderQuality.Low;
LineShader = new Shader(device, FileSystem.Open("line.fx"));
LineShader.Quality = ShaderQuality.High;
RgbaSpriteShader = new Shader(device, FileSystem.Open("chrome-rgba.fx"));
RgbaSpriteShader.Quality = ShaderQuality.High;
WorldSpriteShader = new Shader(device, FileSystem.Open("chrome-shp.fx"));
WorldSpriteShader.Quality = ShaderQuality.High;
SpriteShader = device.CreateShader(FileSystem.Open("world-shp.fx"));
LineShader = device.CreateShader(FileSystem.Open("line.fx"));
RgbaSpriteShader = device.CreateShader(FileSystem.Open("chrome-rgba.fx"));
WorldSpriteShader = device.CreateShader(FileSystem.Open("chrome-shp.fx"));
fDebug = new Font("Tahoma", 10, FontStyle.Regular);
fTitle = new Font("Tahoma", 10, FontStyle.Bold);
@@ -67,6 +66,16 @@ namespace OpenRa.Graphics
textSprite = new Sprite(textSheet, new Rectangle(0, 0, 256, 256), TextureChannel.Alpha);
}
IGraphicsDevice CreateDevice( Assembly rendererDll, Control control, int width, int height, bool fullscreen, bool vsync )
{
foreach( RendererAttribute r in rendererDll.GetCustomAttributes( typeof( RendererAttribute ), false ) )
{
return (IGraphicsDevice)r.Type.GetConstructor( new Type[] { typeof( Control ), typeof( int ), typeof( int ), typeof( bool ), typeof( bool ) } )
.Invoke( new object[] { control, width, height, fullscreen, vsync } );
}
throw new NotImplementedException();
}
Bitmap RenderTextToBitmap(string s, Font f, Color c)
{
Bitmap b = new Bitmap(256, 256);
@@ -86,7 +95,7 @@ namespace OpenRa.Graphics
return new int2(g.MeasureString(s, f).ToSize());
}
public GraphicsDevice Device { get { return device; } }
public IGraphicsDevice Device { get { return device; } }
public void BeginFrame(float2 r1, float2 r2, float2 scroll)
{
@@ -99,7 +108,7 @@ namespace OpenRa.Graphics
SetShaderParams( WorldSpriteShader, r1, r2, scroll );
}
private void SetShaderParams( Shader s, float2 r1, float2 r2, float2 scroll )
private void SetShaderParams( IShader s, float2 r1, float2 r2, float2 scroll )
{
s.SetValue( "Palette", PaletteTexture );
s.SetValue( "Scroll", scroll.X, scroll.Y );
@@ -114,8 +123,8 @@ namespace OpenRa.Graphics
device.Present();
}
public void DrawBatch<T>(VertexBuffer<T> vertices, IndexBuffer indices,
Range<int> vertexRange, Range<int> indexRange, Texture texture, PrimitiveType type, Shader shader)
public void DrawBatch<T>(IVertexBuffer<T> vertices, IIndexBuffer indices,
Range<int> vertexRange, Range<int> indexRange, ITexture texture, PrimitiveType type, IShader shader)
where T : struct
{
shader.SetValue("DiffuseTexture", texture);
@@ -129,8 +138,8 @@ namespace OpenRa.Graphics
PerfHistory.Increment("batches", 1);
}
public void DrawBatch<T>(VertexBuffer<T> vertices, IndexBuffer indices,
int vertexPool, int numPrimitives, Texture texture, PrimitiveType type)
public void DrawBatch<T>(IVertexBuffer<T> vertices, IIndexBuffer indices,
int vertexPool, int numPrimitives, ITexture texture, PrimitiveType type)
where T : struct
{
SpriteShader.SetValue("DiffuseTexture", texture);

8
OpenRa.Game/Graphics/Sheet.cs
View File

@@ -20,7 +20,7 @@
using System.Drawing;
using OpenRa.FileFormats;
using OpenRa.GlRenderer;
using OpenRa.FileFormats.Graphics;
namespace OpenRa.Graphics
{
@@ -29,7 +29,7 @@ namespace OpenRa.Graphics
readonly Renderer renderer;
protected readonly Bitmap bitmap;
Texture texture;
ITexture texture;
internal Sheet(Renderer renderer, Size size)
{
@@ -45,10 +45,10 @@ namespace OpenRa.Graphics
void Resolve()
{
texture = new Texture(renderer.Device, bitmap);
texture = renderer.Device.CreateTexture(bitmap);
}
public Texture Texture
public ITexture Texture
{
get
{

18
OpenRa.Game/Graphics/SpriteRenderer.cs
View File

@@ -18,16 +18,16 @@
*/
#endregion
using OpenRa.GlRenderer;
using OpenRa.FileFormats.Graphics;
namespace OpenRa.Graphics
{
class SpriteRenderer
{
VertexBuffer<Vertex> vertexBuffer;
IndexBuffer indexBuffer;
IVertexBuffer<Vertex> vertexBuffer;
IIndexBuffer indexBuffer;
Renderer renderer;
Shader shader;
IShader shader;
const int spritesPerBatch = 1024;
@@ -35,18 +35,15 @@ namespace OpenRa.Graphics
ushort[] indices = new ushort[6 * spritesPerBatch];
Sheet currentSheet = null;
int sprites = 0;
ShaderQuality quality;
int nv = 0, ni = 0;
public SpriteRenderer(Renderer renderer, bool allowAlpha, Shader shader)
public SpriteRenderer(Renderer renderer, bool allowAlpha, IShader shader)
{
this.renderer = renderer;
this.shader = shader;
vertexBuffer = new VertexBuffer<Vertex>(renderer.Device, vertices.Length, Vertex.Format);
indexBuffer = new IndexBuffer(renderer.Device, indices.Length);
quality = allowAlpha ? ShaderQuality.High : ShaderQuality.Low;
vertexBuffer = renderer.Device.CreateVertexBuffer<Vertex>( vertices.Length );
indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
}
public SpriteRenderer(Renderer renderer, bool allowAlpha)
@@ -56,7 +53,6 @@ namespace OpenRa.Graphics
{
if (sprites > 0)
{
shader.Quality = quality;
shader.SetValue( "DiffuseTexture", currentSheet.Texture );
shader.Render(() =>
{

11
OpenRa.Game/Graphics/TerrainRenderer.cs
View File

@@ -20,14 +20,14 @@
using System.Drawing;
using OpenRa.FileFormats;
using OpenRa.GlRenderer;
using OpenRa.FileFormats.Graphics;
namespace OpenRa.Graphics
{
class TerrainRenderer
{
VertexBuffer<Vertex> vertexBuffer;
IndexBuffer indexBuffer;
IVertexBuffer<Vertex> vertexBuffer;
IIndexBuffer indexBuffer;
Sheet terrainSheet;
Renderer renderer;
@@ -62,10 +62,10 @@ namespace OpenRa.Graphics
terrainSheet = tileMapping[map.MapTiles[map.XOffset, map.YOffset]].sheet;
vertexBuffer = new VertexBuffer<Vertex>( renderer.Device, vertices.Length, Vertex.Format );
vertexBuffer = renderer.Device.CreateVertexBuffer<Vertex>( vertices.Length );
vertexBuffer.SetData( vertices );
indexBuffer = new IndexBuffer( renderer.Device, indices.Length );
indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
indexBuffer.SetData( indices );
overlayRenderer = new OverlayRenderer( renderer, map );
@@ -97,7 +97,6 @@ namespace OpenRa.Graphics
firstRow = r.Bottom - map.YOffset;
}
renderer.SpriteShader.Quality = ShaderQuality.Low;
renderer.SpriteShader.SetValue( "DiffuseTexture", terrainSheet.Texture );
renderer.SpriteShader.Render(() =>
renderer.DrawBatch(vertexBuffer, indexBuffer,

3
OpenRa.Game/Graphics/Vertex.cs
View File

@@ -19,7 +19,6 @@
#endregion
using System.Runtime.InteropServices;
using OpenRa.GlRenderer;
namespace OpenRa.Graphics
{
@@ -35,7 +34,5 @@ namespace OpenRa.Graphics
this.u = uv.X; this.v = uv.Y;
this.p = pc.X; this.c = pc.Y;
}
public const VertexFormat Format = VertexFormat.Position | VertexFormat.Texture2;
}
}

4
OpenRa.Game/OpenRa.Game.csproj
View File

@@ -272,10 +272,6 @@
<Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
<Name>OpenRa.FileFormats</Name>
</ProjectReference>
<ProjectReference Include="..\OpenRa.Gl\OpenRa.Gl.csproj">
<Project>{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}</Project>
<Name>OpenRa.Gl</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">

106
OpenRa.Gl/GraphicsDevice.cs
View File

@@ -27,10 +27,13 @@ using System.Windows.Forms;
using Tao.Cg;
using Tao.OpenGl;
using Tao.Platform.Windows;
using OpenRa.FileFormats.Graphics;
[assembly: Renderer( typeof( OpenRa.GlRenderer.GraphicsDevice ))]
namespace OpenRa.GlRenderer
{
public class GraphicsDevice
public class GraphicsDevice : IGraphicsDevice
{
Size windowSize;
Graphics g;
@@ -39,7 +42,7 @@ namespace OpenRa.GlRenderer
internal IntPtr cgContext;
internal int vertexProfile, fragmentProfile;
public static void CheckGlError()
internal static void CheckGlError()
{
var n = Gl.glGetError();
if (n != Gl.GL_NO_ERROR)
@@ -125,18 +128,29 @@ namespace OpenRa.GlRenderer
CheckGlError();
}
public void DrawIndexedPrimitives(PrimitiveType pt, Range<int> vertices, Range<int> indices)
public void DrawIndexedPrimitives( PrimitiveType pt, Range<int> vertices, Range<int> indices )
{
Gl.glDrawElements( (int)pt, indices.End - indices.Start, Gl.GL_UNSIGNED_SHORT, new IntPtr( indices.Start * 2 ) );
Gl.glDrawElements( ModeFromPrimitiveType( pt ), indices.End - indices.Start, Gl.GL_UNSIGNED_SHORT, new IntPtr( indices.Start * 2 ) );
CheckGlError();
}
public void DrawIndexedPrimitives(PrimitiveType pt, int numVerts, int numPrimitives)
public void DrawIndexedPrimitives( PrimitiveType pt, int numVerts, int numPrimitives )
{
Gl.glDrawElements((int)pt, numPrimitives * IndicesPerPrimitive( pt ), Gl.GL_UNSIGNED_SHORT, IntPtr.Zero);
Gl.glDrawElements( ModeFromPrimitiveType( pt ), numPrimitives * IndicesPerPrimitive( pt ), Gl.GL_UNSIGNED_SHORT, IntPtr.Zero );
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;
}
throw new NotImplementedException();
}
static int IndicesPerPrimitive( PrimitiveType pt )
{
switch( pt )
@@ -147,19 +161,39 @@ namespace OpenRa.GlRenderer
}
throw new NotImplementedException();
}
}
public struct Range<T>
#region IGraphicsDevice Members
public IVertexBuffer<T> CreateVertexBuffer<T>( int size )
where T : struct
{
public readonly T Start, End;
public Range(T start, T end) { Start = start; End = end; }
return new VertexBuffer<T>( this, size );
}
public class VertexBuffer<T> where T : struct
public IIndexBuffer CreateIndexBuffer( int size )
{
return new IndexBuffer( this, size );
}
public ITexture CreateTexture( Bitmap bitmap )
{
return new Texture( this, bitmap );
}
public IShader CreateShader( Stream stream )
{
return new Shader( this, stream );
}
#endregion
}
public class VertexBuffer<T> : IVertexBuffer<T>, IDisposable
where T : struct
{
int buffer;
public VertexBuffer(GraphicsDevice dev, int size, VertexFormat fmt)
public VertexBuffer(GraphicsDevice dev, int size)
{
Gl.glGenBuffers(1, out buffer);
GraphicsDevice.CheckGlError();
@@ -196,7 +230,7 @@ namespace OpenRa.GlRenderer
//~VertexBuffer() { Dispose(); }
}
public class IndexBuffer : IDisposable
public class IndexBuffer : IIndexBuffer, IDisposable
{
int buffer;
@@ -233,11 +267,10 @@ namespace OpenRa.GlRenderer
//~IndexBuffer() { Dispose(); }
}
public class Shader
public class Shader : IShader
{
IntPtr effect;
IntPtr highTechnique;
IntPtr lowTechnique;
IntPtr technique;
GraphicsDevice dev;
public Shader(GraphicsDevice dev, Stream s)
@@ -256,31 +289,22 @@ namespace OpenRa.GlRenderer
string.Format("Cg compile failed ({0}):\n{1}", err, results));
}
lowTechnique = Cg.cgGetNamedTechnique(effect, "low_quality");
highTechnique = Cg.cgGetNamedTechnique(effect, "high_quality");
if (lowTechnique != IntPtr.Zero && 0 == Cg.cgValidateTechnique(lowTechnique))
lowTechnique = IntPtr.Zero;
if (highTechnique != IntPtr.Zero && 0 == Cg.cgValidateTechnique(highTechnique))
highTechnique = IntPtr.Zero;
if (highTechnique == IntPtr.Zero && lowTechnique == IntPtr.Zero)
technique = Cg.cgGetFirstTechnique( effect );
if( technique == IntPtr.Zero )
throw new InvalidOperationException("No techniques");
while( Cg.cgValidateTechnique( technique ) == 0 )
{
technique = Cg.cgGetNextTechnique( technique );
if( technique == IntPtr.Zero )
throw new InvalidOperationException("No valid techniques");
if( highTechnique == IntPtr.Zero )
highTechnique = lowTechnique;
if( lowTechnique == IntPtr.Zero )
lowTechnique = highTechnique;
}
public ShaderQuality Quality { get; set; }
}
public void Render(Action a)
{
CgGl.cgGLEnableProfile(dev.vertexProfile);
CgGl.cgGLEnableProfile(dev.fragmentProfile);
var technique = Quality == ShaderQuality.High ? highTechnique : lowTechnique;
var pass = Cg.cgGetFirstPass(technique);
while (pass != IntPtr.Zero)
{
@@ -294,8 +318,9 @@ namespace OpenRa.GlRenderer
CgGl.cgGLDisableProfile(dev.vertexProfile);
}
public void SetValue(string name, Texture texture)
public void SetValue(string name, ITexture t)
{
var texture = (Texture)t;
var param = Cg.cgGetNamedEffectParameter( effect, name );
if( param != IntPtr.Zero && texture != null )
CgGl.cgGLSetupSampler( param, texture.texture );
@@ -311,7 +336,7 @@ namespace OpenRa.GlRenderer
public void Commit() { }
}
public class Texture
public class Texture : ITexture
{
internal int texture;
@@ -343,15 +368,4 @@ namespace OpenRa.GlRenderer
bitmap.UnlockBits(bits);
}
}
[Flags]
public enum VertexFormat { Position, Texture2 }
public enum ShaderQuality { Low, High }
public enum PrimitiveType
{
PointList = Gl.GL_POINTS,
LineList = Gl.GL_LINES,
TriangleList = Gl.GL_TRIANGLES
}
}

9
OpenRa.Gl/OpenRa.Gl.csproj
View File

@@ -59,6 +59,12 @@
<Compile Include="GraphicsDevice.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
<Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
<Name>OpenRa.FileFormats</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -67,4 +73,7 @@
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
</PropertyGroup>
</Project>