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

Move TileScale to MapGrid

Browse Source
This commit is contained in:
Gustas
2023-04-25 19:30:48 +03:00
committed by Pavel Penev
parent 8f511a3bb6
commit 44f1af7059
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Graphics/TerrainSpriteLayer.cs
View File

@@ -114,7 +114,7 @@ namespace OpenRA.Graphics
// transparent for isometric tiles
var tl = worldRenderer.TerrainLighting;
var pos = map.CenterOfCell(uv.ToCPos(map));
var step = map.Grid.Type == MapGridType.RectangularIsometric ? 724 : 512;
var step = map.Grid.TileScale / 2;
var weights = new[]
{
tl.TintAt(pos + new WVec(-step, -step, 0)),

2
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Graphics
{
World = world;
TileSize = World.Map.Grid.TileSize;
TileScale = World.Map.Grid.Type == MapGridType.RectangularIsometric ? 1448 : 1024;
TileScale = World.Map.Grid.TileScale;
Viewport = new Viewport(this, world.Map);
createPaletteReference = CreatePaletteReference;

4
OpenRA.Game/Map/MapGrid.cs
View File

@@ -128,10 +128,14 @@ namespace OpenRA
internal readonly CVec[][] TilesByDistance;
public int TileScale { get; }
public MapGrid(MiniYaml yaml)
{
FieldLoader.Load(this, yaml);
TileScale = Type == MapGridType.RectangularIsometric ? 1448 : 1024;
// The default subcell index defaults to the middle entry
var defaultSubCellIndex = (byte)DefaultSubCell;
if (defaultSubCellIndex == byte.MaxValue)

4
OpenRA.Mods.Common/Graphics/ModelRenderable.cs
View File

@@ -137,9 +137,7 @@ namespace OpenRA.Mods.Common.Graphics
{
var map = wr.World.Map;
var groundPos = model.Pos - new WVec(0, 0, map.DistanceAboveTerrain(model.Pos).Length);
var tileScale = map.Grid.Type == MapGridType.RectangularIsometric ? 1448f : 1024f;
var groundZ = map.Grid.TileSize.Height * (groundPos.Z - model.Pos.Z) / tileScale;
var groundZ = (float)map.Grid.TileSize.Height * (groundPos.Z - model.Pos.Z) / map.Grid.TileScale;
var pxOrigin = wr.Screen3DPosition(model.Pos);
// HACK: We don't have enough texture channels to pass the depth data to the shader

6
OpenRA.Mods.Common/Lint/CheckInteractable.cs
View File

@@ -32,8 +32,6 @@ namespace OpenRA.Mods.Common.Lint
{
// As the map has not been created we need to get MapGrid info directly from manifest.
var grid = modData.Manifest.Get<MapGrid>();
var tileScale = grid.Type == MapGridType.RectangularIsometric ? 1448 : 1024;
foreach (var actorInfo in rules.Actors)
{
// Catch TypeDictionary errors.
@@ -43,10 +41,10 @@ namespace OpenRA.Mods.Common.Lint
if (interactable == null)
continue;
if (HasInvalidBounds(interactable.Bounds, grid.TileSize, tileScale))
if (HasInvalidBounds(interactable.Bounds, grid.TileSize, grid.TileScale))
emitError($"{nameof(interactable.Bounds)} of actor {actorInfo.Key} are empty or negative.");
if (HasInvalidBounds(interactable.DecorationBounds, grid.TileSize, tileScale))
if (HasInvalidBounds(interactable.DecorationBounds, grid.TileSize, grid.TileScale))
emitError($"{nameof(interactable.DecorationBounds)} of actor {actorInfo.Key} are empty or negative.");
}
catch (InvalidOperationException e)

8
OpenRA.Mods.Common/Traits/World/TerrainLighting.cs
View File

@@ -68,11 +68,11 @@ namespace OpenRA.Mods.Common.Traits
map = world.Map;
globalTint = new float3(info.RedTint, info.GreenTint, info.BlueTint);
var cellSize = map.Grid.Type == MapGridType.RectangularIsometric ? 1448 : 1024;
var tileScale = map.Grid.TileScale;
partitionedLightSources = new SpatiallyPartitioned<LightSource>(
(map.MapSize.X + 1) * cellSize,
(map.MapSize.Y + 1) * cellSize,
info.BinSize * cellSize);
(map.MapSize.X + 1) * tileScale,
(map.MapSize.Y + 1) * tileScale,
info.BinSize * tileScale);
}
Rectangle Bounds(LightSource source)

2
OpenRA.Mods.Common/UpdateRules/Rules/20210321/ConvertBoundsToWDist.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
{
var grid = modData.Manifest.Get<MapGrid>();
var tileSize = grid.TileSize;
var tileScale = grid.Type == MapGridType.RectangularIsometric ? 1448 : 1024;
var tileScale = grid.TileScale;
foreach (var trait in traits)
{