mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

implement paint motion simulator

This commit is contained in:
Ted John 2016-05-21 16:07:29 +01:00
parent 4739eb2716
commit 8c5e5ecc01
3 changed files with 146 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
src/ride/thrill/motion_simulator.c
View File

@ -13,3 +13,146 @@
* A full copy of the GNU General Public License can be found in licence.txt
*****************************************************************************/
#pragma endregion
#include "../../interface/viewport.h"
#include "../../paint/paint.h"
#include "../../paint/supports.h"
#include "../track_paint.h"
enum {
SPR_MOTION_SIMULATOR_STAIRS_R0 = 22154,
SPR_MOTION_SIMULATOR_STAIRS_R1 = 22155,
SPR_MOTION_SIMULATOR_STAIRS_R2 = 22156,
SPR_MOTION_SIMULATOR_STAIRS_R3 = 22157,
SPR_MOTION_SIMULATOR_STAIRS_RAIL_R0 = 22158,
SPR_MOTION_SIMULATOR_STAIRS_RAIL_R1 = 22159,
SPR_MOTION_SIMULATOR_STAIRS_RAIL_R2 = 22160,
SPR_MOTION_SIMULATOR_STAIRS_RAIL_R3 = 22161,
};
/**
*
* rct2: 0x0076522A
*/
static void paint_motionsimulator_vehicle(sint8 offsetX, sint8 offsetY, uint8 direction, int height, rct_map_element* mapElement)
{
rct_ride *ride = get_ride(mapElement->properties.track.ride_index);
rct_ride_entry *rideEntry = get_ride_entry_by_ride(ride);
rct_map_element * savedMapElement = RCT2_GLOBAL(0x009DE578, rct_map_element*);
rct_vehicle *vehicle = NULL;
if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) {
uint16 spriteIndex = ride->vehicles[0];
if (spriteIndex != SPRITE_INDEX_NULL) {
vehicle = GET_VEHICLE(spriteIndex);
RCT2_GLOBAL(0x009DE570, uint8) = 2;
RCT2_GLOBAL(0x009DE578, rct_vehicle*) = vehicle;
}
}
uint32 simulatorImageId = rideEntry->vehicles[0].base_image_id + direction;
if (vehicle != NULL) {
if (vehicle->restraints_position >= 64) {
simulatorImageId += (vehicle->restraints_position >> 6) << 2;
} else {
simulatorImageId += vehicle->vehicle_sprite_type * 4;
}
}
uint32 imageColourFlags = RCT2_GLOBAL(0x00F441A0, uint32);
if (imageColourFlags == 0x20000000) {
imageColourFlags = (IMAGE_TYPE_UNKNOWN | IMAGE_TYPE_USE_PALETTE) << 28;
imageColourFlags |= ride->vehicle_colours[0].trim_colour << 19;
imageColourFlags |= ride->vehicle_colours[0].body_colour << 24;
}
simulatorImageId |= imageColourFlags;
sint16 offsetZ = height + 2;
uint32 imageId;
uint8 currentRotation = get_current_rotation();
switch (direction) {
case 0:
// Simulator
imageId = simulatorImageId;
sub_98197C(imageId, offsetX, offsetY, 20, 20, 44, offsetZ, offsetX, offsetY, offsetZ, currentRotation);
// Stairs
imageId = (SPR_MOTION_SIMULATOR_STAIRS_R0 + direction) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98199C(imageId, offsetX, offsetY, 20, 20, 44, offsetZ, offsetX, offsetY, offsetZ, currentRotation);
// Stairs (rail)
imageId = (SPR_MOTION_SIMULATOR_STAIRS_RAIL_R0 + direction) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98197C(imageId, offsetX, offsetY, 20, 2, 44, offsetZ, offsetX, offsetY + 32, offsetZ, currentRotation);
break;
case 1:
// Simulator
imageId = simulatorImageId;
sub_98197C(imageId, offsetX, offsetY, 20, 20, 44, offsetZ, offsetX, offsetY, offsetZ, currentRotation);
// Stairs
uint32 imageId = (SPR_MOTION_SIMULATOR_STAIRS_R0 + direction) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98199C(imageId, offsetX, offsetY, 20, 20, 44, offsetZ, offsetX, offsetY, offsetZ, currentRotation);
// Stairs (rail)
imageId = (SPR_MOTION_SIMULATOR_STAIRS_RAIL_R0 + direction) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98197C(imageId, offsetX, offsetY, 2, 20, 44, offsetZ, offsetX + 34, offsetY, offsetZ, currentRotation);
break;
case 2:
// Stairs (rail)
imageId = (SPR_MOTION_SIMULATOR_STAIRS_RAIL_R0 + direction) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98197C(imageId, offsetX, offsetY, 20, 2, 44, offsetZ, offsetX, offsetY - 10, offsetZ, currentRotation);
// Stairs
imageId = (SPR_MOTION_SIMULATOR_STAIRS_R0 + direction) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98197C(imageId, offsetX, offsetY, 20, 20, 44, offsetZ, offsetX, offsetY + 5, offsetZ, currentRotation);
// Simulator
imageId = simulatorImageId;
sub_98199C(imageId, offsetX, offsetY, 20, 20, 44, offsetZ, offsetX, offsetY + 5, offsetZ, currentRotation);
break;
case 3:
// Stairs (rail)
imageId = (SPR_MOTION_SIMULATOR_STAIRS_RAIL_R0 + direction) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98197C(imageId, offsetX, offsetY, 2, 20, 44, offsetZ, offsetX - 10, offsetY, offsetZ, currentRotation);
// Stairs
imageId = (SPR_MOTION_SIMULATOR_STAIRS_R0 + direction) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98197C(imageId, offsetX, offsetY, 20, 20, 44, offsetZ, offsetX + 5, offsetY, offsetZ, currentRotation);
// Simulator
imageId = simulatorImageId;
sub_98199C(imageId, offsetX, offsetY, 20, 20, 44, offsetZ, offsetX + 5, offsetY, offsetZ, currentRotation);
break;
}
RCT2_GLOBAL(0x009DE578, rct_map_element*) = savedMapElement;
gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_RIDE;
}
/** rct2: 0x008A85C4 */
static void paint_motionsimulator(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
trackSequence = track_map_2x2[direction][trackSequence];
int edges = edges_2x2[trackSequence];
rct_ride *ride = get_ride(rideIndex);
rct_xy16 position = { RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16) };
wooden_a_supports_paint_setup((direction & 1), 0, height, RCT2_GLOBAL(0x00F441A0, uint32), NULL);
track_paint_util_paint_floor(edges, RCT2_GLOBAL(0x00F44198, uint32), height, floorSpritesCork, get_current_rotation());
track_paint_util_paint_fences(edges, position, mapElement, ride, RCT2_GLOBAL(0x00F4419C, uint32), height, fenceSpritesRope, get_current_rotation());
switch (trackSequence) {
case 1: paint_motionsimulator_vehicle( 16, -16, direction, height, mapElement); break;
case 2: paint_motionsimulator_vehicle(-16, 16, direction, height, mapElement); break;
case 3: paint_motionsimulator_vehicle(-16, -16, direction, height, mapElement); break;
}
paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(height + 128, 0x20);
}
/**
*
* rct2: 0x00763520
*/
TRACK_PAINT_FUNCTION get_track_paint_function_motionsimulator(int trackType, int direction)
{
switch (trackType) {
case 110: return paint_motionsimulator;
}
return NULL;
}

