Add seat spin widget to control vehicle spin value

Basssiiie · Oct 20, 2024 · fbe10ed · fbe10ed
1 parent 3080f3f
commit fbe10ed
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/src/services/vehicleEditor.ts b/src/services/vehicleEditor.ts
@@ -12,7 +12,7 @@ const execute = register<UpdateVehicleSettingArgs>("rve-update-car", updateVehic
 type VehicleUpdateKeys
 	= "rideObject" | "vehicleObject" | "isReversed" | "trackProgress" | "spacing"
 	| "numSeats" | "mass" | "poweredAcceleration" | "poweredMaxSpeed" | "x" | "y" | "z"
-	| "body" | "trim" | "tertiary";
+	| "spin" | "body" | "trim" | "tertiary";
 
 const
 	rideTypeKey = "rideObject",
@@ -27,6 +27,7 @@ const
 	xPosition = "x",
 	yPosition = "y",
 	zPosition = "z",
+	spinKey = "spin",
 	primaryColour = "body",
 	secondaryColour = "trim",
 	tertiaryColour = "tertiary";
@@ -153,6 +154,14 @@ export function setPositionZ(vehicles: VehicleSpan[], z: number): void
 	updateValue(vehicles, zPosition, z);
 }
 
+/**
+ * Sets the z position for this vehicle.
+ */
+export function setSpin(vehicles: VehicleSpan[], spin: number): void
+{
+	updateValue(vehicles, spinKey, spin);
+}
+
 
 /**
  * Arguments for updating a single key in a vehicle object.
@@ -240,6 +249,14 @@ function updateVehicleSetting(args: UpdateVehicleSettingArgs): void
 			};
 			break;
 		}
+		case spinKey:
+		{
+			callback = (car): void =>
+			{
+				car.spin += value;
+			};
+			break;
+		}
 		case trackProgressKey:
 		{
 			callback = (car): void =>
@@ -278,4 +295,4 @@ function updateVehicleSetting(args: UpdateVehicleSettingArgs): void
 	}
 
 	forEachVehicle(targets, callback);
-}
+}
diff --git a/src/ui/mainWindow.ts b/src/ui/mainWindow.ts
@@ -4,7 +4,7 @@ import { RideVehicleVariant, VehicleVisibility } from "../objects/rideVehicleVar
 import { invoke, refreshRide } from "../services/events";
 import { applyToTargets, CopyFilter, getTargets, getVehicleSettings } from "../services/vehicleCopier";
 import { dragToolId, toggleVehicleDragger } from "../services/vehicleDragger";
-import { changeSpacing, changeTrackProgress, setMass, setPositionX, setPositionY, setPositionZ, setPoweredAcceleration, setPoweredMaximumSpeed, setPrimaryColour, setReversed, setRideType, setSeatCount, setSecondaryColour, setTertiaryColour, setVariant } from "../services/vehicleEditor";
+import { changeSpacing, changeTrackProgress, setMass, setPositionX, setPositionY, setPositionZ, setPoweredAcceleration, setPoweredMaximumSpeed, setPrimaryColour, setReversed, setRideType, setSeatCount, setSecondaryColour, setSpin, setTertiaryColour, setVariant } from "../services/vehicleEditor";
 import { locate } from "../services/vehicleLocater";
 import { pickerToolId, toggleVehiclePicker } from "../services/vehiclePicker";
 import { cancelTools } from "../utilities/tools";
@@ -375,6 +375,16 @@ export const mainWindow = window({
 								value: model._z,
 								format: model._formatPosition,
 								onChange: (_, incr) => model._modifyVehicle(setPositionZ, incr)
+							}),
+							positionSpinner({
+								_label: { text: "Seat spin:" },
+								minimum: 0,
+								maximum: 255,
+								disabled: model._isPositionDisabled,
+								step: model._multiplier,
+								value: model._spin,
+								format: model._formatPosition,
+								onChange: (_, incr) => model._modifyVehicle(setSpin, incr)
 							})
 						]
 					}),

diff --git a/src/viewmodels/vehicleViewModel.ts b/src/viewmodels/vehicleViewModel.ts
@@ -41,6 +41,7 @@ export class VehicleViewModel
 	readonly _x = store<number>(0);
 	readonly _y = store<number>(0);
 	readonly _z = store<number>(0);
+	readonly _spin = store<number>(0);
 
 	readonly _primaryColour = store<Colour>(0);
 	readonly _secondaryColour = store<Colour>(0);
@@ -277,6 +278,7 @@ export class VehicleViewModel
 		this._x.set(car.x);
 		this._y.set(car.y);
 		this._z.set(car.z);
+		this._spin.set(car.spin);
 
 		const train = this._selectedTrain.get();
 		if (train)