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

Merge pull request #8859 from pchote/coords-fixup

Browse Source 
Fix WPos <-> CPos conversions.
This commit is contained in:
reaperrr
2015-08-01 12:23:26 +02:00
parent 82abd5a016 a0e92093a1
commit 4934d6c035
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/Map/Map.cs
View File

@@ -764,7 +764,7 @@ namespace OpenRA
// - ax + by adds (a - b) * 512 + 512 to u // - ax + by adds (a - b) * 512 + 512 to u
// - ax + by adds (a + b) * 512 + 512 to v // - ax + by adds (a + b) * 512 + 512 to v
var z = MapHeight.Value.Contains(cell) ? 512 * MapHeight.Value[cell] : 0; var z = MapHeight.Value.Contains(cell) ? 512 * MapHeight.Value[cell] : 0;
return new WPos(512 * (cell.X - cell.Y), 512 * (cell.X + cell.Y + 1), z); return new WPos(512 * (cell.X - cell.Y + 1), 512 * (cell.X + cell.Y + 1), z);
} }
public WPos CenterOfSubCell(CPos cell, SubCell subCell) public WPos CenterOfSubCell(CPos cell, SubCell subCell)
@@ -783,10 +783,13 @@ namespace OpenRA
// Convert from world position to diamond cell position: // Convert from world position to diamond cell position:
// (a) Subtract (512, 512) to move the rotation center to the middle of the corner cell // (a) Subtract (512, 512) to move the rotation center to the middle of the corner cell
// (b) Rotate axes by -pi/4 // (b) Rotate axes by -pi/4
// (c) Add (512, 512) to move back to the center of the cell // (c) Divide through by sqrt(2) to bring us to an equivalent world pos aligned with u,v axes
// (d) Divide by 1024 to find final cell coords // (d) Apply an offset so that the integer division by 1024 rounds in the right direction:
// (i) u is always positive, so add 512 (which then partially cancels the -1024 term from the rotation)
// (ii) v can be negative, so we need to be careful about rounding directions. We add 512 *away from 0* (negative if y > x).
// (e) Divide by 1024 to bring into cell coords.
var u = (pos.Y + pos.X - 512) / 1024; var u = (pos.Y + pos.X - 512) / 1024;
var v = (pos.Y - pos.X - 512) / 1024; var v = (pos.Y - pos.X + (pos.Y > pos.X ? 512 : -512)) / 1024;
return new CPos(u, v); return new CPos(u, v);
} }