4
src/ride/track_data.c
View File

@ -5505,7 +5505,7 @@ const uint32 RideTypeTrackPaintFunctionsOld[91] = {
0, // RIDE_TYPE_INFORMATION_KIOSK
0, // RIDE_TYPE_TOILETS
0, // RIDE_TYPE_FERRIS_WHEEL
0x00763520, // RIDE_TYPE_MOTION_SIMULATOR
0, // RIDE_TYPE_MOTION_SIMULATOR
0, // RIDE_TYPE_3D_CINEMA
0, // RIDE_TYPE_TOP_SPIN
0, // RIDE_TYPE_SPACE_RINGS
@ -5600,7 +5600,7 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[91] = {
get_track_paint_function_shop, // RIDE_TYPE_INFORMATION_KIOSK
get_track_paint_function_facility, // RIDE_TYPE_TOILETS
get_track_paint_function_ferris_wheel, // RIDE_TYPE_FERRIS_WHEEL
0, // RIDE_TYPE_MOTION_SIMULATOR
get_track_paint_function_motionsimulator, // RIDE_TYPE_MOTION_SIMULATOR
get_track_paint_function_3d_cinema, // RIDE_TYPE_3D_CINEMA
get_track_paint_function_topspin, // RIDE_TYPE_TOP_SPIN
get_track_paint_function_space_rings, // RIDE_TYPE_SPACE_RINGS

1
src/ride/track_paint.h
View File

@ -182,6 +182,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_river_rapids(int trackType, int di
TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_pirate_ship(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_ferris_wheel(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_motionsimulator(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_3d_cinema(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_topspin(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_space_rings(int trackType, int direction);