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

zomg, spinning tank turrets!

Browse Source 
zomg, infantry work now!
zomg, FASTER

git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1201 993157c7-ee19-0410-b2c4-bb4e9862e678
This commit is contained in:
chrisf
2007-07-13 14:39:28 +00:00
parent bcafc89002
commit 69dcbaaa70
4 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BluntDx/GraphicsDevice.h
View File

@@ -71,11 +71,6 @@ namespace BluntDirectX { namespace Direct3D
safe_release( device );
}
void Clear( int color )
{
device->Clear( 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, (D3DCOLOR)color, 1.0f, 0 );
}
void Clear( int color, Surfaces surfaces )
{
device->Clear( 0, NULL, (DWORD)surfaces, (D3DCOLOR)color, 1.0f, 0 );
@@ -124,8 +119,7 @@ namespace BluntDirectX { namespace Direct3D
pp.BackBufferHeight = height;
pp.BackBufferFormat = D3DFMT_X8R8G8B8;
pp.AutoDepthStencilFormat = D3DFMT_D24X8;
pp.EnableAutoDepthStencil = true;
pp.EnableAutoDepthStencil = false;
pp.SwapEffect = D3DSWAPEFFECT_DISCARD;
pp.Windowed = windowed;

7
OpenRa.Game/MainWindow.cs
View File

@@ -52,9 +52,10 @@ namespace OpenRa.Game
foreach (TreeReference treeReference in map.Trees)
world.Add(new Tree(treeReference, treeCache, map));
UnitSheetBuilder.AddUnit("mcv");
UnitSheetBuilder.AddUnit("1tnk");
UnitSheetBuilder.AddUnit("2tnk");
//UnitSheetBuilder.AddUnit("e4");
//UnitSheetBuilder.AddUnit("mcv");
//UnitSheetBuilder.AddUnit("1tnk");
//UnitSheetBuilder.AddUnit("2tnk");
UnitSheetBuilder.AddUnit("3tnk");
world.Add(new Mcv(new PointF(24 * 5, 24 * 5), 3));

15
OpenRa.Game/Mcv.cs
View File

@@ -16,14 +16,21 @@ namespace OpenRa.Game
int GetFacing()
{
int x = (Environment.TickCount >> 6) % 64;
return x < 32 ? x : 63 - x;
int x = (Environment.TickCount >> 6) % 32;
return x;
//return x < 32 ? x : 63 - x;
}
public override SheetRectangle<Sheet>[] CurrentImages
{
get { return new SheetRectangle<Sheet>[] { UnitSheetBuilder.McvSheet[GetFacing()] }; }
get
{
return new SheetRectangle<Sheet>[]
{
UnitSheetBuilder.McvSheet[GetFacing()],
UnitSheetBuilder.McvSheet[63 - GetFacing()]
};
}
}
}
}

13
OpenRa.Game/UnitSheetBuilder.cs
View File

@@ -10,11 +10,22 @@ namespace OpenRa.Game
static class UnitSheetBuilder
{
static readonly Package unitsPackage = new Package( "../../../conquer.mix" );
static readonly Package otherUnitsPackage = new Package("../../../hires.mix");
public static readonly List<SheetRectangle<Sheet>> McvSheet = new List<SheetRectangle<Sheet>>();
static ShpReader Load(string filename)
{
foreach( Package p in new Package[] { unitsPackage, otherUnitsPackage } )
try { return new ShpReader(p.GetContent(filename)); }
catch { }
throw new NotImplementedException();
}
public static void AddUnit( string name )
{
ShpReader reader = new ShpReader( unitsPackage.GetContent( name + ".shp" ) );
ShpReader reader = Load(name + ".shp");
foreach (ImageHeader h in reader)
McvSheet.Add(CoreSheetBuilder.Add(h.Image, reader.Size));
}