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

Merge branch 'master' of git@github.com:beedee/OpenRA

Browse Source
This commit is contained in:
Bob
2009-10-10 21:23:53 +13:00
parent b880f7d1bc 70bc8366a5
commit 296092f9f6
6 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/Graphics/HardwarePalette.cs
View File

@@ -10,7 +10,7 @@ namespace OpenRa.Game.Graphics
{
class HardwarePalette : Sheet
{
const int maxEntries = 16;
const int maxEntries = 8;
int allocated = 0;
public HardwarePalette(Renderer renderer, Map map)

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

@@ -31,10 +31,13 @@ namespace OpenRa.Game.Graphics
public GraphicsDevice Device { get { return device; } }
public static float waterFrame = 0.0f;
public void BeginFrame( float2 r1, float2 r2, float2 scroll )
{
device.Begin();
SpriteShader.SetValue("palDist", waterFrame);
SpriteShader.SetValue("Scroll", scroll);
SpriteShader.SetValue("r1", r1);
SpriteShader.SetValue("r2", r2);

2
OpenRa.Game/Graphics/Util.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRa.Game.Graphics
public static void FastCreateQuad(Vertex[] vertices, ushort[] indices, float2 o, Sprite r, int palette, int nv, int ni)
{
float2 attrib = new float2(palette / 16.0f, channelSelect[(int)r.channel]);
float2 attrib = new float2(palette / 8.0f, channelSelect[(int)r.channel]);
vertices[nv] = new Vertex(KLerp(o, r.size, 0), r.FastMapTextureCoords(0), attrib);
vertices[nv + 1] = new Vertex(KLerp(o, r.size, 1), r.FastMapTextureCoords(1), attrib);

2
OpenRa.Game/MainWindow.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRa.Game
game.world.Add( new Actor( "mcv", new int2( 5, 5 ), game.players[ 3 ]) );
game.world.Add( new Actor( "mcv", new int2( 7, 5 ), game.players[ 2 ] ) );
game.world.Add( new Actor( "mcv", new int2( 9, 5 ), game.players[ 1 ] ) );
game.world.Add( new Actor( "mcv", new int2( 9, 5 ), game.players[ 0 ] ) );
game.world.Add( new Actor( "jeep", new int2( 9, 7 ), game.players[ 1 ] ) );
sidebar = new Sidebar(Race.Soviet, renderer, game);

7
OpenRa.Game/World.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using System.Windows.Forms;
using OpenRa.Game.Graphics;
namespace OpenRa.Game
{
@@ -28,7 +29,9 @@ namespace OpenRa.Game
lastTime += 40;
foreach( Actor a in actors )
a.Tick( game, 40 );
a.Tick( game, 40 );
Renderer.waterFrame += 0.05f;
}
foreach (Action<World> a in frameEndActions) a(this);