ISSUE-058 - Basic mode switching implemented.

Still need to fade-in/fade-out the interval numbers.
Also need to look into wipe-in fade animations for full names. Will see what I can do...
This commit is contained in:
Kyle Geib committed 2022-03-03 18:56:07 -05:00
1 parent 90c8b78a20
commit 1cccc7d094
7 files changed
+158 -44

No files matched your search

@@ -48,7 +48,7 @@ export function TimingTower({ debugDurationMultiplier: DDM }: TimingTowerProps)
trackLength={trackLength} trackLength={trackLength}
debugDurationMultiplier={DDM} debugDurationMultiplier={DDM}
/>)); />));
}, [lastUpdate, splitsMode]); }, [lastUpdate, splitsMode, displayMode]);
return ( return (
<RowsContainer <RowsContainer
@@ -34,12 +34,14 @@ import {
TimeDiff, TimeDiff,
RowLeftHalfPosFlagChangeContainer, RowLeftHalfPosFlagChangeContainer,
AnimatedRowLeftHalfOutline, AnimatedRowLeftHalfOutline,
DriverNameContainer,
} from "./styles"; } from "./styles";
import useMeasure from "react-use-measure"; import useMeasure from "react-use-measure";
const WIPE_DELAY: Milliseconds = 3500; const WIPE_DELAY: Milliseconds = 3500;
const WIPE_DURATION: Milliseconds = 400; const WIPE_DURATION: Milliseconds = 400;
const TRAVEL_DURATION: Milliseconds = 750; const TRAVEL_DURATION: Milliseconds = 750;
const FULL_WIDTH_DURATION: Milliseconds = 750;
interface TimingTowerRowProps { interface TimingTowerRowProps {
car: Car; car: Car;
@@ -63,13 +65,15 @@ export function TimingTowerRow({
}: TimingTowerRowProps) { }: TimingTowerRowProps) {
const [pastPos, setPastPos] = useState(car.position); const [pastPos, setPastPos] = useState(car.position);
const [posChange, setPosChange] = useState(0); const [posChange, setPosChange] = useState(0);
const [pastDisplayMode, setPastDisplayMode] = useState(displayMode);
const [hugRight, setHugRight] = useState(true);
// Using timeouts and boolean states I can manipulate visiblity of the position // Using timeouts and boolean states I can manipulate visiblity of the position
// change effects. wipeVisible is true for only 1ms before being switched back off. // change effects. wipeVisible is true for only 1ms before being switched back off.
const [showPosChange, setshowPosChange] = useState(false); const [showPosChange, setShowPosChange] = useState(false);
const [showOutline, setShowOutline] = useState(false); const [showOutline, setShowOutline] = useState(false);
const [wipeVisible, setWipeVisible] = useState(false); const [wipeVisible, setWipeVisible] = useState(false);
useTimeoutWhen(() => setshowPosChange(false), (WIPE_DELAY + WIPE_DURATION) * DDM, showPosChange); useTimeoutWhen(() => setShowPosChange(false), (WIPE_DELAY + WIPE_DURATION) * DDM, showPosChange);
useTimeoutWhen(() => setShowOutline(false), TRAVEL_DURATION * DDM, showOutline); useTimeoutWhen(() => setShowOutline(false), TRAVEL_DURATION * DDM, showOutline);
useTimeoutWhen(() => setWipeVisible(false), 1, wipeVisible); useTimeoutWhen(() => setWipeVisible(false), 1, wipeVisible);
@@ -77,12 +81,28 @@ export function TimingTowerRow({
if (car.position !== pastPos) { if (car.position !== pastPos) {
setPastPos(car.position); setPastPos(car.position);
setPosChange(pastPos - car.position); setPosChange(pastPos - car.position);
setshowPosChange(true); setShowPosChange(true);
setShowOutline(true); setShowOutline(true);
setWipeVisible(true); setWipeVisible(true);
} }
}, [car.position]); }, [car.position]);
useEffect(() => {
if (pastDisplayMode !== displayMode) {
if ((pastDisplayMode === BGTimingTowerDisplayMode.LeftAndRight
&& displayMode === BGTimingTowerDisplayMode.FullLeft) || (
pastDisplayMode === BGTimingTowerDisplayMode.FullLeft
&& displayMode === BGTimingTowerDisplayMode.LeftAndRight
)
) {
setHugRight(true);
} else {
setHugRight(false);
}
setPastDisplayMode(displayMode);
}
}, [displayMode]);
const { outlineClipPathProgress } = useSpring({ const { outlineClipPathProgress } = useSpring({
outlineClipPathProgress: showPosChange ? 1 : 0, outlineClipPathProgress: showPosChange ? 1 : 0,
config: { duration: 333 * DDM }, config: { duration: 333 * DDM },
@@ -146,7 +166,12 @@ export function TimingTowerRow({
BGTimingTowerDisplayMode.FullLeft, BGTimingTowerDisplayMode.FullLeft,
) ? 5 : undefined ) ? 5 : undefined
} }
transitionTime={TRAVEL_DURATION * DDM} cornerTransitionTime={TRAVEL_DURATION * DDM}
transitionProps={[{
property: "width",
duration: FULL_WIDTH_DURATION * DDM,
}]}
wide={displayMode === BGTimingTowerDisplayMode.FullLeft}
ref={leftHalfRef} ref={leftHalfRef}
> >
<RowLeftHalfLayout> <RowLeftHalfLayout>
@@ -182,12 +207,21 @@ export function TimingTowerRow({
)} )}
</RowLeftHalfPosFlagChangeContainer> </RowLeftHalfPosFlagChangeContainer>
</RowLeftHalfPosFlagContainer> </RowLeftHalfPosFlagContainer>
)} )}
<DriverName> <DriverNameContainer
transitionProps={[{
property: "opacity",
duration: 1000,
}]}
>
<DriverName visible={displayMode !== BGTimingTowerDisplayMode.FullLeft}>
{car.driver.initials} {car.driver.initials}
</DriverName> </DriverName>
<DriverName visible={displayMode === BGTimingTowerDisplayMode.FullLeft}>
{car.driver.lastName}
</DriverName>
</DriverNameContainer>
</RowLeftHalfLayout> </RowLeftHalfLayout>
<RowLeftHalfGemContainer> <RowLeftHalfGemContainer>
<TeamGem team={car.driver.team.id} height={30} /> <TeamGem team={car.driver.team.id} height={30} />
@@ -231,7 +265,13 @@ export function TimingTowerRow({
BGTimingTowerSplitsMode.Interval, BGTimingTowerSplitsMode.Interval,
) ? 5 : undefined ) ? 5 : undefined
} }
transitionTime={TRAVEL_DURATION * DDM} cornerTransitionTime={TRAVEL_DURATION * DDM}
collapsed={displayMode !== BGTimingTowerDisplayMode.LeftAndRight}
transitionProps={[{
property: "width",
duration: FULL_WIDTH_DURATION * DDM,
}]}
hugRight={hugRight}
> >
<RowRightHalfLayout> <RowRightHalfLayout>
<TimeDiff xScale={xScale} yScale={yScale}> <TimeDiff xScale={xScale} yScale={yScale}>
@@ -11,7 +11,7 @@ import fastestLapIcon from "../../../../public/images/icons/fastest-lap.svg";
type OpenProps = { type OpenProps = {
open: boolean, open: boolean,
}; };
type TransitionProps = OpenProps & { type TransitionProps = {
transitionProps: TransitionArgs[], transitionProps: TransitionArgs[],
}; };
@@ -61,30 +61,38 @@ AnimatedRowContainer.displayName = "AnimatedRowContainer";
type RoundedProp = { type RoundedProp = {
roundedCornerTop?: Px, roundedCornerTop?: Px,
roundedCornerBottom?: Px, roundedCornerBottom?: Px,
transitionTime: Milliseconds, cornerTransitionTime: Milliseconds,
}; };
const Rounded = styled.div<RoundedProp>` const Rounded = styled.div<RoundedProp>`
${({ roundedCornerTop }) => ${({ roundedCornerTop }) =>
roundedCornerTop && css`border-top-right-radius: ${roundedCornerTop}px;`} roundedCornerTop && css`border-top-right-radius: ${roundedCornerTop}px;`}
${({ roundedCornerBottom }) => ${({ roundedCornerBottom }) =>
roundedCornerBottom && css`border-bottom-right-radius: ${roundedCornerBottom}px;`} roundedCornerBottom && css`border-bottom-right-radius: ${roundedCornerBottom}px;`}
transition: border-top-right-radius ${({ transitionTime }) => transitionTime}ms, transition: border-top-right-radius ${({ cornerTransitionTime }) => cornerTransitionTime}ms,
border-bottom-right-radius ${({ transitionTime }) => transitionTime}ms; border-bottom-right-radius ${({ cornerTransitionTime }) => cornerTransitionTime}ms;
`; `;
export const RowLeftHalf = styled(Rounded)` type RowLeftHalfProps = TransitionProps & {
wide: boolean,
};
export const RowLeftHalf = styled(Rounded)<RowLeftHalfProps>`
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
z-index: 1;
overflow-x: clip;
width: ${p => p.theme.design.timingTower.rowLeftHalfWidthPx}px; // Future will be animated. width: ${({ theme: { design: { timingTower } }, wide }) =>
(wide ? timingTower.rowRightHalfWidthPx : 0) + timingTower.rowLeftHalfWidthPx}px;
height: ${p => p.theme.design.timingTower.rowHeightPx}px; height: ${p => p.theme.design.timingTower.rowHeightPx}px;
background-color: #000000e5 background-color: #000000e5;
${({ transitionProps }) => commonTransition(transitionProps)}
`; `;
RowLeftHalf.displayName = "RowLeftHalf"; RowLeftHalf.displayName = "RowLeftHalf";
type AnimatedRowLeftHalfOutlineProps = TransitionProps & { type AnimatedRowLeftHalfOutlineProps = OpenProps & TransitionProps & {
startThickness: Px, startThickness: Px,
endThickness: Px, endThickness: Px,
startColor: string, startColor: string,
@@ -115,7 +123,7 @@ export const RowLeftHalfLayout = styled.div`
display: flex; display: flex;
padding-left: 3px; padding-left: 3px;
align-items: center; /* align-items: center; */
justify-content: flex-start; justify-content: flex-start;
`; `;
RowLeftHalfLayout.displayName = "RowLeftHalfLayout"; RowLeftHalfLayout.displayName = "RowLeftHalfLayout";
@@ -155,17 +163,27 @@ export const RowLeftHalfGemContainer = styled.div`
`; `;
RowLeftHalfGemContainer.displayName = "RowLeftHalfGemContainer"; RowLeftHalfGemContainer.displayName = "RowLeftHalfGemContainer";
export const RowRightHalf = styled(Rounded)` type RowRightHalfProps = TransitionProps & {
collapsed: boolean,
hugRight: boolean,
};
export const RowRightHalf = styled(Rounded)<RowRightHalfProps>`
position: absolute; position: absolute;
right: 0; ${({ hugRight }) => hugRight
? css`right: 0;` : css`
left: ${p => p.theme.design.timingTower.rowLeftHalfWidthPx}px;
`}
top: 0; top: 0;
width: ${p => p.theme.design.timingTower.rowRightHalfWidthPx}px; // Future will be animated. width: ${({ theme: { design: { timingTower } }, collapsed }) =>
collapsed ? 0 : timingTower.rowRightHalfWidthPx}px;
height: ${p => p.theme.design.timingTower.rowHeightPx}px; height: ${p => p.theme.design.timingTower.rowHeightPx}px;
overflow-x: hidden; overflow-x: clip;
background-color: #0000007e background-color: #0000007e;
${({ transitionProps }) => commonTransition(transitionProps)}
`; `;
RowRightHalf.displayName = "RowRightHalf"; RowRightHalf.displayName = "RowRightHalf";
@@ -181,14 +199,33 @@ export const RowRightHalfLayout = styled.div`
`; `;
RowRightHalfLayout.displayName = "RowRightHalfLayout"; RowRightHalfLayout.displayName = "RowRightHalfLayout";
export const DriverName = styled.span` type DriverNameProps = {
visible: boolean,
};
export const DriverName = styled.span<DriverNameProps>`
position: absolute;
top: 0;
left: 0;
opacity: ${({ visible }) => visible ? 1 : 0};
color: white; color: white;
font-family: ${p => p.theme.fonts.f1Bold}; font-family: ${p => p.theme.fonts.f1Bold};
font-size: 20px; font-size: 20px;
margin-left: 14px; text-transform: uppercase;
`; `;
DriverName.displayName = "DriverName"; DriverName.displayName = "DriverName";
export const DriverNameContainer = styled.div<TransitionProps>`
position: relative;
margin-left: 14px;
> span {
${({ transitionProps }) => commonTransition(transitionProps)}
}
`;
DriverNameContainer.displayName = "DriverNameContainer";
type TimeDiffProps = { type TimeDiffProps = {
xScale: Fraction, xScale: Fraction,
yScale: Fraction, yScale: Fraction,
@@ -1,14 +1,16 @@
import { InlineCluster } from "@bedrock-layout/inline-cluster"; import { InlineCluster } from "@bedrock-layout/inline-cluster";
import { PadBox } from "@bedrock-layout/padbox"; 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 { 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 { setTimingTowerSplitsMode } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; import { setTimingTowerDisplayMode, setTimingTowerSplitsMode } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
import { eventSelector } from "../../../../features/event/eventSelector"; import { eventSelector } from "../../../../features/event/eventSelector";
import { increaseDistance, refreshRunningOrder, setCarStatus } from "../../../../features/event/eventSlice"; import { increaseDistance, refreshRunningOrder, setCarStatus } from "../../../../features/event/eventSlice";
import { BGTimingTowerSplitsMode, CarStatus } from "../../../../types/state"; import { BGTimingTowerDisplayMode, BGTimingTowerSplitsMode, CarStatus } from "../../../../types/state";
import { SlotSelector } from "../../../Common/Inputs/SlotSelector";
import { GridSelection } from "../GridSelection"; import { GridSelection } from "../GridSelection";
import { ClickSpan } from "./styles"; import { ClickSpan } from "./styles";
@@ -16,25 +18,17 @@ import { ClickSpan } from "./styles";
export function TimingTowerPrototypeControls() { export function TimingTowerPrototypeControls() {
const dispatch = useDispatch(); const dispatch = useDispatch();
const { selectedCars } = useSelector(broadcastDirectorSelector); const { selectedCars } = useSelector(broadcastDirectorSelector);
const { timingBoard: { timingTower: { splitsMode } } } = useSelector(broadcastGraphicsSelector); const { timingBoard: { timingTower: { splitsMode, displayMode } } } = useSelector(broadcastGraphicsSelector);
const { grid } = useSelector(eventSelector); const { grid } = useSelector(eventSelector);
return ( return (
<Split gutter="md"> <Split gutter="md">
<InlineCluster as={PadBox} padding="md" gutter="md"> <Stack gutter="md">
<PadBox padding="md">
<InlineCluster gutter="md">
<ClickSpan onClick={() => dispatch(refreshRunningOrder())}> <ClickSpan onClick={() => dispatch(refreshRunningOrder())}>
Refresh Running Order Refresh Running Order
</ClickSpan>
<ClickSpan
onClick={() => {
if (splitsMode === BGTimingTowerSplitsMode.Interval) {
dispatch(setTimingTowerSplitsMode(BGTimingTowerSplitsMode.Leader));
} else {
dispatch(setTimingTowerSplitsMode(BGTimingTowerSplitsMode.Interval));
}
}}
>
Splits Mode = {BGTimingTowerSplitsMode[splitsMode]}
</ClickSpan> </ClickSpan>
<ClickSpan <ClickSpan
onClick={() => { onClick={() => {
@@ -47,7 +41,7 @@ export function TimingTowerPrototypeControls() {
dispatch(refreshRunningOrder()); dispatch(refreshRunningOrder());
}} }}
> >
+200m to cars +200m
</ClickSpan> </ClickSpan>
<ClickSpan <ClickSpan
onClick={() => { onClick={() => {
@@ -71,7 +65,7 @@ export function TimingTowerPrototypeControls() {
dispatch(refreshRunningOrder()); dispatch(refreshRunningOrder());
}} }}
> >
Retire cars Retire
</ClickSpan> </ClickSpan>
<ClickSpan <ClickSpan
onClick={() => { onClick={() => {
@@ -82,9 +76,39 @@ export function TimingTowerPrototypeControls() {
dispatch(refreshRunningOrder()); dispatch(refreshRunningOrder());
}} }}
> >
Un-retire cars Un-retire
</ClickSpan> </ClickSpan>
</InlineCluster> </InlineCluster>
<hr />
<InlineCluster gutter="md">
<ClickSpan
onClick={() => {
if (splitsMode === BGTimingTowerSplitsMode.Interval) {
dispatch(setTimingTowerSplitsMode(BGTimingTowerSplitsMode.Leader));
} else {
dispatch(setTimingTowerSplitsMode(BGTimingTowerSplitsMode.Interval));
}
}}
>
Splits Mode = {BGTimingTowerSplitsMode[splitsMode]}
</ClickSpan>
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.LeftAndRight))}>
{(displayMode === BGTimingTowerDisplayMode.LeftAndRight ? "*" : "") + "LeftAndRight"}
</ClickSpan>
<ClickSpan onClick={() => dispatch(setTimingTowerDisplayMode(BGTimingTowerDisplayMode.LeftOnly))}>
{(displayMode === BGTimingTowerDisplayMode.LeftOnly ? "*" : "") + "LeftOnly"}
</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>
</Stack>
<PadBox padding="md"> <PadBox padding="md">
<GridSelection /> <GridSelection />
</PadBox> </PadBox>
+4 -2
View File
@@ -220,7 +220,8 @@ export const drivers: {[lastName: string]: Driver} = {
perez: { perez: {
id: "perez", id: "perez",
firstName: "Sergio", firstName: "Sergio",
lastName: "Pérez", // lastName: "Pérez",
lastName: "Perez",
number: 11, number: 11,
team: teams.redBull, team: teams.redBull,
yellowTCam: true, yellowTCam: true,
@@ -231,7 +232,8 @@ export const drivers: {[lastName: string]: Driver} = {
raikkonen: { raikkonen: {
id: "raikkonen", id: "raikkonen",
firstName: "Kimi", firstName: "Kimi",
lastName: "Räikkönen", // lastName: "Räikkönen",
lastName: "Raikkonen",
number: 7, number: 7,
team: teams.alfaRomeo, team: teams.alfaRomeo,
yellowTCam: false, yellowTCam: false,
@@ -59,6 +59,9 @@ export const broadcastGraphicsSlice = createSlice({
setTimingTowerSplitsMode: (state, action: PayloadAction<BGTimingTowerSplitsMode>) => { setTimingTowerSplitsMode: (state, action: PayloadAction<BGTimingTowerSplitsMode>) => {
state.timingBoard.timingTower.splitsMode = action.payload; state.timingBoard.timingTower.splitsMode = action.payload;
}, },
setTimingTowerDisplayMode: (state, action: PayloadAction<BGTimingTowerDisplayMode>) => {
state.timingBoard.timingTower.displayMode = action.payload;
},
}, },
}); });
@@ -68,5 +71,6 @@ export const {
incrementChyronsOpenState, incrementChyronsOpenState,
clearChyrons, clearChyrons,
setTimingTowerSplitsMode, setTimingTowerSplitsMode,
setTimingTowerDisplayMode,
} = broadcastGraphicsSlice.actions; } = broadcastGraphicsSlice.actions;
export default broadcastGraphicsSlice.reducer; export default broadcastGraphicsSlice.reducer;
+7
View File
@@ -62,6 +62,13 @@ export function wipeCustomDegClip(
} }
} }
/**
* Takes in an array of transition properties, durations, delays, and timings
* in a special interface and returns them into a format understood by CSS.
* Includes a semi-colon as well.
* @param propsArray
* @returns
*/
export function commonTransition(propsArray: TransitionArgs[]) { export function commonTransition(propsArray: TransitionArgs[]) {
return ( return (
"transition: " "transition: "