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

Moved our TerrainRender ref into WorldRenderer; TR.tileSet want to be somewhere else (it's not just renderer, it affects pathing)

Browse Source
This commit is contained in:
Bob
2009-10-30 00:19:53 +13:00
parent 02ed35b501
commit 8580ae0f78
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRa.Game/Game.cs
View File

@@ -20,7 +20,6 @@ namespace OpenRa.Game
public static World world;
public static Map map;
static TreeCache treeCache;
public static TerrainRenderer terrain;
public static Viewport viewport;
public static PathFinder PathFinder;
public static WorldRenderer worldRenderer;
@@ -51,11 +50,10 @@ namespace OpenRa.Game
var mapFile = new IniFile(FileSystem.Open(mapName));
map = new Map(mapFile);
FileSystem.Mount(new Package(map.Theater + ".mix"));
FileSystem.Mount(new Package(map.Theater + ".mix"));
viewport = new Viewport( clientSize, map.Offset, map.Offset + map.Size, renderer );
terrain = new TerrainRenderer(renderer, map, viewport);
world = new World();
treeCache = new TreeCache(map);
@@ -68,11 +66,11 @@ namespace OpenRa.Game
LoadMapBuildings(mapFile);
LoadMapUnits(mapFile);
PathFinder = new PathFinder(map, terrain.tileSet);
controller = new Controller();
worldRenderer = new WorldRenderer(renderer);
PathFinder = new PathFinder( map, worldRenderer.terrainRenderer.tileSet );
soundEngine = new ISoundEngine();
sounds = new Cache<string, ISoundSource>(LoadSound);
@@ -144,7 +142,7 @@ namespace OpenRa.Game
return map.IsInMap(a.X, a.Y) &&
TerrainCosts.Cost(umt,
terrain.tileSet.GetWalkability(map.MapTiles[a.X, a.Y])) < double.PositiveInfinity;
worldRenderer.terrainRenderer.tileSet.GetWalkability( map.MapTiles[ a.X, a.Y ] ) ) < double.PositiveInfinity;
}
static IEnumerable<Actor> FindUnits(float2 a, float2 b)