Generalize cell/world coordinate conversions. #5758
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| var testSequence = info.Sequence + "-" + terrain; | ||
| var sequence = anim.HasSequence(testSequence) ? testSequence : info.Sequence; | ||
| anim.PlayFetchIndex(sequence, () => index); | ||
| anim.IsDecoration = true; | ||
|
|
||
| // Z-order is one set to the top of the footprint | ||
| var offset = cellOffset.ToWVec() - centerOffset; | ||
| var offset = self.World.Map.CenterOfCell(cell) - self.World.Map.CenterOfCell(location) - centerOffset; |
There was a problem hiding this comment.
This looks like an unnecessary calculation. Why are you not re-using cellOffset like before?
There was a problem hiding this comment.
It is no longer possible to convert directly between CVec and WVec, as the result now depends on outside information (cell grid type, map heightmap). This instead converts both cells to a world position, and then calculates the WVec directly.
|
Patch bomb and lot's of rebase and re-adaption pain for everybody else, but straight forward conversions that seemed easy to review. 👍 Can't find any regressions. |
Mailaender
added a commit
that referenced
this pull request
Jun 28, 2014
Generalize cell/world coordinate conversions.
18 tasks
obrakmann
added a commit
to obrakmann/OpenRA
that referenced
this pull request
Jul 5, 2014
Specifically, the CPos::CenterPosition -> Map::CenterOfCell rename (OpenRA#5758), as well as the additional argument to Paradrop::SetLZ (OpenRA#5695).
noyanbaykal
pushed a commit
to noyanbaykal/OpenRA
that referenced
this pull request
Jul 13, 2014
Specifically, the CPos::CenterPosition -> Map::CenterOfCell rename (OpenRA#5758), as well as the additional argument to Paradrop::SetLZ (OpenRA#5695).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part 3 / 5 of the isometric terrain implementation.
Moving the conversions into Map will allow these checks to be extended in future PRs to account for rectangular vs isometric cell grids, and use heightmap data.