Commit Graph

13193 Commits

Author SHA1 Message Date
Matthias Mailänder
f9d5a439d8 and another hit for invalid players 2014-06-28 09:52:00 +02:00
Matthias Mailänder
59c12c2a31 now that we check actors and players we can't exclude them 2014-06-28 09:51:50 +02:00
Matthias Mailänder
a6ad359914 remove legacy actors as a test case 2014-06-28 09:51:12 +02:00
Matthias Mailänder
ba1fa7cd81 new check for undefined actors 2014-06-28 09:50:50 +02:00
Matthias Mailänder
7fa51712ec Merge pull request #5758 from pchote/cell-world-conversions
Generalize cell/world coordinate conversions.
2014-06-28 08:27:18 +02:00
Paul Chote
2431c34ca9 Merge pull request #5752 from Mailaender/tank-paradrop
Removed the tank paradrop icon
2014-06-28 16:17:15 +12:00
Paul Chote
d0c3fae1a2 Merge pull request #5406 from RoosterDragon/palette-efficiency
Changed HardwarePalette.ApplyModifiers to be more efficient.
2014-06-28 16:11:43 +12:00
RoosterDragon
7030d8b2b6 Changed HardwarePalette.ApplyModifiers to be more efficient.
- Add separate ImmutablePalette and MutablePalette classes since the distinction is extremely important to HardwarePalette.
- Keep a cache of palettes in HardwarePalette to avoid reallocation them every time ApplyModifiers is called.
- Palettes that are not allowed to be modified are copied to the buffer once when added, rather than every time ApplyModifiers is called.
- The AdjustPalette method now takes a read-only dictionary to prevent the dictionary being messed with.
- Added a constant for the palette size to remove its usage as a magic number in several areas.
- The ColorPreviewManagerWidget is annoying in that it needs to actually permanently update a palette after it has been added. To allow this, HardwarePalette now allows a palette to be replaced after initialization. The WorldRenderer therefore now also updates the PaletteReference it created earlier with the new palette to prevent stale data being used elsewhere.
2014-06-28 01:11:48 +01:00
Chris Forbes
5c82fff0ef Merge pull request #5751 from RoosterDragon/map-cache-tileset
Cache tileset lookup in Map
2014-06-28 09:27:27 +12:00
Matthias Mailänder
000768dd4f Merge pull request #5762 from obrakmann/fix-tech-capture-fallout
Fix fallout from tech-capture changes
2014-06-27 22:24:00 +02:00
Matthias Mailänder
7fa8cc10e9 Merge pull request #5763 from obrakmann/build-shift+keypress
Make Shift+<Hotkey> queue five units/buildings. Fixes #5544.
2014-06-27 22:18:50 +02:00
Oliver Brakmann
f7e32aac60 Fix fallout from tech-capture changes 2014-06-27 21:50:03 +02:00
RoosterDragon
bcbd1c2577 Cache tileset lookup in map so GetTerrainIndex and GetTerrainInfo need not repeat it every time.
The lookup accounts for ~50-60% of the time spent in GetTerrainIndex and GetTerrainInfo, and these methods themselves can account for up to 1.3% of total CPU used so this is a small but measurable win.
2014-06-27 19:52:57 +01:00
Matthias Mailänder
e9ee4a1e15 Update ShroudRenderer.cs
fix typo
2014-06-27 13:30:57 +02:00
Paul Chote
d7f1b1c9e2 Remove CVec -> WVec conversion. 2014-06-27 23:30:41 +12:00
Paul Chote
a256e722d5 Remove conversions between legacy and world types. 2014-06-27 23:30:41 +12:00
Paul Chote
9487f49cd5 Replace WPos.ToCPos -> Map.CellContaining. 2014-06-27 23:30:40 +12:00
Paul Chote
4bc09692e0 Remove WVec.ToCVec. 2014-06-27 23:30:40 +12:00
Paul Chote
7b52fa52b6 Replace CPos.CenterPosition -> Map.CenterOfCell. 2014-06-27 23:30:40 +12:00
Paul Chote
b6d1d26eeb Add World parameter to Util.BetweenCells. 2014-06-27 23:30:40 +12:00
Paul Chote
086ec07eb6 Add World parameter to Target.FromCell. 2014-06-27 23:30:40 +12:00
Paul Chote
e4ea012b9e Add World parameter to Target.FromOrder. 2014-06-27 23:30:40 +12:00
Paul Chote
b52cdd4b45 Remove redundant FindActorsInBox helpers. 2014-06-27 23:30:40 +12:00
Matthias Mailänder
0989a5ea08 Merge pull request #5757 from pchote/tsshroud
Use TS shroud sprites.
2014-06-27 13:29:10 +02:00
Paul Chote
8cd6f05b71 Use TS shroud artwork. 2014-06-27 22:28:33 +12:00
Paul Chote
8f046c7c5a Support split sprites for fog/shroud. 2014-06-27 22:28:33 +12:00
Paul Chote
8c4dcb7fe0 Configurable ShroudRenderer palettes and readonly state. 2014-06-27 22:28:33 +12:00
Matthias Mailänder
c60f19aee0 Merge pull request #5629 from pchote/celllayers
Introduce CellLayer and CellRegion abstractions.
2014-06-27 12:27:30 +02:00
Paul Chote
78f8c94df8 Make PathDistance struct immutable. 2014-06-27 22:07:03 +12:00
Paul Chote
5560f276ca Map: Rename IsInMap -> Contains. 2014-06-27 22:07:03 +12:00
Paul Chote
e0df669de9 Bridgelayer: Keys.Contains -> ContainsKey. 2014-06-27 22:07:03 +12:00
Paul Chote
fd4d3b40d0 Simplify shroud range checks. 2014-06-27 22:07:03 +12:00
Paul Chote
2a466d08c3 Remove the now-unused ExploredBounds optimization. 2014-06-27 22:07:03 +12:00
Paul Chote
441971f6d7 Use CellLayer for pathfinding. 2014-06-27 22:07:03 +12:00
Paul Chote
435f47158f Remove unused Map.IsInMap(x,y) overload. 2014-06-27 22:07:03 +12:00
Paul Chote
c5a13d4e65 Remove CellBounds from BuildableTerrainLayer and SmudgeLayer 2014-06-27 22:07:03 +12:00
Paul Chote
997216aef0 Use CellLayer for terrain. 2014-06-27 22:07:02 +12:00
Paul Chote
ad730a44c3 Use CellLayer for resources. 2014-06-27 22:07:02 +12:00
Paul Chote
ce331a28e8 Use CellLayer for custom terrain. 2014-06-27 22:07:02 +12:00
Paul Chote
c5b4d643af Use CellLayer for BridgeLayer. 2014-06-27 22:07:02 +12:00
Paul Chote
fb3477d630 Use CellLayer for BuildingInfluence. 2014-06-27 22:07:02 +12:00
Paul Chote
7c463c414c Use CellLayer for DomainIndex. 2014-06-27 22:07:02 +12:00
Paul Chote
8dc0967d2e Use CellLayer for ActorMap. 2014-06-27 22:07:02 +12:00
Paul Chote
baf27bc4cd Use CellLayers for shroud. 2014-06-27 22:07:02 +12:00
Paul Chote
295af5741f Use CellLayers for ResourceLayer. 2014-06-27 22:07:01 +12:00
Matthias Mailänder
e733ee0434 remove tank paradrop icon 2014-06-27 09:20:55 +02:00
Paul Chote
5a00757eab Use CellLayers for pathfinder debug. 2014-06-27 19:20:46 +12:00
Paul Chote
386b71de82 Integrate CellRegion with Map, Viewport. 2014-06-27 19:20:46 +12:00
Paul Chote
52ab8f3ca1 Add CellRegion and CellLayer classes to simplify map overlays. 2014-06-27 19:20:46 +12:00
Paul Chote
97a61273dd Bring PathSearch in line with the current code style. 2014-06-27 19:20:46 +12:00