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

Remove some dependencies on RA mixen

Browse Source
This commit is contained in:
pchote
2010-02-20 16:00:21 +13:00
parent 463030205a
commit d6ea8abfd6
5 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRa.Game/Chrome.cs
View File

@@ -1,4 +1,4 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford. * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
* This file is part of OpenRA. * This file is part of OpenRA.
@@ -74,7 +74,6 @@ namespace OpenRa
readonly Animation cantBuild; readonly Animation cantBuild;
readonly Animation ready; readonly Animation ready;
readonly Animation clock; readonly Animation clock;
const int NumClockFrames = 54;
// Radar // Radar
static float2 radarOpenOrigin = new float2(Game.viewport.Width - 215, 29); static float2 radarOpenOrigin = new float2(Game.viewport.Width - 215, 29);
@@ -912,9 +911,8 @@ namespace OpenRa
{ {
clock.PlayFetchIndex( "idle", clock.PlayFetchIndex( "idle",
() => (firstOfThis.TotalTime - firstOfThis.RemainingTime) () => (firstOfThis.TotalTime - firstOfThis.RemainingTime)
* NumClockFrames / firstOfThis.TotalTime); * (clock.CurrentSequence.Length - 1)/ firstOfThis.TotalTime);
clock.Tick(); clock.Tick();
shpRenderer.DrawSprite(clock.Image, drawPos, "chrome"); shpRenderer.DrawSprite(clock.Image, drawPos, "chrome");
if (firstOfThis.Done) if (firstOfThis.Done)
@@ -1149,7 +1147,7 @@ namespace OpenRa
clock.PlayFetchIndex("idle", clock.PlayFetchIndex("idle",
() => (sp.TotalTime - sp.RemainingTime) () => (sp.TotalTime - sp.RemainingTime)
* NumClockFrames / sp.TotalTime); * (clock.CurrentSequence.Length - 1) / sp.TotalTime);
clock.Tick(); clock.Tick();
shpRenderer.DrawSprite(clock.Image, drawPos, "chrome"); shpRenderer.DrawSprite(clock.Image, drawPos, "chrome");

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

@@ -55,10 +55,10 @@ namespace OpenRa.Graphics
{ {
device = CreateDevice( Assembly.LoadFile( Path.GetFullPath( "OpenRa.Gl.dll" ) ), resolution.Width, resolution.Height, windowed, false ); device = CreateDevice( Assembly.LoadFile( Path.GetFullPath( "OpenRa.Gl.dll" ) ), resolution.Width, resolution.Height, windowed, false );
SpriteShader = device.CreateShader(FileSystem.Open("world-shp.fx")); SpriteShader = device.CreateShader(FileSystem.Open("shaders/world-shp.fx"));
LineShader = device.CreateShader(FileSystem.Open("line.fx")); LineShader = device.CreateShader(FileSystem.Open("shaders/line.fx"));
RgbaSpriteShader = device.CreateShader(FileSystem.Open("chrome-rgba.fx")); RgbaSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-rgba.fx"));
WorldSpriteShader = device.CreateShader(FileSystem.Open("chrome-shp.fx")); WorldSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-shp.fx"));
//fDebug = new Font("Tahoma", 10, FontStyle.Regular); //fDebug = new Font("Tahoma", 10, FontStyle.Regular);
//fTitle = new Font("Tahoma", 10, FontStyle.Bold); //fTitle = new Font("Tahoma", 10, FontStyle.Bold);

7
mods/cnc/mod.yaml
View File

@@ -2,8 +2,7 @@
Folders: Folders:
./mods/cnc/ ./mods/cnc/
./mods/cnc/packages_ra/ ./mods/ra/packages/
./shaders
./ ./
Packages: Packages:
@@ -19,11 +18,7 @@ Packages:
# Cannot qualify the RA names because they may live inside a mix # Cannot qualify the RA names because they may live inside a mix
~main.mix ~main.mix
redalert.mix redalert.mix
hires.mix
local.mix
speech.mix speech.mix
allies.mix
russian.mix
temperat.mix temperat.mix
snow.mix snow.mix
interior.mix interior.mix

22
mods/cnc/sequences.xml
View File

@@ -2,7 +2,7 @@
<sequences> <sequences>
<!-- build clock - hacked in --> <!-- build clock - hacked in -->
<unit name="clock"> <unit name="clock">
<sequence name="idle" start="0" length="*" /> <sequence name="idle" start="0" length="*" src="hclock" />
</unit> </unit>
<cursor src="mouse"> <cursor src="mouse">
<sequence name="default" start="0" /> <sequence name="default" start="0" />
@@ -65,17 +65,17 @@
<sequence name="8" start="0" length="22" src="art-exp1" /> <sequence name="8" start="0" length="22" src="art-exp1" />
</unit> </unit>
<unit name="pips"> <unit name="pips">
<!-- TODO: Pull these out into their own shp in overrides -->
<sequence name="groups" start="8" length="10" /> <sequence name="groups" start="8" length="10" />
<sequence name="medic" start="20" length="1" />
<sequence name="ready" start="3" length="1" /> <sequence name="ready" start="3" length="1" src="hpips" />
<sequence name="hold" start="4" length="1" /> <sequence name="hold" start="4" length="1" src="hpips" />
<sequence name="pip-empty" start="0" length="1" /> <sequence name="pip-empty" start="0" length="1" src="hpips" />
<sequence name="pip-green" start="1" length="1" /> <sequence name="pip-green" start="1" length="1" src="hpips" />
<sequence name="pip-yellow" start="5" length="1" /> <sequence name="pip-yellow" start="5" length="1" src="hpips" />
<sequence name="pip-gray" start="6" length="1" /> <sequence name="pip-gray" start="6" length="1" src="hpips" />
<sequence name="pip-red" start="7" length="1" /> <sequence name="pip-red" start="7" length="1" src="hpips" />
<sequence name="tag-fake" start="18" length="1" /> <sequence name="tag-primary" start="2" length="1" src="hpips" />
<sequence name="tag-primary" start="2" length="1" />
</unit> </unit>
<unit name="flagfly"> <unit name="flagfly">
<sequence name="idle" start="0" length="14" /> <sequence name="idle" start="0" length="14" />

1
mods/ra/mod.yaml
View File

@@ -3,7 +3,6 @@
Folders: Folders:
./mods/ra/packages ./mods/ra/packages
./mods/ra ./mods/ra
./shaders
./ ./
Packages: Packages: