Merge pull request #81 from TiE23/ISSUE-080

Issue 080
This commit is contained in:
Kyle Geib authored and GitHub committed 2022-03-23 15:03:56 -04:00
commit 5775278b52
14 files changed
+167 -39

No files matched your search

+1
View File
@@ -43,6 +43,7 @@
"react-scripts": "5.0.0",
"react-use-measure": "^2.1.1",
"resize-observer-polyfill": "^1.5.1",
"rooks": "^5.10.3",
"styled-components": "^5.3.3",
"typescript": "^4.4.2",
"web-vitals": "^2.1.0"
+2
View File
@@ -8,6 +8,7 @@ import {
import { MainMenu } from "./components/Menu";
import { useDispatch } from "react-redux";
import { useEffect } from "react";
import { EventLoop } from "./components/Broadcast/RaceDirectorUI/EventLoop/EventLoop";
function App() {
const dispatch = useDispatch();
@@ -40,6 +41,7 @@ function App() {
<div className="App" ref={appRef}>
<MainMenu ref={mainMenuRef} />
<Outlet />
<EventLoop />
</div>
);
}
+2 -3
View File
@@ -5,6 +5,7 @@ import { MockupBlock } from "../../Common/MockupBlock.styled";
import { LayoutGrid, LayoutGridItem } from "../../Common/LayoutGrid.styled";
import { TimingTowerPrototypeControls } from "../../Workspaces/PrototypingControls/TimingTowerPrototype";
import { ChyronsDirectorControls } from "../BroadcastDirectorUI/Chyrons";
import { RaceDirectorControls } from "../RaceDirectorUI/EventLoop/RaceDirectorControls";
type LayoutProps = {
headerHeight?: number,
@@ -31,9 +32,7 @@ export function Layout({ headerHeight }: LayoutProps) {
</LayoutGridItem>
<LayoutGridItem column={1} row={10}>
<MockupBlock
color="#bc62ce"
>Race Director UI</MockupBlock>
<RaceDirectorControls />
</LayoutGridItem>
<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;
}
@@ -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``;
@@ -20,7 +20,7 @@ export function StatusIndicator({
const { timingBoard: { statusIndicator: { mode } } } =
useSelector(broadcastGraphicsSelector);
const { progress: { scheduledLaps, lapCount } } = useSelector(eventSelector);
const { eventProgress: { scheduledLaps, lapCount } } = useSelector(eventSelector);
const toWideTransition: TransitionArgs[] = [{
property: "all",
@@ -3,16 +3,16 @@ import { PadBox } from "@bedrock-layout/padbox";
import { Split } from "@bedrock-layout/split";
import { Stack } from "@bedrock-layout/stack";
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 { setTimingTowerDisplayMode, setTimingTowerSplitsMode } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
import { eventSelector } from "../../../../features/event/eventSelector";
import { setTimingTowerDisplayMode, setTimingTowerSplitsMode } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
import { awardFastestLap, increaseDistance, refreshRunningOrder, setCarStatus } from "../../../../features/event/eventSlice";
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() {
const dispatch = useDispatch();
@@ -113,18 +113,18 @@ export function TimingTowerPrototypeControls() {
>
Splits Mode = {BGTimingTowerSplitsMode[splitsMode]}
</ClickSpan>
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.LeftAndRight))}>
{(displayMode === BGTimingTowerDisplayMode.LeftAndRight ? "*" : "") + "LeftAndRight"}
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.Hidden))}>
{(displayMode === BGTimingTowerDisplayMode.Hidden ? "*" : "") + "Hidden"}
</ClickSpan>
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.LeftOnly))}>
{(displayMode === BGTimingTowerDisplayMode.LeftOnly ? "*" : "") + "LeftOnly"}
</ClickSpan>
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.LeftAndRight))}>
{(displayMode === BGTimingTowerDisplayMode.LeftAndRight ? "*" : "") + "LeftAndRight"}
</ClickSpan>
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.FullLeft))}>
{(displayMode === BGTimingTowerDisplayMode.FullLeft ? "*" : "") + "FullLeft"}
</ClickSpan>
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.Hidden))}>
{(displayMode === BGTimingTowerDisplayMode.Hidden ? "*" : "") + "Hidden"}
</ClickSpan>
</InlineCluster>
</PadBox>
+41 -22
View File
@@ -13,11 +13,13 @@ import {
SafetyCarStatus,
VirtualSafetyCarStatus,
GridSpot,
EventStatus,
Car,
} from "../../types/state";
import { Meters } from "../../types/util";
import { orMatch } from "../../utils/common";
import { cloneDriver, getTeam } from "../../utils/dataLookup";
import { driverToGridMap } from "../../utils/event";
import { driverToGridMap, sortCarPosition } from "../../utils/event";
const DEFAULT_TYRE: Tyre = {
compound: TyreCompound.Medium,
@@ -31,20 +33,21 @@ const POLE_TO_START: Meters = -10;
const initialState: RootState["event"] = {
trackName: "Circuit de Spa-Franchorchamps",
trackLength: 7004,
trackStartFinishDelta: -124,
courseStatus: {
courseFlag: CourseFlag.Green,
sectorFlags: [SectorFlag.Green, SectorFlag.Green, SectorFlag.Green],
safetyCar: SafetyCarStatus.Clear,
virtualSafetyCar: VirtualSafetyCarStatus.Clear,
},
mode: EventMode.Race,
progress: {
eventStatus: EventStatus.Waiting,
eventMode: EventMode.Race,
eventProgress: {
startTime: Date.now(),
timeLimit: 60 * 60 * 2 * 1000,
lapCount: 1,
scheduledLaps: 44,
},
leaderGridSpot: 0,
grid: [
{
position: 1,
@@ -207,6 +210,7 @@ const initialState: RootState["event"] = {
driver: cloneDriver("mazepin"),
},
],
sortedGridSpots: Array.from(Array(20).keys()),
lastUpdate: Date.now(),
};
@@ -232,35 +236,45 @@ export const eventSlice = createSlice({
reducers: {
setCourseFlag: (state, action: PayloadAction<CourseFlag>) => {
state.courseStatus.courseFlag = action.payload;
state.lastUpdate = Date.now();
},
setEventStatus: (state, action: PayloadAction<EventStatus>) => {
state.eventStatus = action.payload;
state.lastUpdate = Date.now();
},
refreshRunningOrder: (state) => {
const sortingGrid = state.grid.map((car, index) => ({
const sortingGrid = state.grid.map((car, index): Car & {
gridSpot: GridSpot,
} => ({
gridSpot: index,
distance: car.distance,
status: car.status,
...car,
}));
const add = (status: CarStatus) => {
if (status === CarStatus.Retired) {
return 1000000;
} else if (status === CarStatus.DidNotStart) {
return 2000000;
}
return 0;
};
sortingGrid.sort(sortCarPosition);
state.sortedGridSpots = sortingGrid.map(car => car.gridSpot);
sortingGrid.sort((a, b) =>
// Retired cars go to the end but still maintain their own order.
(b.distance - add(b.status)) - (a.distance - add(a.status)),
);
const raceEndDistance = state.trackLength * state.eventProgress.scheduledLaps
+ state.trackStartFinishDelta;
sortingGrid.forEach((entry, sortedPosition) => {
// Don't update positions of cars who have crossed the finish line.
if (entry.distance < raceEndDistance) {
state.grid[entry.gridSpot].position = sortedPosition + 1;
}
});
state.leaderGridSpot = sortingGrid[0].gridSpot;
state.progress.lapCount =
Math.max(1, Math.floor(sortingGrid[0].distance / state.trackLength) + 1);
/**
* Calculate which lap we're on by taking the leader's distance.
* Also must consider the fact that the race distance 0 is at the start
* line, but the race ends at the finish line, which is often (always?)
* behind the start line by some distance.
*/
state.eventProgress.lapCount =
Math.max(1, Math.floor(
(sortingGrid[0].distance - state.trackStartFinishDelta) / state.trackLength,
) + 1);
state.lastUpdate = Date.now();
},
@@ -284,11 +298,13 @@ export const eventSlice = createSlice({
addedDistance *= random(1 - randomness, 1 + randomness);
}
if (usePerformance) {
addedDistance *= 1 - (car.position * 0.005);
addedDistance *=
getTeam(car.driver.team.id).performance + car.driver.performance;
}
state.grid[gridMap[car.driver.id]].distance += addedDistance;
});
state.lastUpdate = Date.now();
},
awardFastestLap: (state, action: PayloadAction<GridSpot>) => {
@@ -305,6 +321,7 @@ export const eventSlice = createSlice({
state.grid[index].notices.splice(fastestLapNoticeIndex, 1);
}
});
state.lastUpdate = Date.now();
},
setCarStatus: (state, action: PayloadAction<SetCarStatusAction>) => {
@@ -314,6 +331,7 @@ export const eventSlice = createSlice({
const car = state.grid[gridSpot];
state.grid[gridMap[car.driver.id]].status = status;
});
state.lastUpdate = Date.now();
},
},
@@ -321,6 +339,7 @@ export const eventSlice = createSlice({
export const {
setCourseFlag,
setEventStatus,
refreshRunningOrder,
increaseDistance,
awardFastestLap,
+11 -3
View File
@@ -71,11 +71,13 @@ export interface OverlayItem {
export interface Event {
trackName: string;
trackLength: Meters;
trackStartFinishDelta: Meters; // Negative if finish behind start line.
courseStatus: CourseStatus;
mode: EventMode;
progress: EventProgress;
leaderGridSpot: GridSpot; // Might be removed.
eventStatus: EventStatus;
eventMode: EventMode;
eventProgress: EventProgress;
grid: Grid;
sortedGridSpots: GridSpot[];
lastUpdate: number;
}
export interface EventProgress {
@@ -84,6 +86,12 @@ export interface EventProgress {
lapCount: number;
scheduledLaps: number;
}
export enum EventStatus {
Waiting, // Event is waiting to start.
Running, // Event is running.
Stopped, // Event has concluded.
Suspended, // Event is suspended (ex: rain delay).
}
export enum EventMode {
Race,
Sprint,
+17 -1
View File
@@ -1,4 +1,4 @@
import { Car, Grid } from "../types/state";
import { Car, CarStatus, Grid } from "../types/state";
import { Meters } from "../types/util";
@@ -41,3 +41,19 @@ export function driverToGridMap(grid: Grid) {
});
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));
}
+8
View File
@@ -8105,6 +8105,14 @@ rollup@^2.43.1:
optionalDependencies:
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:
version "1.2.0"
resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"