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.
* This file is part of OpenRA.
@@ -74,7 +74,6 @@ namespace OpenRa
readonly Animation cantBuild;
readonly Animation ready;
readonly Animation clock;
const int NumClockFrames = 54;
// Radar
static float2 radarOpenOrigin = new float2(Game.viewport.Width - 215, 29);
@@ -912,9 +911,8 @@ namespace OpenRa
{
clock.PlayFetchIndex( "idle",
() => (firstOfThis.TotalTime - firstOfThis.RemainingTime)
* NumClockFrames / firstOfThis.TotalTime);
* (clock.CurrentSequence.Length - 1)/ firstOfThis.TotalTime);
clock.Tick();
shpRenderer.DrawSprite(clock.Image, drawPos, "chrome");
if (firstOfThis.Done)
@@ -1149,7 +1147,7 @@ namespace OpenRa
clock.PlayFetchIndex("idle",
() => (sp.TotalTime - sp.RemainingTime)
* NumClockFrames / sp.TotalTime);
* (clock.CurrentSequence.Length - 1) / sp.TotalTime);
clock.Tick();
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 );
SpriteShader = device.CreateShader(FileSystem.Open("world-shp.fx"));
LineShader = device.CreateShader(FileSystem.Open("line.fx"));
RgbaSpriteShader = device.CreateShader(FileSystem.Open("chrome-rgba.fx"));
WorldSpriteShader = device.CreateShader(FileSystem.Open("chrome-shp.fx"));
SpriteShader = device.CreateShader(FileSystem.Open("shaders/world-shp.fx"));
LineShader = device.CreateShader(FileSystem.Open("shaders/line.fx"));
RgbaSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-rgba.fx"));
WorldSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-shp.fx"));
//fDebug = new Font("Tahoma", 10, FontStyle.Regular);
//fTitle = new Font("Tahoma", 10, FontStyle.Bold);