This commit is contained in:
Bob
2010-02-16 17:11:17 +13:00
parent 3198f3419d
commit 20e586b9ad
8 changed files with 73 additions and 36 deletions

View File

@@ -48,11 +48,19 @@ namespace OpenRa.Graphics
device.Begin();
device.Clear(Color.Black);
SpriteShader.SetValue("Palette", PaletteTexture);
SpriteShader.SetValue("Scroll", scroll.X, scroll.Y);
SpriteShader.SetValue("r1", r1.X, r1.Y);
SpriteShader.SetValue("r2", r2.X, r2.Y);
SpriteShader.Commit();
SetShaderParams( SpriteShader, r1, r2, scroll );
SetShaderParams( LineShader, r1, r2, scroll );
SetShaderParams( RgbaSpriteShader, r1, r2, scroll );
SetShaderParams( WorldSpriteShader, r1, r2, scroll );
}
private void SetShaderParams( Shader s, float2 r1, float2 r2, float2 scroll )
{
s.SetValue( "Palette", PaletteTexture );
s.SetValue( "Scroll", scroll.X, scroll.Y );
s.SetValue( "r1", r1.X, r1.Y );
s.SetValue( "r2", r2.X, r2.Y );
s.Commit();
}
public void EndFrame()

View File

@@ -37,6 +37,7 @@ namespace OpenRa.Graphics
if (sprites > 0)
{
shader.Quality = quality;
shader.SetValue( "DiffuseTexture", currentSheet.Texture );
shader.Render(() =>
{
vertexBuffer.SetData(vertices);

View File

@@ -79,6 +79,7 @@ namespace OpenRa.Graphics
}
renderer.SpriteShader.Quality = ShaderQuality.Low;
renderer.SpriteShader.SetValue( "DiffuseTexture", terrainSheet.Texture );
renderer.SpriteShader.Render(() =>
renderer.DrawBatch(vertexBuffer, indexBuffer,
new Range<int>(verticesPerRow * firstRow, verticesPerRow * lastRow),