dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change: make GetPartialZ consistent, meaning Z of adjacent slopes continue

Browse Source 
Previously, on a straight line of a one corner up slope with the adjacent
steep sloop the Z would increase one step every two sub pixels, except for one
case where one sub pixel is skipped. Similarly, a steep slope with two
adjacent one corner up slopes, would have a bump in the height line along the
diagonal whenever it enters/leaves the steep slope tile.
This commit is contained in:
Rubidium
2023-02-25 23:58:46 +01:00
committed by rubidium42
parent 1fcd69096c
commit 9d2a0f3d0b
5 changed files with 120 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ground_vehicle.hpp
View File

@@ -165,25 +165,25 @@ struct GroundVehicle : public SpecializedVehicle<T, Type> {
if (HasBit(this->gv_flags, GVF_GOINGUP_BIT)) {
switch (this->direction) {
case DIR_NE:
this->z_pos += (this->x_pos & 1); break;
case DIR_SW:
this->z_pos += (this->x_pos & 1) ^ 1; break;
case DIR_SW:
this->z_pos += (this->x_pos & 1); break;
case DIR_NW:
this->z_pos += (this->y_pos & 1); break;
case DIR_SE:
this->z_pos += (this->y_pos & 1) ^ 1; break;
case DIR_SE:
this->z_pos += (this->y_pos & 1); break;
default: break;
}
} else if (HasBit(this->gv_flags, GVF_GOINGDOWN_BIT)) {
switch (this->direction) {
case DIR_NE:
this->z_pos -= (this->x_pos & 1); break;
case DIR_SW:
this->z_pos -= (this->x_pos & 1) ^ 1; break;
case DIR_SW:
this->z_pos -= (this->x_pos & 1); break;
case DIR_NW:
this->z_pos -= (this->y_pos & 1); break;
case DIR_SE:
this->z_pos -= (this->y_pos & 1) ^ 1; break;
case DIR_SE:
this->z_pos -= (this->y_pos & 1); break;
default: break;
}
}
@@ -212,8 +212,7 @@ struct GroundVehicle : public SpecializedVehicle<T, Type> {
int8 d = DiagDirToAxis(dir) == AXIS_X ? x_pos : y_pos;
/* We need only the least significant bit */
d &= 1;
/* Conditional "^ 1". Optimised to "(dir - 1) <= 1". */
d ^= (int8)(dir == DIAGDIR_SW || dir == DIAGDIR_SE);
d ^= (int8)(dir == DIAGDIR_NW || dir == DIAGDIR_NE);
/* Subtraction instead of addition because we are testing for GVF_GOINGUP_BIT.
* GVF_GOINGUP_BIT is used because it's bit 0, so simple AND can be used,
* without any shift */