diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx index dff4750..3288e6e 100644 --- a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx @@ -14,7 +14,7 @@ import { setChyronsOpenState, } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; import { flagModeList, getChyronModesList, getChyronSubModesList } from "../../../../domain/data/broadcastGraphics"; -import { BGChyronDriver, BGChyronMode, BGChyrons, BGChyronSubMode, Car, FlagMode, GridSpot } from "../../../../types/state"; +import { BGChyronDriver, BGChyronMode, BGChyrons, BGChyronSubMode, FlagMode, GridSpot } from "../../../../types/state"; import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; import { Button, CloseButton, OpenButton, Title } from "./styles"; diff --git a/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx b/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx index be3f11e..b10247d 100644 --- a/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx @@ -22,6 +22,7 @@ export function ChyronContainer({ debug = false, placement = {} }: ChyronContain chyronData={chyrons.driver.primary} subMode={chyrons.subMode} openState={chyrons.openState} + showRolex debugDurationMultiplier={debug ? debugDurationMultiplier : 1} /> ); @@ -35,6 +36,7 @@ export function ChyronContainer({ debug = false, placement = {} }: ChyronContain chyronData={chyrons.driver.secondary} subMode={chyrons.subMode} openState={chyrons.openState} + showRolex={false} debugDurationMultiplier={debug ? debugDurationMultiplier : 1} /> diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index 5948917..fda3df7 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -30,16 +30,19 @@ import { } from "./styles"; import { VenetianBlindsTransition } from "../../Common/VenetianBlindsTransition"; import { Spacer } from "../../Common/Spacer.styled"; +import { RolexGem } from "../../Gems/RolexGem"; type ChyronDriverProps = DebugDurationProps & { chyronData: BGChyronDriver, subMode: BGChyronSubMode, openState: OpenState, + showRolex: boolean, }; export function ChyronDriver({ chyronData, subMode, openState, + showRolex, debugDurationMultiplier: DDM = 1.0, }: ChyronDriverProps) { const [baseWidth, baseHeight] = subMode === "medium" ? [582, 72] @@ -58,9 +61,12 @@ export function ChyronDriver({ const dispatch = useDispatch(); + const { design: { chyronDriver: cdTheme } } = theme; + const teamColor = theme.colors.teams[car.driver.team.id]; + const containerFadeAwaySpring = useSpring({ opacity: openState == -1 ? 0 : 1, - config: { duration: 300 * DDM }, + config: { duration: cdTheme.containerFadeAwayDurationMs * DDM }, delay: 0, onRest: () => { if (openState === -1) { @@ -71,18 +77,19 @@ export function ChyronDriver({ const { outlineClipPathProgress } = useSpring({ outlineClipPathProgress: openState !== 0 ? 1 : 0, - config: { duration: 500 * DDM }, + config: { duration: cdTheme.outlineClipPathDurationMs * DDM }, delay: 0, }); - const teamColor = theme.colors.teams[car.driver.team.id]; - return ( + {showRolex && ( + + )} { @@ -109,11 +116,11 @@ export function ChyronDriver({ open={openState !== 0} transitionProps={[{ property: "opacity", - duration: 800 * DDM, + duration: cdTheme.baseBlackOpacityDurationMs * DDM, timing: "ease-in", }, { property: "width", - duration: 667 * DDM, + duration: cdTheme.baseBlackWidthDurationMs * DDM, timing: "ease-out", }]} /> @@ -121,17 +128,17 @@ export function ChyronDriver({ open={openState !== 0} transitionProps={[{ property: "clip-path", - duration: 400 * DDM, + duration: cdTheme.baseWipeDurationMs * DDM, timing: "ease-in", - delay: 333 * DDM, + delay: cdTheme.baseWipeDelay * DDM, }]} > @@ -139,21 +146,21 @@ export function ChyronDriver({ {showPosFlag && car.status !== CarStatus.Retired && ( @@ -163,9 +170,9 @@ export function ChyronDriver({ open={openState !== 0} transitionProps={[{ property: "clip-path", - duration: 667 * DDM, + duration: cdTheme.teamColorBarDurationMs * DDM, timing: "ease-in-out", - delay: 733 * DDM, + delay: cdTheme.teamColorBarDelayMs * DDM, }]} color={teamColor} /> @@ -186,8 +193,8 @@ export function ChyronDriver({ {car.driver.team.shortName} @@ -196,12 +203,12 @@ export function ChyronDriver({ open={openState !== 0} transitionProps={[{ property: "opacity", - duration: 1200 * DDM, - delay: 1000 * DDM, + duration: cdTheme.flagOpacityDurationMs * DDM, + delay: cdTheme.flagDelay * DDM, }, { property: "right", - duration: 2000 * DDM, - delay: 1000 * DDM, + duration: cdTheme.flagRightDuration * DDM, + delay: cdTheme.flagDelay * DDM, }]} height={baseHeight * 0.9} width={baseHeight * 3} @@ -220,23 +227,23 @@ export function ChyronDriver({ open={openState !== 0} transitionProps={[{ property: "opacity", - duration: 500 * DDM, - delay: 2000 * DDM, + duration: cdTheme.portraitOpacityDurationMs * DDM, + delay: cdTheme.portraitOpacityDelayMs * DDM, }]} - placement={{ right: "-5px", bottom: "0" }} + placement={cdTheme.portraitPlacement} > 0} + transitionProps={[{ + property: "opacity", + duration: theme.design.rolexGem.fadeInDurationMs * DDM, + delay: theme.design.rolexGem.fadeInDelayMs * DDM, + }]} + > + + + + + ); +} diff --git a/src/components/BroadcastGraphics/Gems/RolexGem/index.ts b/src/components/BroadcastGraphics/Gems/RolexGem/index.ts new file mode 100644 index 0000000..ecd8c2a --- /dev/null +++ b/src/components/BroadcastGraphics/Gems/RolexGem/index.ts @@ -0,0 +1 @@ +export * from "./RolexGem"; diff --git a/src/components/BroadcastGraphics/Gems/RolexGem/styles.ts b/src/components/BroadcastGraphics/Gems/RolexGem/styles.ts new file mode 100644 index 0000000..a7255c6 --- /dev/null +++ b/src/components/BroadcastGraphics/Gems/RolexGem/styles.ts @@ -0,0 +1,38 @@ +import styled from "styled-components/macro"; + +import { TransitionProps } from "../../../../types/style"; +import { commonTransition } from "../../../../utils/styling"; + +export const GemContainer = styled.div` + position: absolute; + top: ${p => + -p.theme.design.rolexGem.heightPx - p.theme.design.rolexGem.bottomMarginPx}px; + + opacity: ${({ open }) => open ? 1 : 0}; + + ${({ transitionProps }) => commonTransition(transitionProps)} +`; + +export const GemBackground = styled.div` + position: relative; + height: ${p => p.theme.design.rolexGem.heightPx}px; + width: ${p => p.theme.design.rolexGem.widthPx}px; + + display: flex; + justify-content: center; + align-items: center; + + background-color: ${p => p.theme.colors.logos.rolexGemGreen}; + border-radius: ${p => p.theme.design.rolexGem.borderRadiusPx}px; +`; + +export const LogoImage = styled.img` + height: ${({ theme: { design: { rolexGem } }, open }) => + rolexGem.logoHeightPx * (open ? 1 : rolexGem.logoHeightFadeStartFraction)}px; + margin-top: ${p => p.theme.design.rolexGem.logoTopMarginPx}px; + opacity: ${({ theme: { design: { rolexGem } }, open }) => open + ? 1 : rolexGem.logoOpacityFadeStartFraction}; + + ${({ transitionProps }) => commonTransition(transitionProps)} +`; + diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts index d7a2523..86f05f9 100644 --- a/src/domain/data/workspaces.ts +++ b/src/domain/data/workspaces.ts @@ -23,6 +23,7 @@ export const workspaces: WorkspaceObject = { "chyron-driver-medium-full-lat-no-pos.png", "chyron-driver-large-np-tsu.png", "chyron-driver-large-dnf-ver.png", + "chyron-driver-medium-full-rolex.png", ], previewWindowDimensions: { width: 750, diff --git a/src/public/images/logos/rolex-yellow.svg b/src/public/images/logos/rolex-yellow.svg new file mode 100644 index 0000000..e537e98 --- /dev/null +++ b/src/public/images/logos/rolex-yellow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/public/images/overlays/chyron-driver-medium-full-rolex.png b/src/public/images/overlays/chyron-driver-medium-full-rolex.png new file mode 100644 index 0000000..11823a2 Binary files /dev/null and b/src/public/images/overlays/chyron-driver-medium-full-rolex.png differ diff --git a/src/shared/theme.ts b/src/shared/theme.ts index de7f0f5..018caf9 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -48,6 +48,8 @@ export const theme = { dhlRed: "#d40511", rolexGreen: "#006039", rolexGold: "#a37e2c", + rolexYellow: "#faff04", + rolexGemGreen: "#06692f", emiratesRed: "#d71a21", pirelliRed: "#d52b1e", pirelliYellow: "#fed100", @@ -73,6 +75,50 @@ export const theme = { indicatorLapCount: "1.5em", }, design: { + chyronDriver: { + containerFadeAwayDurationMs: 300, + outlineClipPathDurationMs: 500, + outlineFadeDurationMs: 1167, + baseBlackOpacityDurationMs: 800, + baseBlackWidthDurationMs: 667, + baseWipeDurationMs: 400, + baseWipeDelay: 333, + baseColorDurationMs: 566, + baseColorDelayMs: 600, + posFlagBlindsDelayMs: 500, + posFlagBlindsColor: "#f60d0d", + posFlagBlindsColorFadeDurationMs: 300, + posFlagBlindsColorFadeDelayMs: 200, + posFlagBlindsAngleDeg: -45, + posFlagBlindsOpenDurationMs: 100, + posFlagBlindsOpenDelayMs: 150, + posFlagBlindsBlindsSize: { transparent: 3, opaque: 6 }, + posFlagWipeAngleDeg: 40, + posFlagWipeDuration: 333, + posFlagOpacityStartFraction: 0.1, + posFlagOpacityDurationMs: 200, + posFlagOpacityDelayMs: 100, + posFlagSpanBlinkDurationMs: 500, + teamColorBarDurationMs: 667, + teamColorBarDelayMs: 733, + teamNameAnimationDurationMs: 233, + teamNameAnimationDelayMs: 500, + flagDelay: 1000, + flagOpacityDurationMs: 1200, + flagRightDuration: 2000, + portraitOpacityDurationMs: 500, + portraitOpacityDelayMs: 2000, + portraitPlacement: { right: "-5px", bottom: "0" }, + portraitBlindsDelayMs: 1700, + portraitBlindsColorFadeDurationMs: 600, + portraitBlindsColorFadeDelayMs: 0, + portraitBlindsAngleDeg: -45, + portraitBlindsOpenDurationMs: 300, + portraitBlindsOpenDelayMs: 0, + portraitBlindsSize: { transparent: 2, opaque: 5 }, + portraitWipeAngleDeg: 45, + portraitWipeDurationMs: 700, + }, statusIndicator: { heightNormalPx: 73, roundedCornerRadiusPx: 8, @@ -97,10 +143,18 @@ export const theme = { button: { borderRadius: "0.25rem", }, - }, - graphics: { - medRadius: "11px", - smRadius: "7px", + rolexGem: { + widthPx: 130, + heightPx: 74, + borderRadiusPx: 4, + bottomMarginPx: 3, + fadeInDurationMs: 600, + fadeInDelayMs: 1000, + logoHeightPx: 68, + logoHeightFadeStartFraction: 0.7, + logoOpacityFadeStartFraction: 0.5, + logoTopMarginPx: 2, + }, }, broadcast: { dimensionsWidthPx: 1920,