diff --git a/OpenRa.Game/Graphics/Renderer.cs b/OpenRa.Game/Graphics/Renderer.cs index 31cf83fe8d..66ae9f65d5 100644 --- a/OpenRa.Game/Graphics/Renderer.cs +++ b/OpenRa.Game/Graphics/Renderer.cs @@ -49,9 +49,9 @@ namespace OpenRa.Graphics device.Clear(Color.Black); SpriteShader.SetValue("Palette", PaletteTexture); - SpriteShader.SetValue("Scroll", scroll); - SpriteShader.SetValue("r1", r1); - SpriteShader.SetValue("r2", r2); + SpriteShader.SetValue("Scroll", scroll.X, scroll.Y); + SpriteShader.SetValue("r1", r1.X, r1.Y); + SpriteShader.SetValue("r2", r2.X, r2.Y); SpriteShader.Commit(); } diff --git a/OpenRa.Gl/GraphicsDevice.cs b/OpenRa.Gl/GraphicsDevice.cs index c34ba900d0..031f431fc9 100644 --- a/OpenRa.Gl/GraphicsDevice.cs +++ b/OpenRa.Gl/GraphicsDevice.cs @@ -238,8 +238,18 @@ namespace OpenRa.GlRenderer CgGl.cgGLDisableProfile(dev.vertexProfile); } - public void SetValue(string param, Texture texture) { } - public void SetValue(string param, T t) where T : struct { } + public void SetValue(string name, Texture texture) + { + var param = Cg.cgGetNamedEffectParameter(effect, name); + CgGl.cgGLSetTextureParameter(param, texture.texture); + } + + public void SetValue(string name, float x, float y) + { + var param = Cg.cgGetNamedEffectParameter(effect, name); + CgGl.cgGLSetParameter2f(param, x, y); + } + public void Commit() { } }