Add extra vehicle sprite groups (new track pieces part 1) (#17352)

* Add new sprite groups for zero G rolls

* Fix formatting

* Rename vehicle paint functions

* Fix formatting

* Fix parameter name

* Fix formatting
This commit is contained in:
X123M3-256 2022-07-24 05:40:41 +01:00 committed by GitHub
parent d82360cc16
commit 55c8a3d775
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 847 additions and 120 deletions

View File

@ -39,7 +39,7 @@ using namespace OpenRCT2;
using namespace OpenRCT2::Entity::Yaw;
static const uint8_t SpriteGroupMultiplier[EnumValue(SpriteGroupType::Count)] = {
1, 2, 2, 2, 2, 2, 2, 10, 1, 2, 2, 2, 2, 2, 2, 2, 6, 4, 4, 4, 4, 4, 20, 3, 1,
1, 2, 2, 2, 2, 2, 2, 10, 1, 2, 2, 2, 2, 2, 2, 2, 6, 4, 4, 4, 4, 4, 4, 4, 12, 4, 4, 4, 4, 4, 20, 3, 1,
};
static constexpr SpritePrecision PrecisionFromNumFrames(uint8_t numRotationFrames)

View File

@ -158,10 +158,17 @@ const CarEntry CableLiftVehicle = {
/* .SpriteGroups[Slopes25Banked22] = */ 0, SpritePrecision::None,
/* .SpriteGroups[Slopes25Banked45] = */ 0, SpritePrecision::None,
/* .SpriteGroups[Slopes12Banked45] = */ 0, SpritePrecision::None,
/* .SpriteGroups[Slopes25Banked67] = */ 0, SpritePrecision::None,
/* .SpriteGroups[Slopes25Banked90] = */ 0, SpritePrecision::None,
/* .SpriteGroups[SlopesInlineTwists] = */ 0, SpritePrecision::None,
/* .SpriteGroups[Slopes42Banked22] = */ 0, SpritePrecision::None,
/* .SpriteGroups[Slopes42Banked45] = */ 0, SpritePrecision::None,
/* .SpriteGroups[Slopes42Banked67] = */ 0, SpritePrecision::None,
/* .SpriteGroups[Slopes42Banked90] = */ 0, SpritePrecision::None,
/* .SpriteGroups[Slopes60Banked22] = */ 0, SpritePrecision::None,
/* .SpriteGroups[Corkscrews] = */ 0, SpritePrecision::None,
/* .SpriteGroups[RestraintAnimation] = */ 0, SpritePrecision::None,
/* .SpriteGroups[CurvedLiftHill] = */ 0, SpritePrecision::None,
/* .no_vehicle_images = */ 0,
/* .no_seating_rows = */ 0,
/* .spinning_inertia = */ 0,

View File

@ -118,6 +118,14 @@ enum class SpriteGroupType : uint8_t
Slopes25Banked22,
Slopes25Banked45,
Slopes12Banked45,
Slopes25Banked67,
Slopes25Banked90,
Slopes25InlineTwists,
Slopes42Banked22,
Slopes42Banked45,
Slopes42Banked67,
Slopes42Banked90,
Slopes60Banked22,
Corkscrews,
RestraintAnimation,
CurvedLiftHill,
@ -125,11 +133,13 @@ enum class SpriteGroupType : uint8_t
};
static const std::string SpriteGroupNames[] = {
"slopeFlat", "slopes12", "slopes25", "slopes42", "slopes60",
"slopes75", "slopes90", "slopesLoop", "slopeInverted", "slopes8",
"slopes16", "slopes50", "flatBanked22", "flatBanked45", "flatBanked67",
"flatBanked90", "inlineTwists", "slopes12Banked22", "slopes8Banked22", "slopes25Banked22",
"slopes25Banked45", "slopes12Banked45", "corkscrews", "restraintAnimation", "curvedLiftHill",
"slopeFlat", "slopes12", "slopes25", "slopes42", "slopes60",
"slopes75", "slopes90", "slopesLoop", "slopeInverted", "slopes8",
"slopes16", "slopes50", "flatBanked22", "flatBanked45", "flatBanked67",
"flatBanked90", "inlineTwists", "slopes12Banked22", "slopes8Banked22", "slopes25Banked22",
"slopes25Banked45", "slopes12Banked45", "slopes25Banked67", "slopes25Banked90", "slopes25InlineTwists",
"slopes42Banked22", "slopes42Banked45", "slopes42Banked67", "slopes42Banked90", "slopes60Banked22",
"corkscrews", "restraintAnimation", "curvedLiftHill",
};
static_assert(std::size(SpriteGroupNames) == EnumValue(SpriteGroupType::Count));

File diff suppressed because it is too large Load Diff