diff --git a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/StatusIndicator.tsx b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/StatusIndicator.tsx index 96453ac..a9e2364 100644 --- a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/StatusIndicator.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/StatusIndicator.tsx @@ -1,14 +1,18 @@ import { useSelector } from "react-redux"; import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; +import { eventSelector } from "../../../../features/event/eventSelector"; import { theme } from "../../../../shared/theme"; import { BGStatusIndicatorModes } from "../../../../types/state"; -import { DebugDurationProps } from "../../../../types/style"; +import { DebugDurationProps, TransitionArgs } from "../../../../types/style"; +import { orMatch } from "../../../../utils/common"; -import { StatusIndicatorBase } from "./styles"; +import { LapCount, LapLabel, LapLine, StatusIndicatorBase, StatusIndicatorLayout } from "./styles"; type StatusIndicatorProps = DebugDurationProps; + + export function StatusIndicator({ debugDurationMultiplier: DDM = 1.0, }: StatusIndicatorProps) { @@ -16,19 +20,56 @@ export function StatusIndicator({ const { timingBoard: { statusIndicator: { mode } } } = useSelector(broadcastGraphicsSelector); + const { progress: { scheduledLaps, lapCount } } = useSelector(eventSelector); + + const toWideTransition: TransitionArgs[] = [{ + property: "all", + duration: ttTheme.fullWidthDurationMs * DDM, + }]; + const toNarrowTransition: TransitionArgs[] = [{ + property: "all", + duration: ttTheme.fullWidthDurationMs * DDM, + delay: ttTheme.fullWidthCloseDelayMs * DDM, + }]; return ( + transitionOpeningProps={toWideTransition} + transitionClosingProps={toNarrowTransition} + > + + {orMatch(mode, BGStatusIndicatorModes.LapNarrow, BGStatusIndicatorModes.LapWide) && ( + <> + + + LAP + + {lapCount} / {scheduledLaps} + + + )} + + ); } diff --git a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts index 4c3229c..55354ea 100644 --- a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts @@ -1,4 +1,5 @@ import styled from "styled-components"; +import { BGStatusIndicatorModes } from "../../../../types/state"; import { DirectionalTransitionProps } from "../../../../types/style"; import { commonDirectionalTransition } from "../../../../utils/styling"; @@ -15,3 +16,105 @@ export const StatusIndicatorBase = styled.div` commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; StatusIndicatorBase.displayName = "StatusIndicatorBase"; + + +export const StatusIndicatorLayout = styled.div` + position: relative; + width: 100%; + height: 100%; +`; +StatusIndicatorLayout.displayName = "StatusIndicatorLayout"; + +type IndicatorModeProps = { + mode: BGStatusIndicatorModes, +}; + + +////// Lap Indicator Mode Styles ////// +type LapLineProps = DirectionalTransitionProps & IndicatorModeProps; +export const LapLine = styled.div` + position: absolute; + top: ${({ mode }) => + mode === BGStatusIndicatorModes.LapNarrow + ? 33 : mode === BGStatusIndicatorModes.LapWide ? 5 : 0}px; + left: ${({ mode }) => + mode === BGStatusIndicatorModes.LapNarrow + ? 30 : mode === BGStatusIndicatorModes.LapWide ? 128 : 0}px; + + opacity: ${({ open }) => open ? 1 : 0}; + + width: ${({ mode, open }) => + mode === BGStatusIndicatorModes.LapNarrow + ? (90 * (open ? 1 : 0.3)) : mode === BGStatusIndicatorModes.LapWide ? 3 : 0}px; + height: ${({ mode, open }) => + mode === BGStatusIndicatorModes.LapNarrow + ? 3 : mode === BGStatusIndicatorModes.LapWide ? (60 * (open ? 1 : 0.3)) : 0}px; + + background-color: ${p => p.theme.colors.textWhite}; + border: 1px solid ${p => p.theme.colors.dimGrey}; + mask-image: linear-gradient( + to ${({ mode }) => mode === BGStatusIndicatorModes.LapNarrow ? "left" : "bottom"}, + transparent 0, + #000000cc 40%, + #000000cc 50%, + #000000cc 60%, + transparent 100% + ); + + ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => + commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} +`; +LapLine.displayName = "LapLine"; + + +type LapLabelProps = DirectionalTransitionProps & IndicatorModeProps; +export const LapLabel = styled.span` + position: absolute; + top: ${({ mode }) => + mode === BGStatusIndicatorModes.LapNarrow + ? 6 : mode === BGStatusIndicatorModes.LapWide ? 22 : 0}px; + left: ${({ mode }) => + mode === BGStatusIndicatorModes.LapNarrow + ? 33 : mode === BGStatusIndicatorModes.LapWide ? 25 : 0}px; + + font-family: ${p => p.theme.fonts.f1Wide}; + font-size: ${p => p.theme.fontSizes.indicatorLapLabel}; + color: ${p => p.theme.colors.textWhite}; + + ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => + commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} +`; +LapLabel.displayName = "LapLabel"; + + +type LapCountProps = DirectionalTransitionProps & IndicatorModeProps; +export const LapCount = styled.div` + position: absolute; + top: ${({ mode }) => + mode === BGStatusIndicatorModes.LapNarrow + ? 41 : mode === BGStatusIndicatorModes.LapWide ? 24 : 0}px; + left: ${({ mode }) => + mode === BGStatusIndicatorModes.LapNarrow + ? 72 : mode === BGStatusIndicatorModes.LapWide ? 185 : 0}px; + + display: flex; + justify-content: center; + align-items: center; + + width: 0; + height: ${p => p.theme.fontSizes.indicatorLapCount}; + overflow-y: clip; + + > span { + font-family: ${p => p.theme.fonts.f1Regular}; + font-size: ${p => p.theme.fontSizes.indicatorLapCount}; + color: ${p => p.theme.colors.textWhite}; + + font-feature-settings: 'tnum' 1; + white-space: nowrap; + } + + ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => + commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} +`; +LapCount.displayName = "LapCount"; diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts index 4db4e76..ed1a6f5 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts @@ -206,7 +206,7 @@ export const DriverName = styled.span` top: 0; left: 0; - color: white; + color: ${p => p.theme.colors.textWhite}; font-family: ${p => p.theme.fonts.f1Bold}; font-size: 20px; text-transform: uppercase; @@ -218,8 +218,6 @@ export const DriverName = styled.span` DriverName.displayName = "DriverName"; export const DriverNameWipe = styled.div` - /* background: #deadbe; */ - width: ${({ open }) => open ? 800 : 200}px; height: ${p => p.theme.design.timingTower.rowHeightPx}px; @@ -237,7 +235,7 @@ type TimeDiffProps = DirectionalTransitionProps & { yScale: Fraction, }; export const TimeDiff = styled.span` - color: white; + color: ${p => p.theme.colors.textWhite}; font-family: ${p => p.theme.fonts.f1Regular}; font-size: 20px; diff --git a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx index bbc74f7..ab8bcc9 100644 --- a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/TimingTowerPrototypeControls.tsx @@ -55,6 +55,19 @@ export function TimingTowerPrototypeControls() { > +100m performance to all + { + dispatch(increaseDistance({ + cars: grid, + distance: 1000, + randomness: 0.05, + usePerformance: true, + })); + dispatch(refreshRunningOrder()); + }} + > + +1000m performance to all + { dispatch(setCarStatus({ diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts index 7c2be15..d7a2523 100644 --- a/src/domain/data/workspaces.ts +++ b/src/domain/data/workspaces.ts @@ -91,6 +91,7 @@ export const workspaces: WorkspaceObject = { "timing-board-leader-20-out-1.png", "timing-board-intervals-yellow-flag.png", "timing-board-portrait-gap.png", + "timing-board-fastest-lap-wide.png", ], previewWindowDimensions: { width: 700, diff --git a/src/features/event/eventSlice.ts b/src/features/event/eventSlice.ts index 90c3c0a..65a691c 100644 --- a/src/features/event/eventSlice.ts +++ b/src/features/event/eventSlice.ts @@ -41,7 +41,8 @@ const initialState: RootState["event"] = { progress: { startTime: Date.now(), timeLimit: 60 * 60 * 2 * 1000, - lapCount: 44, + lapCount: 1, + scheduledLaps: 44, }, leaderGridSpot: 0, grid: [ diff --git a/src/public/images/overlays/timing-board-fastest-lap-wide.png b/src/public/images/overlays/timing-board-fastest-lap-wide.png new file mode 100644 index 0000000..b02b491 Binary files /dev/null and b/src/public/images/overlays/timing-board-fastest-lap-wide.png differ diff --git a/src/shared/theme.ts b/src/shared/theme.ts index 437f3ee..b6f91ee 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -24,8 +24,10 @@ export const theme = { lightGrey: "#ddd", faintGrey: "#eee", darkGrey: "#303030", + dimGrey: "#999", videoFrameBG: "#333", positionFlagBG: "#f4f3ee", + textWhite: "#f1f1f1", // I found it to be #f2f2f2 but whatever teams: { // 2021 Season alfaRomeo: "#900000", alphaTauri: "#2b4562", @@ -65,6 +67,8 @@ export const theme = { fontSizes: { label: "0.9em", selector: "0.9em", + indicatorLapLabel: "1.2em", + indicatorLapCount: "1.5em", }, design: { statusIndicator: { diff --git a/src/types/state.ts b/src/types/state.ts index 296aef6..ad83a28 100644 --- a/src/types/state.ts +++ b/src/types/state.ts @@ -83,6 +83,7 @@ export interface EventProgress { startTime: Milliseconds; timeLimit: Milliseconds; lapCount: number; + scheduledLaps: number; } export enum EventMode { Race,