diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx
index d001062..be5f22b 100644
--- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx
+++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx
@@ -2,7 +2,7 @@ import { useSpring } from "@react-spring/web";
import { useDispatch } from "react-redux";
import { BGChyronDriver, BGChyronSubMode, OpenState } from "../../../../types/state";
-import { Fraction } from "../../../../types/style";
+import { DebugDurationProps, Fraction } from "../../../../types/style";
import { clearChyrons } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
import { theme } from "../../../../shared/theme";
import { outlineClipPath } from "../../../../utils/styling";
@@ -30,11 +30,10 @@ import {
import { VenetianBlindsTransition } from "../../Common/VenetianBlindsTransition";
import { Spacer } from "../../Common/Spacer.styled";
-type ChyronDriverProps = {
+type ChyronDriverProps = DebugDurationProps & {
chyronData: BGChyronDriver,
subMode: BGChyronSubMode,
openState: OpenState,
- debugDurationMultiplier?: Fraction,
};
export function ChyronDriver({
chyronData,
diff --git a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/StatusIndicator.tsx b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/StatusIndicator.tsx
new file mode 100644
index 0000000..5dce1b6
--- /dev/null
+++ b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/StatusIndicator.tsx
@@ -0,0 +1,21 @@
+import { useSelector } from "react-redux";
+
+import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector";
+import { DebugDurationProps } from "../../../../types/style";
+
+import { StatusIndicatorBase } from "./styles";
+
+type StatusIndicatorProps = DebugDurationProps;
+
+export function StatusIndicator({
+ debugDurationMultiplier: DDM = 1.0,
+}: StatusIndicatorProps) {
+ const { timingBoard: { statusIndicator: { mode } } } =
+ useSelector(broadcastGraphicsSelector);
+
+ return (
+
+ );
+}
diff --git a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/index.ts b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/index.ts
new file mode 100644
index 0000000..957a056
--- /dev/null
+++ b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/index.ts
@@ -0,0 +1 @@
+export * from "./StatusIndicator";
diff --git a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts
new file mode 100644
index 0000000..bf7d4d0
--- /dev/null
+++ b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts
@@ -0,0 +1,22 @@
+import styled, { css } from "styled-components";
+
+import { BGStatusIndicatorModes } from "../../../../types/state";
+
+type StatusIndicatorBaseProps = {
+ mode: BGStatusIndicatorModes,
+};
+export const StatusIndicatorBase = styled.div`
+ background-color: black;
+ border-top-right-radius: ${p => p.theme.design.statusIndicator.roundedCornerRadiusPx}px;
+ height: ${p => p.theme.design.statusIndicator.heightNormalPx}px;
+ width: ${({ theme: { design: { timingTower } }, mode }) => {
+ if (mode === BGStatusIndicatorModes.LapNarrow) {
+ return timingTower.rowLeftHalfWidthPx;
+ }
+ if (mode === BGStatusIndicatorModes.LapWide) {
+ return timingTower.rowLeftHalfWidthPx + timingTower.rowRightHalfWidthPx;
+ }
+ return 10;
+ }}px;
+`;
+StatusIndicatorBase.displayName = "StatusIndicatorBase";
diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingBoard.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingBoard.tsx
index e2cb432..0164ed7 100644
--- a/src/components/BroadcastGraphics/TimingBoard/TimingBoard.tsx
+++ b/src/components/BroadcastGraphics/TimingBoard/TimingBoard.tsx
@@ -1,23 +1,23 @@
import { useSelector } from "react-redux";
import { workspaceSelector } from "../../../features/workspace/workspaceSelector";
-import { theme } from "../../../shared/theme";
import { TimingBoardLayout } from "./styles";
-import { MockupBlock } from "../../Common/MockupBlock.styled";
import { TimingTower } from "./TimingTower";
+import { StatusIndicator } from "./StatusIndicator";
-export function TimingBoard() {
+type TimingBoardProps = {
+ debug?: boolean,
+};
+export function TimingBoard({ debug = false }: TimingBoardProps) {
const { debugDurationMultiplier } = useSelector(workspaceSelector);
return (
-
);
diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx
index e103c31..6ed7051 100644
--- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx
+++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx
@@ -4,14 +4,12 @@ import { useSelector } from "react-redux";
import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector";
import { eventSelector } from "../../../../features/event/eventSelector";
import { BGTimingTowerDisplayMode, CarStatus } from "../../../../types/state";
-import { Fraction } from "../../../../types/style";
+import { DebugDurationProps } from "../../../../types/style";
import { RowsContainer } from "./styles";
import { TimingTowerRow } from "./TimingTowerRow";
-type TimingTowerProps = {
- debugDurationMultiplier?: Fraction,
-};
+type TimingTowerProps = DebugDurationProps;
export function TimingTower({ debugDurationMultiplier: DDM }: TimingTowerProps) {
const { lastUpdate, grid, trackLength } = useSelector(eventSelector);
diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx
index 63b29be..854c499 100644
--- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx
+++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTowerRow.tsx
@@ -7,7 +7,7 @@ import { orMatch } from "../../../../utils/common";
import { getCarAtPos, timeDiff } from "../../../../utils/event";
import { formatTime, outlineClipPath } from "../../../../utils/styling";
-import { Fraction } from "../../../../types/style";
+import { DebugDurationProps, Fraction } from "../../../../types/style";
import { Meters, Milliseconds } from "../../../../types/util";
import {
BGTimingTowerDisplayMode,
@@ -45,7 +45,7 @@ const TRAVEL_DURATION: Milliseconds = 750;
const FULL_WIDTH_DURATION: Milliseconds = 750;
const FULL_WIDTH_CLOSE_DELAY: Milliseconds = 333;
-interface TimingTowerRowProps {
+type TimingTowerRowProps = DebugDurationProps & {
car: Car;
grid: Grid;
startingCarsCount: number;
@@ -53,7 +53,6 @@ interface TimingTowerRowProps {
splitsMode: BGTimingTowerSplitsMode;
displayMode: BGTimingTowerDisplayMode;
trackLength: Meters;
- debugDurationMultiplier?: Fraction,
}
export function TimingTowerRow({
car,
@@ -165,14 +164,14 @@ export function TimingTowerRow({
}
+ previewContent={}
prototypeControls={}
bleedover={500}
showAnimationSpeedSelector
diff --git a/src/features/event/eventSlice.ts b/src/features/event/eventSlice.ts
index eb3ef38..90c3c0a 100644
--- a/src/features/event/eventSlice.ts
+++ b/src/features/event/eventSlice.ts
@@ -26,7 +26,7 @@ const DEFAULT_TYRE: Tyre = {
};
const GRID_POSITION_GAP: Meters = 8;
-const POLE_TO_START: Meters = 10;
+const POLE_TO_START: Meters = -10;
const initialState: RootState["event"] = {
trackName: "Circuit de Spa-Franchorchamps",
@@ -41,8 +41,7 @@ const initialState: RootState["event"] = {
progress: {
startTime: Date.now(),
timeLimit: 60 * 60 * 2 * 1000,
- currentLap: 1,
- lapCount: 10,
+ lapCount: 44,
},
leaderGridSpot: 0,
grid: [
@@ -255,6 +254,9 @@ export const eventSlice = createSlice({
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);
+
state.lastUpdate = Date.now();
},
increaseDistance: (state, action: PayloadAction) => {
diff --git a/src/shared/theme.ts b/src/shared/theme.ts
index 1436d21..cbd4ea7 100644
--- a/src/shared/theme.ts
+++ b/src/shared/theme.ts
@@ -67,6 +67,10 @@ export const theme = {
selector: "0.9em",
},
design: {
+ statusIndicator: {
+ heightNormalPx: 73,
+ roundedCornerRadiusPx: 8,
+ },
timingTower: {
rowHeightPx: 36.5,
rowLeftHalfWidthPx: 147,
@@ -75,6 +79,7 @@ export const theme = {
teamGemSize: 30,
posFlagSize: 32,
nameLeftMargin: 14,
+ rowRoundedCornerRadiusPx: 5,
},
button: {
borderRadius: "0.25rem",
diff --git a/src/types/state.ts b/src/types/state.ts
index 109752b..296aef6 100644
--- a/src/types/state.ts
+++ b/src/types/state.ts
@@ -82,7 +82,6 @@ export interface Event {
export interface EventProgress {
startTime: Milliseconds;
timeLimit: Milliseconds;
- currentLap: number;
lapCount: number;
}
export enum EventMode {
diff --git a/src/types/style.d.ts b/src/types/style.d.ts
index e9b3e97..df78282 100644
--- a/src/types/style.d.ts
+++ b/src/types/style.d.ts
@@ -41,6 +41,9 @@ export interface TransitionArgs {
delay?: Milliseconds,
}
+export type DebugDurationProps = {
+ debugDurationMultiplier?: Fraction,
+};
export type OpenProps = {
open: boolean,
};