diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx index 018fd23..ee438c9 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx @@ -1,11 +1,19 @@ +import { useEffect, useState } from "react"; import { useSelector } from "react-redux"; import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; import { eventSelector } from "../../../../features/event/eventSelector"; -import { BGTimingTowerModes, Car, CarNotice, CarStatus } from "../../../../types/state"; +import { theme } from "../../../../shared/theme"; +import { + BGTimingTowerDisplayModes, + BGTimingTowerSplitsMode, + Car, + CarNotice, + CarStatus, +} from "../../../../types/state"; import { Fraction } from "../../../../types/style"; import { orMatch } from "../../../../utils/common"; -import { timeDiff } from "../../../../utils/event"; +import { getCarAtPos, timeDiff } from "../../../../utils/event"; import { formatTime } from "../../../../utils/styling"; import { PositionFlag } from "../../Common/PositionFlag"; @@ -14,7 +22,7 @@ import { TeamGem } from "../../Common/TeamGem"; import { DriverName, FastestLapGem, - RowContainer, + AnimatedRowContainer, RowLeftHalf, RowLeftHalfGemContainer, RowLeftHalfLayout, @@ -24,72 +32,72 @@ import { TimeDiff, } from "./styles"; -type TimingTowerProps = { - carsToDisplay?: number, -} -export function TimingTower({ - carsToDisplay = 20, -}: TimingTowerProps) { - const { grid, trackLength, leaderGridSpot } = useSelector(eventSelector); - const { timingBoard } = useSelector(broadcastGraphicsSelector); +export function TimingTower() { - const runningCars: Car[] = []; - const retiredCars: Car[] = []; + const { lastUpdate, grid, trackLength, leaderGridSpot } = useSelector(eventSelector); + const { timingBoard: { timingTower }, timingBoard: { timingTower: { splitsMode } } } = useSelector( + broadcastGraphicsSelector, + ); - grid.forEach((car, index) => { - if (index >= carsToDisplay || car.status === CarStatus.DidNotStart) return; - if (car.status === CarStatus.Retired) { - retiredCars.push(car); - } else { - runningCars.push(car); - } - }); + const [retiredCarsPresent, setRetiredCarsPresent] = useState(0); + const [rows, setRows] = useState([]); + + useEffect(() => { + let anyRetired = 0; + + setRows(grid.map((car, index, cars) => { + if (car.status === CarStatus.Retired) { + ++anyRetired; + } + return buildRow(car, index, cars.length); + })); + setRetiredCarsPresent(anyRetired); + }, [lastUpdate, splitsMode]); - let forwardCarDistance = -1; const buildRow = ( car: Car, index: number, count: number, ) => { - const firstRow = index === 0; const lastRow = index + 1 === count; let rightHalfContent = ""; let xScale: Fraction = 1.0; let yScale: Fraction = 1.0; - let isLeader = false; - if (forwardCarDistance === -1) { - isLeader = true; - forwardCarDistance = car.distance; - } - if (isLeader) { - rightHalfContent = timingBoard.timingTower.mode === BGTimingTowerModes.Leader - ? "Leader" : timingBoard.timingTower.mode === BGTimingTowerModes.Interval + if (index === leaderGridSpot) { + // Leading car shows "Leader" or "Interval". + rightHalfContent = splitsMode === BGTimingTowerSplitsMode.Leader + ? "Leader" : splitsMode === BGTimingTowerSplitsMode.Interval ? "Interval" : ""; } else if (car.status === CarStatus.Retired) { + // Retired car shows "OUT". rightHalfContent = "OUT"; } else { - const plusLaps = Math.floor((grid[leaderGridSpot].distance - car.distance) / trackLength); + // Other cars show gaps. + const deltaCar = getCarAtPos( + grid, + splitsMode === BGTimingTowerSplitsMode.Leader ? 1 : car.position - 1, + ); + + const plusLaps = Math.floor((deltaCar.distance - car.distance) / trackLength); + rightHalfContent = - timingBoard.timingTower.mode === BGTimingTowerModes.Leader && plusLaps > 0 + splitsMode === BGTimingTowerSplitsMode.Leader && plusLaps > 0 ? `+${plusLaps} LAP${plusLaps > 1 ? "S" : ""}` - : `+${formatTime(timeDiff(forwardCarDistance, car.distance), 60)}`; + : `+${formatTime(timeDiff(deltaCar.distance, car.distance), 60)}`; + xScale = rightHalfContent.includes(":") ? 0.75 : 0.9; yScale = rightHalfContent.includes("+") ? 1.1 : 1.0; } - if (timingBoard.timingTower.mode === BGTimingTowerModes.Interval) { - forwardCarDistance = car.distance; - } - return ( - {car.notices.includes(CarNotice.FastestLap) && ( @@ -97,9 +105,9 @@ export function TimingTower({ @@ -107,7 +115,7 @@ export function TimingTower({ {car.status !== CarStatus.Retired && ( )} @@ -126,9 +134,9 @@ export function TimingTower({ } roundedCornerBottom={ lastRow && orMatch( - timingBoard.timingTower.mode, - BGTimingTowerModes.Leader, - BGTimingTowerModes.Interval, + timingTower.splitsMode, + BGTimingTowerSplitsMode.Leader, + BGTimingTowerSplitsMode.Interval, ) ? 5 : undefined } > @@ -138,16 +146,12 @@ export function TimingTower({ - + ); }; - - const rows = runningCars.map((car, index, cars) => buildRow(car, index, cars.length)); - rows.push(...retiredCars.map((car, index, cars) => buildRow(car, index, cars.length))); - return ( - + {rows} ); diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts index e31b7bf..513df0a 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts @@ -1,35 +1,51 @@ import styled, { css } from "styled-components"; +import { animated } from "@react-spring/web"; import { Fraction, Px } from "../../../../types/style"; -export const RowsContainer = styled.div` -display: flex; -flex-direction: column; +import fastestLapIcon from "../../../../public/images/icons/fastest-lap.svg"; -flex-wrap: nowrap; +type RowsContainerProps = { + carsToDisplay: number, + retiredCarsPresent: boolean, +}; +export const RowsContainer = styled.div` + position: relative; -justify-content: flex-start; -align-items: stretch; + width: ${p => + p.theme.design.timingTower.rowLeftHalfWidthPx + + p.theme.design.timingTower.rowRightHalfWidthPx}px; + height: ${({ theme, carsToDisplay, retiredCarsPresent }) => + theme.design.timingTower.rowHeightPx * carsToDisplay + (retiredCarsPresent ? 3 : 0)}px; + + overflow-y: clip; // hidden doesn't work for some reason. `; RowsContainer.displayName = "RowsContainer"; -type RowContainerProps = { - topGap?: boolean, - bottomGap?: boolean, +type AnimatedRowContainerProps = { retired?: boolean, wide?: boolean, -} + top: Px, +}; // All the elements in a row should go in here. -export const RowContainer = styled.div` - position: relative; +export const AnimatedRowContainer = animated(styled.div.attrs(({ + top, + retired, +}) => ({ + style: { + top: `${top + (retired ? 3 : 0)}px`, + }, +}))` + position: absolute; + left: 0; + transition: top 500ms; + width: ${({ wide }) => wide ? 255 : 147}px; height: ${p => p.theme.design.timingTower.rowHeightPx}px; // Future will be animated. - ${({ topGap }) => topGap && css`margin-top: 3px;`} - ${({ bottomGap }) => bottomGap && css`margin-bottom: 3px;`} ${({ retired }) => retired && css`opacity: 0.7;`} -`; -RowContainer.displayName = "RowContainer"; +`); +AnimatedRowContainer.displayName = "AnimatedRowContainer"; type RoundedProp = { roundedCornerTop?: Px, @@ -47,7 +63,7 @@ export const RowLeftHalf = styled(Rounded)` left: 0; top: 0; - width: 147px; // Future will be animated. + width: ${p => p.theme.design.timingTower.rowLeftHalfWidthPx}px; // Future will be animated. height: ${p => p.theme.design.timingTower.rowHeightPx}px; background-color: #000000e5 @@ -80,7 +96,7 @@ export const RowRightHalf = styled(Rounded)` right: 0; top: 0; - width: 108px; // Future will be animated. + width: ${p => p.theme.design.timingTower.rowRightHalfWidthPx}px; // Future will be animated. height: ${p => p.theme.design.timingTower.rowHeightPx}px; overflow-x: hidden; @@ -126,7 +142,6 @@ export const TimeDiff = styled.span` `; TimeDiff.displayName = "TimeDiff"; -import fastestLapIcon from "../../../../public/images/icons/fastest-lap.svg"; export const FastestLapGem = styled.div` position: absolute; diff --git a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx new file mode 100644 index 0000000..d949e4e --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx @@ -0,0 +1,39 @@ +import { InlineCluster } from "@bedrock-layout/inline-cluster"; +import { useDispatch, useSelector } from "react-redux"; +import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; +import { setTimingTowerSplitsMode } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; + +import { refreshRunningOrder } from "../../../../features/event/eventSlice"; +import { BGTimingTowerSplitsMode } from "../../../../types/state"; + +import { ClickSpan } from "./styles"; + +export function TimingTowerPrototypeControls() { + const dispatch = useDispatch(); + const { timingBoard: { timingTower: { splitsMode } } } = useSelector(broadcastGraphicsSelector); + + return ( + + { + console.log("refreshRunningOrder"); + dispatch(refreshRunningOrder()); + }} + > + Refresh Running Order + + { + console.log("Swap Interval"); + if (splitsMode === BGTimingTowerSplitsMode.Interval) { + dispatch(setTimingTowerSplitsMode(BGTimingTowerSplitsMode.Leader)); + } else { + dispatch(setTimingTowerSplitsMode(BGTimingTowerSplitsMode.Interval)); + } + }} + > + Splits Mode = {BGTimingTowerSplitsMode[splitsMode]} + + + ); +} diff --git a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/index.ts b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/index.ts new file mode 100644 index 0000000..957fa28 --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/index.ts @@ -0,0 +1 @@ +export * from "./TimingTowerPrototypeControls"; diff --git a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/styles.ts b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/styles.ts new file mode 100644 index 0000000..886a9ad --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/styles.ts @@ -0,0 +1,7 @@ +import styled from "styled-components"; + +export const ClickSpan = styled.span` + font-family: ${p => p.theme.fonts.f1Bold}; + font-size: 0.9em; + cursor: pointer; +`; diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx index c593be6..4788fd4 100644 --- a/src/components/Workspaces/WorkspacesRoute.tsx +++ b/src/components/Workspaces/WorkspacesRoute.tsx @@ -19,6 +19,7 @@ import { ChyronContainer } from "../BroadcastGraphics/Chyrons/Container"; import { VenetianBlindsWorkspace } from "./CustomWorkSpaces/VenetianBlindsWorkspace"; import { VenetianBlindsPrototypeControls } from "./PrototypingControls/VenetianBlindsPrototype"; import { TimingTower } from "../BroadcastGraphics/TimingBoard/TimingTower"; +import { TimingTowerPrototypeControls } from "./PrototypingControls/TimingTowerPrototype"; const WORKSPACE_LIST_WIDTH = 180; @@ -90,22 +91,14 @@ export default function Workspaces() { prototypeControls={} /> } /> - } - prototypeControls={
Timing Tower Full
} + prototypeControls={} bleedover={500} /> } /> - } - prototypeControls={
Timing Tower Short
} - bleedover={250} - /> - } /> Unknown Workspace} /> diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts index 821fdda..7c2be15 100644 --- a/src/domain/data/workspaces.ts +++ b/src/domain/data/workspaces.ts @@ -84,26 +84,17 @@ export const workspaces: WorkspaceObject = { height: 500, }, }, - timingBoardFull: { - name: "Timing Board (Full)", + timingBoard: { + name: "Timing Board", overlayIds: [ "timing-board-leader-19.png", "timing-board-leader-20-out-1.png", "timing-board-intervals-yellow-flag.png", + "timing-board-portrait-gap.png", ], previewWindowDimensions: { width: 700, height: 900, }, }, - timingBoardShort: { - name: "Timing Board (Short)", - overlayIds: [ - "timing-board-portrait-gap.png", - ], - previewWindowDimensions: { - width: 700, - height: 450, - }, - }, }; diff --git a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts index a11b5da..07ff80a 100644 --- a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts +++ b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts @@ -3,8 +3,9 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit"; import { BGChyrons, BGStatusIndicatorModes, + BGTimingTowerDisplayModes, BGTimingTowerFocusedCarsMode, - BGTimingTowerModes, + BGTimingTowerSplitsMode, OpenState, RootState, } from "../../../types/state"; @@ -19,7 +20,8 @@ const initialState: RootState["broadcastGraphics"] = { }, timingTower: { open: 1, - mode: BGTimingTowerModes.Leader, + displayMode: BGTimingTowerDisplayModes.LeftAndRight, + splitsMode: BGTimingTowerSplitsMode.Leader, focusedCars: [], focusedCarsMode: BGTimingTowerFocusedCarsMode.None, }, @@ -52,6 +54,11 @@ export const broadcastGraphicsSlice = createSlice({ clearChyrons: (state) => { state.chyrons = null; }, + + // Timing Board + setTimingTowerSplitsMode: (state, action: PayloadAction) => { + state.timingBoard.timingTower.splitsMode = action.payload; + }, }, }); @@ -60,5 +67,6 @@ export const { setChyronsOpenState, incrementChyronsOpenState, clearChyrons, + setTimingTowerSplitsMode, } = broadcastGraphicsSlice.actions; export default broadcastGraphicsSlice.reducer; diff --git a/src/features/event/eventSlice.ts b/src/features/event/eventSlice.ts index 6897616..bda64a6 100644 --- a/src/features/event/eventSlice.ts +++ b/src/features/event/eventSlice.ts @@ -188,6 +188,7 @@ const initialState: RootState["event"] = { driver: cloneDriver("mazepin"), }, ], + lastUpdate: Date.now(), }; export const eventSlice = createSlice({ @@ -196,23 +197,32 @@ export const eventSlice = createSlice({ reducers: { setCourseFlag: (state, action: PayloadAction) => { state.courseStatus.courseFlag = action.payload; + state.lastUpdate = Date.now(); }, - calculateLeader: (state) => { - let leader = 0; - let greatestDistance = Number.MIN_SAFE_INTEGER; - for (let p = 0; p < state.grid.length; ++p) { - if (state.grid[p].distance > greatestDistance) { - leader = p; - greatestDistance = state.grid[p].distance; - } - } - state.leaderGridSpot = leader; + refreshRunningOrder: (state) => { + const sortingGrid = state.grid.map((car, index) => ({ + gridSpot: index, + distance: car.distance, + status: car.status, + })); + + sortingGrid.sort((a, b) => + // Retired cars go to the end but still maintain their own order. + (b.distance - (b.status === CarStatus.Retired ? 1000000 : 0)) + - (a.distance - (a.status === CarStatus.Retired ? 1000000 : 0)), + ); + + sortingGrid.forEach((entry, sortedPosition) => { + state.grid[entry.gridSpot].position = sortedPosition + 1; + }); + state.leaderGridSpot = sortingGrid[0].gridSpot; + state.lastUpdate = Date.now(); }, }, }); export const { setCourseFlag, - calculateLeader, + refreshRunningOrder, } = eventSlice.actions; export default eventSlice.reducer; diff --git a/src/shared/theme.ts b/src/shared/theme.ts index 6e18a0e..cd6625c 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -66,6 +66,9 @@ export const theme = { design: { timingTower: { rowHeightPx: 36.5, + rowLeftHalfWidthPx: 147, + rowRightHalfWidthPx: 108, + retiredTopGapPx: 3, }, button: { borderRadius: "0.25rem", diff --git a/src/types/state.ts b/src/types/state.ts index 6bc920c..97a1a1b 100644 --- a/src/types/state.ts +++ b/src/types/state.ts @@ -76,6 +76,8 @@ export interface Event { progress: EventProgress; leaderGridSpot: GridSpot; grid: Grid; + // gridPositions: GridSpot[]; + lastUpdate: number; } export interface EventProgress { startTime: Milliseconds; @@ -280,16 +282,20 @@ export enum BGStatusIndicatorModes { // Timing Tower export interface BGTimingTower { open: OpenState; - mode: BGTimingTowerModes; + displayMode: BGTimingTowerDisplayModes; + splitsMode: BGTimingTowerSplitsMode, focusedCars: Car[], focusedCarsMode: BGTimingTowerFocusedCarsMode, } -export enum BGTimingTowerModes { - Hidden, // Not on display. - Minimum, // Just the driver name abbrv. +export enum BGTimingTowerDisplayModes { + Hidden, + LeftOnly, + LeftAndRight, + FullLeft, +} +export enum BGTimingTowerSplitsMode { Leader, // Leader timing. Interval, // Interval timing. - FullName, // Displays full name. } export enum BGTimingTowerFocusedCarsMode { None, // When no special treatments are made. diff --git a/src/utils/event.ts b/src/utils/event.ts index 834fde9..6208d66 100644 --- a/src/utils/event.ts +++ b/src/utils/event.ts @@ -1,4 +1,5 @@ import { random } from "lodash"; +import { Car, Grid } from "../types/state"; import { Meters } from "../types/util"; @@ -14,3 +15,15 @@ export function timeDiff( return random(0.95, 1.05) * ((front - back) / 61.015); } + + +export function getCarAtPos( + grid: Grid, + targetPosition: number, +): Car { + const foundCar = grid.find(car => car.position === targetPosition); + if (!foundCar) { + return grid[0]; + } + return foundCar; +}