Fix spin and XYZ not updating properly when synchronizing, limit spin to 0-31 visible frames

Author: Basssiiie

src/objects/rideVehicle.ts

@@ -116,11 +116,12 @@ export class RideVehicle
 	}
 
 	/**
-	 * Returns true if this car is considered a "spinning" ride type.
+	 * Returns the mask for getting spin frames if this car is considered a "spinning" ride type.
 	 */
-	_isSpinning(): boolean
+	_getSpinFrames(): number
 	{
 		const type = this._type();
-		return !!type && ((type.flags & CAR_ENTRY_FLAG_SPINNING) !== 0);
+		// todo: OpenRCT2 only supports/reports 32 at the moment.
+		return !!type && ((type.flags & CAR_ENTRY_FLAG_SPINNING) !== 0) ? 32 : 0;
 	}
 }

src/services/vehicleEditor.ts

@@ -231,14 +231,30 @@ function updateVehicleSetting(args: UpdateVehicleSettingArgs): void
 		case massKey:
 		case poweredAccelerationKey:
 		case poweredMaxSpeedKey:
+		{
+			callback = (car): void =>
+			{
+				car[key] = <never>value;
+			};
+			break;
+		}
 		case xPosition:
 		case yPosition:
 		case zPosition:
+		{
+			callback = (car): void =>
+			{
+				car[key] += value;
+			};
+			break;
+		}
 		case spinKey:
 		{
 			callback = (car): void =>
 			{
-				car[key] = <never>value;
+				// Spin does not support negative numbers and must be wrapped
+				const result = car[key] + value;
+				car[key] = (result < 0) ? (256 + result) : result;
 			};
 			break;
 		}

src/ui/mainWindow.ts

@@ -7,6 +7,7 @@ import { applyToTargets, CopyFilter, getTargets, getVehicleSettings } from "../s
 import { changeSpacing, changeTrackProgress, setMass, setPositionX, setPositionY, setPositionZ, setPoweredAcceleration, setPoweredMaximumSpeed, setPrimaryColour, setReversed, setRideType, setSeatCount, setSecondaryColour, setSpin, setTertiaryColour, setVariant } from "../services/vehicleEditor";
 import { VehicleSpan } from "../services/vehicleSpan";
 import { isValidGameVersion } from "../services/versionChecker";
+import { floor } from "../utilities/math";
 import { VehicleViewModel } from "../viewmodels/vehicleViewModel";
 import { model as rideModel, rideWindow } from "./rideWindow";
 import { labelled, labelledSpinner, LabelledSpinnerParams, multiplier } from "./utilityControls";
@@ -353,32 +354,32 @@ const mainWindow = window({
 								step: model._multiplier,
 								value: model._x,
 								format: model._formatPosition,
-								onChange: value => model._modifyVehicle(setPositionX, value)
+								onChange: (_, incr) => model._modifyVehicle(setPositionX, incr)
 							}),
 							positionSpinner({
 								_label: { text: "Y position:" },
 								disabled: model._isPositionDisabled,
 								step: model._multiplier,
 								value: model._y,
 								format: model._formatPosition,
-								onChange: value => model._modifyVehicle(setPositionY, value)
+								onChange: (_, incr) => model._modifyVehicle(setPositionY, incr)
 							}),
 							positionSpinner({
 								_label: { text: "Z position:" },
 								disabled: model._isPositionDisabled,
 								step: model._multiplier,
 								value: model._z,
 								format: model._formatPosition,
-								onChange: value => model._modifyVehicle(setPositionZ, value)
+								onChange: (_, incr) => model._modifyVehicle(setPositionZ, incr)
 							}),
 							labelSpinner({
 								_label: { text: "Spin angle:" },
 								minimum: 0,
-								maximum: 255,
+								maximum: compute(model._spinFrames, frames => frames > 0 ? frames - 1 : 0),
 								disabled: model._isSpinDisabled,
 								step: model._multiplier,
-								value: model._spin,
-								onChange: value => model._modifyVehicle(setSpin, value)
+								value: compute(model._spin, model._spinFrames, (spin, frames) => floor((spin * frames) / 256)),
+								onChange: (_, incr) => model._modifyVehicle(setSpin, floor((incr * 256) / model._spinFrames.get()))
 							})
 						]
 					}),

src/viewmodels/vehicleViewModel.ts

@@ -45,6 +45,7 @@ export class VehicleViewModel
 	readonly _y = store<number>(0);
 	readonly _z = store<number>(0);
 	readonly _spin = store<number>(0);
+	readonly _spinFrames = compute(this._selectedVehicle, this._type, this._variant, v => v ? v[0]._getSpinFrames() : 0);
 
 	readonly _primaryColour = store<Colour>(0);
 	readonly _secondaryColour = store<Colour>(0);
@@ -55,7 +56,7 @@ export class VehicleViewModel
 	readonly _isPicking = store<boolean>(false);
 	readonly _isDragging = store<boolean>(false);
 	readonly _isEditDisabled = compute(this._selectedVehicle, v => !v);
-	readonly _isSpinDisabled = compute(this._selectedVehicle, v => !v || !v[0]._isSpinning());
+	readonly _isSpinDisabled = compute(this._spinFrames, v => !v);
 	readonly _isPositionDisabled = compute(this._isMoving, this._isEditDisabled, (m, e) => m || e);
 	readonly _formatPosition = (pos: number): string => (this._isEditDisabled.get() ? "Not available" : pos.toString());
 	readonly _multiplierIndex = store<number>(0);