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

[Fixing indentation]

Browse Source
This commit is contained in:
Bob
2009-11-19 15:02:04 +13:00
parent e427e6b16e
commit a17296ff8a
13 changed files with 244 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,50 +16,50 @@ namespace OpenRa.Game.Graphics
const int linesPerBatch = 1024; const int linesPerBatch = 1024;
Vertex[] vertices = new Vertex[2 * linesPerBatch]; Vertex[] vertices = new Vertex[ 2 * linesPerBatch ];
ushort[] indices = new ushort[2 * linesPerBatch]; ushort[] indices = new ushort[ 2 * linesPerBatch ];
int lines = 0; int lines = 0;
int nv = 0, ni = 0; int nv = 0, ni = 0;
public LineRenderer(Renderer renderer) public LineRenderer( Renderer renderer )
{ {
this.renderer = renderer; this.renderer = renderer;
vertexBuffer = new FvfVertexBuffer<Vertex>(renderer.Device, vertices.Length, Vertex.Format); vertexBuffer = new FvfVertexBuffer<Vertex>( renderer.Device, vertices.Length, Vertex.Format );
indexBuffer = new IndexBuffer(renderer.Device, indices.Length); indexBuffer = new IndexBuffer( renderer.Device, indices.Length );
} }
public void Flush() public void Flush()
{ {
if (lines > 0) if( lines > 0 )
{ {
renderer.LineShader.Render(() => renderer.LineShader.Render( () =>
{ {
vertexBuffer.SetData(vertices); vertexBuffer.SetData( vertices );
indexBuffer.SetData(indices); indexBuffer.SetData( indices );
renderer.DrawBatch(vertexBuffer, indexBuffer, renderer.DrawBatch( vertexBuffer, indexBuffer,
nv, ni / 2, null, PrimitiveType.LineList); nv, ni / 2, null, PrimitiveType.LineList );
}); } );
nv = 0; ni = 0; nv = 0; ni = 0;
lines = 0; lines = 0;
} }
} }
public void DrawLine(float2 start, float2 end, Color startColor, Color endColor) public void DrawLine( float2 start, float2 end, Color startColor, Color endColor )
{ {
indices[ni++] = (ushort)nv; indices[ ni++ ] = (ushort)nv;
vertices[nv++] = new Vertex(start, vertices[ nv++ ] = new Vertex( start,
new float2(startColor.R / 255.0f, startColor.G / 255.0f), new float2( startColor.R / 255.0f, startColor.G / 255.0f ),
new float2(startColor.B / 255.0f, startColor.A / 255.0f)); new float2( startColor.B / 255.0f, startColor.A / 255.0f ) );
indices[ni++] = (ushort)nv; indices[ ni++ ] = (ushort)nv;
vertices[nv++] = new Vertex(end, vertices[ nv++ ] = new Vertex( end,
new float2(endColor.R / 255.0f, endColor.G / 255.0f), new float2( endColor.R / 255.0f, endColor.G / 255.0f ),
new float2(endColor.B / 255.0f, endColor.A / 255.0f)); new float2( endColor.B / 255.0f, endColor.A / 255.0f ) );
if (++lines >= linesPerBatch) if( ++lines >= linesPerBatch )
Flush(); Flush();
} }
} }

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

@@ -70,14 +70,14 @@ namespace OpenRa.Game.Graphics
Range<int> vertexRange, Range<int> indexRange, Texture texture, PrimitiveType type, Shader shader) Range<int> vertexRange, Range<int> indexRange, Texture texture, PrimitiveType type, Shader shader)
where T : struct where T : struct
{ {
shader.SetValue("DiffuseTexture", texture); shader.SetValue( "DiffuseTexture", texture );
shader.Commit(); shader.Commit();
vertices.Bind(0); vertices.Bind( 0 );
indices.Bind(); indices.Bind();
device.DrawIndexedPrimitives(type, device.DrawIndexedPrimitives( type,
vertexRange, indexRange); vertexRange, indexRange );
} }
public void DrawBatch<T>(FvfVertexBuffer<T> vertices, IndexBuffer indices, public void DrawBatch<T>(FvfVertexBuffer<T> vertices, IndexBuffer indices,

4
OpenRa.Game/Graphics/Sprite.cs
View File

@@ -38,9 +38,9 @@ namespace OpenRa.Game.Graphics
this.size = new float2(bounds.Size); this.size = new float2(bounds.Size);
} }
public float2 FastMapTextureCoords(int k) public float2 FastMapTextureCoords( int k )
{ {
return uvhax[k]; return uvhax[ k ];
} }
} }

5
OpenRa.Game/Graphics/WorldRenderer.cs
View File

@@ -23,11 +23,6 @@ namespace OpenRa.Game.Graphics
{ {
terrainRenderer = new TerrainRenderer(renderer, Game.map); terrainRenderer = new TerrainRenderer(renderer, Game.map);
// TODO: this is layout policy. it belongs at a higher level than this.
//region = Region.Create(Game.viewport, DockStyle.Left,
// Game.viewport.Width, Draw, Game.controller.HandleInput);
//Game.viewport.AddRegion(Game.controller);
this.renderer = renderer; this.renderer = renderer;
spriteRenderer = new SpriteRenderer(renderer, true); spriteRenderer = new SpriteRenderer(renderer, true);
lineRenderer = new LineRenderer(renderer); lineRenderer = new LineRenderer(renderer);