mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

rename pitch direction vector and move roll component array

Browse Source
This commit is contained in:
Spacek531
2025-10-20 22:11:20 -07:00
committed by Gymnasiast
parent 8bf18c4543
commit 965ce8bf69
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/ride/Vehicle.cpp
View File

@@ -393,12 +393,6 @@ static constexpr CoordsXY kSurroundingTiles[] = {
{ 0, +kCoordsXYStep },
};
/** rct2: 0x009A39C4 */
static constexpr int32_t kUnk9A39C4[] = {
2147483647, 2096579710, 1946281152, 2096579710, 1946281152, 1380375879, 555809667, -372906620, -1231746017, -1859775391,
1380375879, 555809667, -372906620, -1231746017, -1859775391, 0, 2096579710, 1946281152, 2096579710, 1946281152,
};
static constexpr OpenRCT2::Audio::SoundId kDoorOpenSoundIds[] = {
OpenRCT2::Audio::SoundId::null, // DoorSoundType::none
OpenRCT2::Audio::SoundId::doorOpen, // DoorSoundType::door
@@ -5036,7 +5030,7 @@ OpenRCT2::Audio::SoundId Vehicle::ProduceScreamSound(const int32_t totalNumPeeps
GForces Vehicle::GetGForces() const
{
int32_t gForceVert = ((static_cast<int64_t>(0x280000)) * Geometry::getPitchVector32(pitch).x) >> 32;
gForceVert = ((static_cast<int64_t>(gForceVert)) * kUnk9A39C4[EnumValue(roll)]) >> 32;
gForceVert = ((static_cast<int64_t>(gForceVert)) * Geometry::kRollHorizontalComponent[EnumValue(roll)]) >> 32;
const auto& ted = GetTrackElementDescriptor(GetTrackType());
const int32_t vertFactor = ted.verticalFactor(track_progress);

7
src/openrct2/ride/VehicleGeometry.cpp
View File

@@ -183,4 +183,11 @@ namespace OpenRCT2::RideVehicle::Geometry
});
static_assert(std::size(kPitchToDirectionVectorInt32) == EnumValue(VehiclePitch::pitchCount));
/** rct2: 0x009A39C4 */
constexpr auto kRollHorizontalComponent = std::to_array<int32_t>({
2147483647, 2096579710, 1946281152, 2096579710, 1946281152, 1380375879, 555809667,
-372906620, -1231746017, -1859775391, 1380375879, 555809667, -372906620, -1231746017,
-1859775391, 0, 2096579710, 1946281152, 2096579710, 1946281152,
});
static_assert(std::size(kRollHorizontalComponent) == EnumValue(VehicleRoll::rollCount));
} // namespace OpenRCT2::RideVehicle::Geometry

1
src/openrct2/ride/VehicleGeometry.h
View File

@@ -29,6 +29,7 @@ namespace OpenRCT2::RideVehicle::Geometry
extern const std::array<Unk9A36C4Struct, 32> kFreeroamVehicleMovementData;
extern const std::array<int32_t, EnumValue(VehiclePitch::pitchCount)> kAccelerationFromPitch;
extern const std::array<CoordsXY, EnumValue(VehiclePitch::pitchCount)> kPitchToDirectionVectorInt32;
extern const std::array<int32_t, EnumValue(VehicleRoll::rollCount)> kRollHorizontalComponent;
/** The distance between subposition points in a movement vector.
* Squashes vector components to 0 or !0, so vector length is ignored.