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

z offsets

Browse Source
This commit is contained in:
Chris Forbes
2009-12-22 19:13:30 +13:00
parent 3c1ead59fd
commit 3bc97ac0b9
21 changed files with 134 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRa.Game/Effects/Bullet.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic;
using OpenRa.Game.GameRules;
using OpenRa.Game.Graphics;
using OpenRa.Game.Traits;
namespace OpenRa.Game.Effects
{
@@ -60,7 +61,7 @@ namespace OpenRa.Game.Effects
const float height = .1f;
public IEnumerable<Tuple<Sprite, float2, int>> Render()
public IEnumerable<Renderable> Render()
{
if (anim != null)
{
@@ -72,15 +73,15 @@ namespace OpenRa.Game.Effects
if (Projectile.High || Projectile.Arcing)
{
if (Projectile.Shadow)
yield return Tuple.New(anim.Image, pos, 8);
yield return new Renderable(anim.Image, pos, 8);
var at = (float)t / TotalTime();
var highPos = pos - new float2(0, (VisualDest - Src).Length * height * 4 * at * (1 - at));
yield return Tuple.New(anim.Image, highPos, Owner.Palette);
yield return new Renderable(anim.Image, highPos, Owner.Palette);
}
else
yield return Tuple.New(anim.Image, pos, Projectile.UnderWater ? 8 : Owner.Palette);
yield return new Renderable(anim.Image, pos, Projectile.UnderWater ? 8 : Owner.Palette);
}
}
}

5
OpenRa.Game/Effects/Corpse.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenRa.Game.Graphics;
using OpenRa.Game.Traits;
namespace OpenRa.Game.Effects
{
@@ -24,9 +25,9 @@ namespace OpenRa.Game.Effects
public void Tick() { anim.Tick(); }
public IEnumerable<Tuple<Sprite, float2, int>> Render()
public IEnumerable<Renderable> Render()
{
yield return Tuple.New(anim.Image, pos - .5f * anim.Image.size, owner.Palette);
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, owner.Palette);
}
}
}

5
OpenRa.Game/Effects/Explosion.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using OpenRa.Game.Graphics;
using OpenRa.Game.Traits;
namespace OpenRa.Game.Effects
{
@@ -19,9 +20,9 @@ namespace OpenRa.Game.Effects
public void Tick() { anim.Tick(); }
public IEnumerable<Tuple<Sprite, float2, int>> Render()
public IEnumerable<Renderable> Render()
{
yield return Tuple.New(anim.Image, pos.ToFloat2() - 0.5f * anim.Image.size, 0);
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, 0);
}
public Player Owner { get { return null; } }

3
OpenRa.Game/Effects/IEffect.cs
View File

@@ -1,11 +1,12 @@
using System.Collections.Generic;
using OpenRa.Game.Graphics;
using OpenRa.Game.Traits;
namespace OpenRa.Game.Effects
{
interface IEffect
{
void Tick();
IEnumerable<Tuple<Sprite, float2, int>> Render();
IEnumerable<Renderable> Render();
}
}

5
OpenRa.Game/Effects/Missile.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic;
using OpenRa.Game.GameRules;
using OpenRa.Game.Graphics;
using OpenRa.Game.Traits;
namespace OpenRa.Game.Effects
{
@@ -75,9 +76,9 @@ namespace OpenRa.Game.Effects
// todo: turbo boost vs aircraft
}
public IEnumerable<Tuple<Sprite, float2, int>> Render()
public IEnumerable<Renderable> Render()
{
yield return Tuple.New(anim.Image, Pos - 0.5f * anim.Image.size, 0);
yield return new Renderable(anim.Image, Pos - 0.5f * anim.Image.size, 0);
}
}
}

5
OpenRa.Game/Effects/Smoke.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using OpenRa.Game.Graphics;
using OpenRa.Game.Traits;
namespace OpenRa.Game.Effects
{
@@ -20,9 +21,9 @@ namespace OpenRa.Game.Effects
anim.Tick();
}
public IEnumerable<Tuple<Sprite, float2, int>> Render()
public IEnumerable<Renderable> Render()
{
yield return Tuple.New(anim.Image, pos.ToFloat2() - .5f * anim.Image.size, 0);
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, 0);
}
}
}

17
OpenRa.Game/Effects/TeslaZap.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenRa.Game.Graphics;
using OpenRa.Game.Traits;
namespace OpenRa.Game.Effects
{
@@ -26,7 +27,7 @@ namespace OpenRa.Game.Effects
--timeUntilRemove;
}
public IEnumerable<Tuple<Sprite, float2, int>> Render()
public IEnumerable<Renderable> Render()
{
if( from.X < to.X )
return DrawZap( from, to, tesla );
@@ -36,7 +37,7 @@ namespace OpenRa.Game.Effects
return DrawZap( from, to, tesla );
}
static IEnumerable<Tuple<Sprite, float2, int>> DrawZap( int2 from, int2 to, Sequence tesla )
static IEnumerable<Renderable> DrawZap( int2 from, int2 to, Sequence tesla )
{
int2 d = to - from;
if( d.X < 8 )
@@ -45,7 +46,7 @@ namespace OpenRa.Game.Effects
var y = d.Y;
while( y >= prev.Y + 8 )
{
yield return Tuple.New( tesla.GetSprite( 2 ), (float2)( from + prev - new int2( 0, 8 ) ), 0 );
yield return new Renderable( tesla.GetSprite( 2 ), (float2)( from + prev - new int2( 0, 8 ) ), 0 );
prev.Y += 8;
}
}
@@ -57,26 +58,26 @@ namespace OpenRa.Game.Effects
var y = i * d.Y / d.X;
if( y <= prev.Y - 8 )
{
yield return Tuple.New( tesla.GetSprite( 3 ), (float2)( from + prev - new int2( 8, 16 ) ), 0 );
yield return new Renderable(tesla.GetSprite(3), (float2)(from + prev - new int2(8, 16)), 0);
prev.Y -= 8;
while( y <= prev.Y - 8 )
{
yield return Tuple.New( tesla.GetSprite( 2 ), (float2)( from + prev - new int2( 0, 16 ) ), 0 );
yield return new Renderable(tesla.GetSprite(2), (float2)(from + prev - new int2(0, 16)), 0);
prev.Y -= 8;
}
}
else if( y >= prev.Y + 8 )
{
yield return Tuple.New( tesla.GetSprite( 0 ), (float2)( from + prev - new int2( 8, 8 ) ), 0 );
yield return new Renderable(tesla.GetSprite(0), (float2)(from + prev - new int2(8, 8)), 0);
prev.Y += 8;
while( y >= prev.Y + 8 )
{
yield return Tuple.New( tesla.GetSprite( 2 ), (float2)( from + prev - new int2( 0, 8 ) ), 0 );
yield return new Renderable(tesla.GetSprite(2), (float2)(from + prev - new int2(0, 8)), 0);
prev.Y += 8;
}
}
else
yield return Tuple.New( tesla.GetSprite( 1 ), (float2)( from + prev - new int2( 8, 8 ) ), 0 );
yield return new Renderable(tesla.GetSprite(1), (float2)(from + prev - new int2(8, 8)), 0);
prev.X += 8;
}