ISSUE-080 - Wrote a cheap race "simulator" mode.
It's pretty naive - should honestly look into actually simulating race progress per cars and simulate track-side detectors instead, but this is easy and simple. Added a new event state to track sorted GridSpots. Small adjustments to the layout of the TimingTower prototype controls.
This commit is contained in:
1 parent
1a51966288
commit
c94674a71e
13 files changed
+133
-33
No files matched your search
@@ -43,6 +43,7 @@
|
|||||||
"react-scripts": "5.0.0",
|
"react-scripts": "5.0.0",
|
||||||
"react-use-measure": "^2.1.1",
|
"react-use-measure": "^2.1.1",
|
||||||
"resize-observer-polyfill": "^1.5.1",
|
"resize-observer-polyfill": "^1.5.1",
|
||||||
|
"rooks": "^5.10.3",
|
||||||
"styled-components": "^5.3.3",
|
"styled-components": "^5.3.3",
|
||||||
"typescript": "^4.4.2",
|
"typescript": "^4.4.2",
|
||||||
"web-vitals": "^2.1.0"
|
"web-vitals": "^2.1.0"
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
import { MainMenu } from "./components/Menu";
|
import { MainMenu } from "./components/Menu";
|
||||||
import { useDispatch } from "react-redux";
|
import { useDispatch } from "react-redux";
|
||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
|
import { EventLoop } from "./components/Broadcast/RaceDirectorUI/EventLoop/EventLoop";
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
@@ -40,6 +41,7 @@ function App() {
|
|||||||
<div className="App" ref={appRef}>
|
<div className="App" ref={appRef}>
|
||||||
<MainMenu ref={mainMenuRef} />
|
<MainMenu ref={mainMenuRef} />
|
||||||
<Outlet />
|
<Outlet />
|
||||||
|
<EventLoop />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { MockupBlock } from "../../Common/MockupBlock.styled";
|
|||||||
import { LayoutGrid, LayoutGridItem } from "../../Common/LayoutGrid.styled";
|
import { LayoutGrid, LayoutGridItem } from "../../Common/LayoutGrid.styled";
|
||||||
import { TimingTowerPrototypeControls } from "../../Workspaces/PrototypingControls/TimingTowerPrototype";
|
import { TimingTowerPrototypeControls } from "../../Workspaces/PrototypingControls/TimingTowerPrototype";
|
||||||
import { ChyronsDirectorControls } from "../BroadcastDirectorUI/Chyrons";
|
import { ChyronsDirectorControls } from "../BroadcastDirectorUI/Chyrons";
|
||||||
|
import { RaceDirectorControls } from "../RaceDirectorUI/EventLoop/RaceDirectorControls";
|
||||||
|
|
||||||
type LayoutProps = {
|
type LayoutProps = {
|
||||||
headerHeight?: number,
|
headerHeight?: number,
|
||||||
@@ -31,9 +32,7 @@ export function Layout({ headerHeight }: LayoutProps) {
|
|||||||
</LayoutGridItem>
|
</LayoutGridItem>
|
||||||
|
|
||||||
<LayoutGridItem column={1} row={10}>
|
<LayoutGridItem column={1} row={10}>
|
||||||
<MockupBlock
|
<RaceDirectorControls />
|
||||||
color="#bc62ce"
|
|
||||||
>Race Director UI</MockupBlock>
|
|
||||||
</LayoutGridItem>
|
</LayoutGridItem>
|
||||||
|
|
||||||
<LayoutGridItem column={2} row={9} columnSpan={5} rowSpan={2}>
|
<LayoutGridItem column={2} row={9} columnSpan={5} rowSpan={2}>
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
import { useState } from "react";
|
||||||
|
import { useIntervalWhen } from "rooks";
|
||||||
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
|
|
||||||
|
import { eventSelector } from "../../../../features/event/eventSelector";
|
||||||
|
import { EventStatus, GridSpot } from "../../../../types/state";
|
||||||
|
import { Milliseconds } from "../../../../types/util";
|
||||||
|
import { increaseDistance, refreshRunningOrder } from "../../../../features/event/eventSlice";
|
||||||
|
|
||||||
|
const UPDATE_TICK_MS: Milliseconds = 1500;
|
||||||
|
const SUB_DIVISIONS = 1;
|
||||||
|
|
||||||
|
export function EventLoop() {
|
||||||
|
const dispatch = useDispatch();
|
||||||
|
const { eventStatus, grid, sortedGridSpots } = useSelector(eventSelector);
|
||||||
|
|
||||||
|
const gridSpots: GridSpot[] = Array.from(Array(grid.length).keys());
|
||||||
|
|
||||||
|
const [tick, setTick] = useState(0);
|
||||||
|
const amount = Math.ceil(gridSpots.length / SUB_DIVISIONS);
|
||||||
|
|
||||||
|
useIntervalWhen(
|
||||||
|
() => {
|
||||||
|
const selectedGridSpots = sortedGridSpots.slice(tick, tick + amount);
|
||||||
|
dispatch(increaseDistance({
|
||||||
|
gridSpots: selectedGridSpots,
|
||||||
|
distance: UPDATE_TICK_MS / 1000 * 61, // 61 m/s for Spa.
|
||||||
|
randomness: 0.008,
|
||||||
|
usePerformance: true,
|
||||||
|
}));
|
||||||
|
dispatch(refreshRunningOrder());
|
||||||
|
|
||||||
|
if ((tick + amount) > gridSpots.length) {
|
||||||
|
setTick(0);
|
||||||
|
} else {
|
||||||
|
setTick(tick + amount);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
UPDATE_TICK_MS / SUB_DIVISIONS,
|
||||||
|
eventStatus === EventStatus.Running,
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
|
import { PadBox } from "@bedrock-layout/padbox";
|
||||||
|
|
||||||
|
import { eventSelector } from "../../../../../features/event/eventSelector";
|
||||||
|
import { ClickSpan } from "../../../../Common/Inputs/ClickSpan.styled";
|
||||||
|
import { EventStatus } from "../../../../../types/state";
|
||||||
|
import { setEventStatus } from "../../../../../features/event/eventSlice";
|
||||||
|
|
||||||
|
export function RaceDirectorControls() {
|
||||||
|
const dispatch = useDispatch();
|
||||||
|
const { eventStatus } = useSelector(eventSelector);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<PadBox padding="md">
|
||||||
|
<ClickSpan onClick={() => {
|
||||||
|
if (eventStatus !== EventStatus.Running) {
|
||||||
|
dispatch(setEventStatus(EventStatus.Running));
|
||||||
|
} else {
|
||||||
|
dispatch(setEventStatus(EventStatus.Stopped));
|
||||||
|
}
|
||||||
|
}}>
|
||||||
|
EventStatus = {EventStatus[eventStatus]}
|
||||||
|
</ClickSpan>
|
||||||
|
</PadBox>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export * from "./RaceDirectorControls";
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
import styled from "styled-components/macro";
|
||||||
|
|
||||||
|
export const Derp = styled.div``;
|
||||||
File renamed without changes.
+9
-9
@@ -3,16 +3,16 @@ import { PadBox } from "@bedrock-layout/padbox";
|
|||||||
import { Split } from "@bedrock-layout/split";
|
import { Split } from "@bedrock-layout/split";
|
||||||
import { Stack } from "@bedrock-layout/stack";
|
import { Stack } from "@bedrock-layout/stack";
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
import { broadcastDirectorSelector } from "../../../../features/broadcast/director/broadcastDirectorSelector";
|
|
||||||
|
|
||||||
|
import { broadcastDirectorSelector } from "../../../../features/broadcast/director/broadcastDirectorSelector";
|
||||||
import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector";
|
import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector";
|
||||||
import { setTimingTowerDisplayMode, setTimingTowerSplitsMode } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
|
|
||||||
import { eventSelector } from "../../../../features/event/eventSelector";
|
import { eventSelector } from "../../../../features/event/eventSelector";
|
||||||
|
import { setTimingTowerDisplayMode, setTimingTowerSplitsMode } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
|
||||||
import { awardFastestLap, increaseDistance, refreshRunningOrder, setCarStatus } from "../../../../features/event/eventSlice";
|
import { awardFastestLap, increaseDistance, refreshRunningOrder, setCarStatus } from "../../../../features/event/eventSlice";
|
||||||
import { BGTimingTowerDisplayMode, BGTimingTowerSplitsMode, CarStatus } from "../../../../types/state";
|
import { BGTimingTowerDisplayMode, BGTimingTowerSplitsMode, CarStatus } from "../../../../types/state";
|
||||||
import { GridSelection } from "../GridSelection";
|
|
||||||
|
|
||||||
import { ClickSpan } from "./styles";
|
import { GridSelection } from "../GridSelection";
|
||||||
|
import { ClickSpan } from "../../../Common/Inputs/ClickSpan.styled";
|
||||||
|
|
||||||
export function TimingTowerPrototypeControls() {
|
export function TimingTowerPrototypeControls() {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
@@ -113,18 +113,18 @@ export function TimingTowerPrototypeControls() {
|
|||||||
>
|
>
|
||||||
Splits Mode = {BGTimingTowerSplitsMode[splitsMode]}
|
Splits Mode = {BGTimingTowerSplitsMode[splitsMode]}
|
||||||
</ClickSpan>
|
</ClickSpan>
|
||||||
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.LeftAndRight))}>
|
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.Hidden))}>
|
||||||
{(displayMode === BGTimingTowerDisplayMode.LeftAndRight ? "*" : "") + "LeftAndRight"}
|
{(displayMode === BGTimingTowerDisplayMode.Hidden ? "*" : "") + "Hidden"}
|
||||||
</ClickSpan>
|
</ClickSpan>
|
||||||
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.LeftOnly))}>
|
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.LeftOnly))}>
|
||||||
{(displayMode === BGTimingTowerDisplayMode.LeftOnly ? "*" : "") + "LeftOnly"}
|
{(displayMode === BGTimingTowerDisplayMode.LeftOnly ? "*" : "") + "LeftOnly"}
|
||||||
</ClickSpan>
|
</ClickSpan>
|
||||||
|
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.LeftAndRight))}>
|
||||||
|
{(displayMode === BGTimingTowerDisplayMode.LeftAndRight ? "*" : "") + "LeftAndRight"}
|
||||||
|
</ClickSpan>
|
||||||
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.FullLeft))}>
|
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.FullLeft))}>
|
||||||
{(displayMode === BGTimingTowerDisplayMode.FullLeft ? "*" : "") + "FullLeft"}
|
{(displayMode === BGTimingTowerDisplayMode.FullLeft ? "*" : "") + "FullLeft"}
|
||||||
</ClickSpan>
|
</ClickSpan>
|
||||||
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.Hidden))}>
|
|
||||||
{(displayMode === BGTimingTowerDisplayMode.Hidden ? "*" : "") + "Hidden"}
|
|
||||||
</ClickSpan>
|
|
||||||
|
|
||||||
</InlineCluster>
|
</InlineCluster>
|
||||||
</PadBox>
|
</PadBox>
|
||||||
|
|||||||
@@ -14,11 +14,12 @@ import {
|
|||||||
VirtualSafetyCarStatus,
|
VirtualSafetyCarStatus,
|
||||||
GridSpot,
|
GridSpot,
|
||||||
EventStatus,
|
EventStatus,
|
||||||
|
Car,
|
||||||
} from "../../types/state";
|
} from "../../types/state";
|
||||||
import { Meters } from "../../types/util";
|
import { Meters } from "../../types/util";
|
||||||
import { orMatch } from "../../utils/common";
|
import { orMatch } from "../../utils/common";
|
||||||
import { cloneDriver, getTeam } from "../../utils/dataLookup";
|
import { cloneDriver, getTeam } from "../../utils/dataLookup";
|
||||||
import { driverToGridMap } from "../../utils/event";
|
import { driverToGridMap, sortCarPosition } from "../../utils/event";
|
||||||
|
|
||||||
const DEFAULT_TYRE: Tyre = {
|
const DEFAULT_TYRE: Tyre = {
|
||||||
compound: TyreCompound.Medium,
|
compound: TyreCompound.Medium,
|
||||||
@@ -209,6 +210,7 @@ const initialState: RootState["event"] = {
|
|||||||
driver: cloneDriver("mazepin"),
|
driver: cloneDriver("mazepin"),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
sortedGridSpots: Array.from(Array(20).keys()),
|
||||||
lastUpdate: Date.now(),
|
lastUpdate: Date.now(),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -234,33 +236,24 @@ export const eventSlice = createSlice({
|
|||||||
reducers: {
|
reducers: {
|
||||||
setCourseFlag: (state, action: PayloadAction<CourseFlag>) => {
|
setCourseFlag: (state, action: PayloadAction<CourseFlag>) => {
|
||||||
state.courseStatus.courseFlag = action.payload;
|
state.courseStatus.courseFlag = action.payload;
|
||||||
|
|
||||||
|
state.lastUpdate = Date.now();
|
||||||
|
},
|
||||||
|
setEventStatus: (state, action: PayloadAction<EventStatus>) => {
|
||||||
|
state.eventStatus = action.payload;
|
||||||
|
|
||||||
state.lastUpdate = Date.now();
|
state.lastUpdate = Date.now();
|
||||||
},
|
},
|
||||||
refreshRunningOrder: (state) => {
|
refreshRunningOrder: (state) => {
|
||||||
const sortingGrid = state.grid.map((car, index): {
|
const sortingGrid = state.grid.map((car, index): Car & {
|
||||||
gridSpot: GridSpot,
|
gridSpot: GridSpot,
|
||||||
distance: Meters,
|
|
||||||
status: CarStatus,
|
|
||||||
} => ({
|
} => ({
|
||||||
gridSpot: index,
|
gridSpot: index,
|
||||||
distance: car.distance,
|
...car,
|
||||||
status: car.status,
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// Adds distance to the cars that are out of the race.
|
sortingGrid.sort(sortCarPosition);
|
||||||
const out = (status: CarStatus) => {
|
state.sortedGridSpots = sortingGrid.map(car => car.gridSpot);
|
||||||
if (status === CarStatus.Retired) {
|
|
||||||
return -1000000;
|
|
||||||
} else if (status === CarStatus.DidNotStart) {
|
|
||||||
return -2000000;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
sortingGrid.sort((a, b) =>
|
|
||||||
// Retired cars go to the end but still maintain their own order.
|
|
||||||
(b.distance + out(b.status)) - (a.distance + out(a.status)),
|
|
||||||
);
|
|
||||||
|
|
||||||
const raceEndDistance = state.trackLength * state.eventProgress.scheduledLaps
|
const raceEndDistance = state.trackLength * state.eventProgress.scheduledLaps
|
||||||
+ state.trackStartFinishDelta;
|
+ state.trackStartFinishDelta;
|
||||||
@@ -305,11 +298,13 @@ export const eventSlice = createSlice({
|
|||||||
addedDistance *= random(1 - randomness, 1 + randomness);
|
addedDistance *= random(1 - randomness, 1 + randomness);
|
||||||
}
|
}
|
||||||
if (usePerformance) {
|
if (usePerformance) {
|
||||||
|
addedDistance *= 1 - (car.position * 0.005);
|
||||||
addedDistance *=
|
addedDistance *=
|
||||||
getTeam(car.driver.team.id).performance + car.driver.performance;
|
getTeam(car.driver.team.id).performance + car.driver.performance;
|
||||||
}
|
}
|
||||||
state.grid[gridMap[car.driver.id]].distance += addedDistance;
|
state.grid[gridMap[car.driver.id]].distance += addedDistance;
|
||||||
});
|
});
|
||||||
|
|
||||||
state.lastUpdate = Date.now();
|
state.lastUpdate = Date.now();
|
||||||
},
|
},
|
||||||
awardFastestLap: (state, action: PayloadAction<GridSpot>) => {
|
awardFastestLap: (state, action: PayloadAction<GridSpot>) => {
|
||||||
@@ -326,6 +321,7 @@ export const eventSlice = createSlice({
|
|||||||
state.grid[index].notices.splice(fastestLapNoticeIndex, 1);
|
state.grid[index].notices.splice(fastestLapNoticeIndex, 1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
state.lastUpdate = Date.now();
|
state.lastUpdate = Date.now();
|
||||||
},
|
},
|
||||||
setCarStatus: (state, action: PayloadAction<SetCarStatusAction>) => {
|
setCarStatus: (state, action: PayloadAction<SetCarStatusAction>) => {
|
||||||
@@ -335,6 +331,7 @@ export const eventSlice = createSlice({
|
|||||||
const car = state.grid[gridSpot];
|
const car = state.grid[gridSpot];
|
||||||
state.grid[gridMap[car.driver.id]].status = status;
|
state.grid[gridMap[car.driver.id]].status = status;
|
||||||
});
|
});
|
||||||
|
|
||||||
state.lastUpdate = Date.now();
|
state.lastUpdate = Date.now();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -342,6 +339,7 @@ export const eventSlice = createSlice({
|
|||||||
|
|
||||||
export const {
|
export const {
|
||||||
setCourseFlag,
|
setCourseFlag,
|
||||||
|
setEventStatus,
|
||||||
refreshRunningOrder,
|
refreshRunningOrder,
|
||||||
increaseDistance,
|
increaseDistance,
|
||||||
awardFastestLap,
|
awardFastestLap,
|
||||||
|
|||||||
@@ -77,6 +77,7 @@ export interface Event {
|
|||||||
eventMode: EventMode;
|
eventMode: EventMode;
|
||||||
eventProgress: EventProgress;
|
eventProgress: EventProgress;
|
||||||
grid: Grid;
|
grid: Grid;
|
||||||
|
sortedGridSpots: GridSpot[];
|
||||||
lastUpdate: number;
|
lastUpdate: number;
|
||||||
}
|
}
|
||||||
export interface EventProgress {
|
export interface EventProgress {
|
||||||
|
|||||||
+17
-1
@@ -1,4 +1,4 @@
|
|||||||
import { Car, Grid } from "../types/state";
|
import { Car, CarStatus, Grid } from "../types/state";
|
||||||
|
|
||||||
import { Meters } from "../types/util";
|
import { Meters } from "../types/util";
|
||||||
|
|
||||||
@@ -41,3 +41,19 @@ export function driverToGridMap(grid: Grid) {
|
|||||||
});
|
});
|
||||||
return gridMap;
|
return gridMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Adds distance to the cars that are out of the race.
|
||||||
|
function outPosition(status: CarStatus) {
|
||||||
|
if (status === CarStatus.Retired) {
|
||||||
|
return -1000000;
|
||||||
|
} else if (status === CarStatus.DidNotStart) {
|
||||||
|
return -2000000;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function sortCarPosition(a: Car, b: Car): number {
|
||||||
|
return (b.distance + outPosition(b.status))
|
||||||
|
- (a.distance + outPosition(a.status));
|
||||||
|
}
|
||||||
@@ -8105,6 +8105,14 @@ rollup@^2.43.1:
|
|||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
fsevents "~2.3.2"
|
fsevents "~2.3.2"
|
||||||
|
|
||||||
|
rooks@^5.10.3:
|
||||||
|
version "5.10.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/rooks/-/rooks-5.10.3.tgz#d302404226de16ed7d451cee3de0f73801745084"
|
||||||
|
integrity sha512-Xnu6WM6bND67jIAaukEXu+US+mQ8JZMCF7db2v987qzprGZSjOUUDrOuMrWpi/0JXQtQl2fKTseBUtAS+pNxZQ==
|
||||||
|
dependencies:
|
||||||
|
lodash.debounce "^4.0.8"
|
||||||
|
raf "^3.4.1"
|
||||||
|
|
||||||
run-parallel@^1.1.9:
|
run-parallel@^1.1.9:
|
||||||
version "1.2.0"
|
version "1.2.0"
|
||||||
resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
|
resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
|
||||||
|
|||||||
Reference in new issue
Block a user