From b6cac82042d3d67d7c841c60f3a46ee2716c27c0 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Tue, 25 Jan 2022 19:43:32 -0500 Subject: [PATCH] ISSUE-031 - Almost forgot (I closed issue and merged the branch too early): Here's the important improvement that switches to using a clipped image div for the AngledFlag. There is now a carefully sized "bottom" flag that gives us a simulated parallax look. There is a simple xOffset that should allow us to animate two flags sliding over each other in the future. Updated the use of "National" to "Country" and renamed some directories. Added a second larger AngledFlag to the Workspace (because changes that affect the larger size might be hidden by a smaller flag). --- .../Common/AngledFlag/AngledFlag.tsx | 74 +++++++++++++---- .../Common/AngledFlag/styles.ts | 82 ++++++++++++++----- .../CustomWorkSpaces/AngledFlagWorkSpace.tsx | 7 +- src/domain/data/workspaces.ts | 2 +- .../images/{flags => countryFlags}/AUS.svg | 0 .../images/{flags => countryFlags}/CAN.svg | 0 .../images/{flags => countryFlags}/CHN.svg | 0 .../images/{flags => countryFlags}/DEU.svg | 0 .../images/{flags => countryFlags}/ESP.svg | 0 .../images/{flags => countryFlags}/FIN.svg | 0 .../images/{flags => countryFlags}/FRA.svg | 0 .../images/{flags => countryFlags}/GBR.svg | 0 .../images/{flags => countryFlags}/ITA.svg | 0 .../images/{flags => countryFlags}/JPN.svg | 0 .../images/{flags => countryFlags}/MCO.svg | 0 .../images/{flags => countryFlags}/MEX.svg | 0 .../images/{flags => countryFlags}/NLD.svg | 0 .../images/{flags => countryFlags}/POL.svg | 0 .../images/{flags => countryFlags}/RAF.svg | 0 .../images/{flags => countryFlags}/RUS.svg | 0 .../images/{flags => countryFlags}/THA.svg | 0 .../{flags => countryFlags}/angled/AUS.svg | 0 .../{flags => countryFlags}/angled/CAN.svg | 0 .../{flags => countryFlags}/angled/CHN.svg | 0 .../{flags => countryFlags}/angled/DEU.svg | 0 .../{flags => countryFlags}/angled/ESP.svg | 0 .../{flags => countryFlags}/angled/FIN.svg | 0 .../{flags => countryFlags}/angled/FRA.svg | 0 .../{flags => countryFlags}/angled/GBR.svg | 0 .../{flags => countryFlags}/angled/ITA.svg | 0 .../{flags => countryFlags}/angled/JPN.svg | 0 .../{flags => countryFlags}/angled/MCO.svg | 0 .../{flags => countryFlags}/angled/MEX.svg | 0 .../{flags => countryFlags}/angled/NLD.svg | 0 .../{flags => countryFlags}/angled/POL.svg | 0 .../{flags => countryFlags}/angled/RAF.svg | 0 .../{flags => countryFlags}/angled/RUS.svg | 0 .../{flags => countryFlags}/angled/THA.svg | 0 38 files changed, 126 insertions(+), 39 deletions(-) rename src/public/images/{flags => countryFlags}/AUS.svg (100%) rename src/public/images/{flags => countryFlags}/CAN.svg (100%) rename src/public/images/{flags => countryFlags}/CHN.svg (100%) rename src/public/images/{flags => countryFlags}/DEU.svg (100%) rename src/public/images/{flags => countryFlags}/ESP.svg (100%) rename src/public/images/{flags => countryFlags}/FIN.svg (100%) rename src/public/images/{flags => countryFlags}/FRA.svg (100%) rename src/public/images/{flags => countryFlags}/GBR.svg (100%) rename src/public/images/{flags => countryFlags}/ITA.svg (100%) rename src/public/images/{flags => countryFlags}/JPN.svg (100%) rename src/public/images/{flags => countryFlags}/MCO.svg (100%) rename src/public/images/{flags => countryFlags}/MEX.svg (100%) rename src/public/images/{flags => countryFlags}/NLD.svg (100%) rename src/public/images/{flags => countryFlags}/POL.svg (100%) rename src/public/images/{flags => countryFlags}/RAF.svg (100%) rename src/public/images/{flags => countryFlags}/RUS.svg (100%) rename src/public/images/{flags => countryFlags}/THA.svg (100%) rename src/public/images/{flags => countryFlags}/angled/AUS.svg (100%) rename src/public/images/{flags => countryFlags}/angled/CAN.svg (100%) rename src/public/images/{flags => countryFlags}/angled/CHN.svg (100%) rename src/public/images/{flags => countryFlags}/angled/DEU.svg (100%) rename src/public/images/{flags => countryFlags}/angled/ESP.svg (100%) rename src/public/images/{flags => countryFlags}/angled/FIN.svg (100%) rename src/public/images/{flags => countryFlags}/angled/FRA.svg (100%) rename src/public/images/{flags => countryFlags}/angled/GBR.svg (100%) rename src/public/images/{flags => countryFlags}/angled/ITA.svg (100%) rename src/public/images/{flags => countryFlags}/angled/JPN.svg (100%) rename src/public/images/{flags => countryFlags}/angled/MCO.svg (100%) rename src/public/images/{flags => countryFlags}/angled/MEX.svg (100%) rename src/public/images/{flags => countryFlags}/angled/NLD.svg (100%) rename src/public/images/{flags => countryFlags}/angled/POL.svg (100%) rename src/public/images/{flags => countryFlags}/angled/RAF.svg (100%) rename src/public/images/{flags => countryFlags}/angled/RUS.svg (100%) rename src/public/images/{flags => countryFlags}/angled/THA.svg (100%) diff --git a/src/components/BroadcastGraphics/Common/AngledFlag/AngledFlag.tsx b/src/components/BroadcastGraphics/Common/AngledFlag/AngledFlag.tsx index 4a36388..723a49a 100644 --- a/src/components/BroadcastGraphics/Common/AngledFlag/AngledFlag.tsx +++ b/src/components/BroadcastGraphics/Common/AngledFlag/AngledFlag.tsx @@ -1,9 +1,16 @@ import { FlagMode } from "../../../../types/state"; import { Px } from "../../../../types/style"; -import { Container, NationalFlag, Slant, Sheen, NationalFlagEdge } from "./styles"; +import { + Container, + Slant, + Sheen, + CountryFlagEdge, + CountryFlagDiv, + FlagContainer, +} from "./styles"; -const flags = require.context("../../../../public/images/flags/angled", true); -const logos = require.context("../../../../public/images/logos", true); +const countryFlags = require.context("../../../../public/images/countryFlags/angled", true); +// const teamLogos = require.context("../../../../public/images/teamLogos", true); /** * To look right, country flags need to be 2:1. Additional editing will be @@ -17,24 +24,55 @@ type AngledFlagProps = { flagHeight: Px, }; export function AngledFlag({ flagMode, flag, flagHeight }: AngledFlagProps) { + const topFlag = flagMode === "country" + ? ( + + + + ) : null; // Team flag here + + const bottomFlag = flagMode === "country" + ? ( + + ) : null; // Team flag here + return ( - {flagMode === "country" ? ( - <> - - - - ) : null} - + + + {topFlag} + + {bottomFlag} + + ); } diff --git a/src/components/BroadcastGraphics/Common/AngledFlag/styles.ts b/src/components/BroadcastGraphics/Common/AngledFlag/styles.ts index 796e178..6ef1105 100644 --- a/src/components/BroadcastGraphics/Common/AngledFlag/styles.ts +++ b/src/components/BroadcastGraphics/Common/AngledFlag/styles.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled, { css } from "styled-components"; import { Px } from "../../../../types/style"; type ContainerProps = { @@ -26,25 +26,68 @@ export const Container = styled.div` `; Container.displayName = "Container"; -type NationalFlagProps = { +type FlagContainerProps = { height: Px, + width: Px, + collapsedWidth: Px, + topFlag?: boolean, + masked?: boolean, }; -export const NationalFlag = styled.img` - max-inline-size: unset; +export const FlagContainer = styled.div` + position: absolute; height: ${({ height }) => `${height}px`}; - clip-path: polygon(50% 0, 100% 0, 100% 30%, 66% 100%, 0 100%, 0 100%); - mask-image: linear-gradient( - 60deg, - transparent 0%, - black 15%, - black 85%, - transparent 100% - ); + width: ${({ width }) => `${width}px`}; + ${({ masked = false }) => masked && css` + mask-image: linear-gradient( + 60deg, + transparent 0%, + black 15%, + black 85%, + transparent 100% + ); + `} + + ${({ width, collapsedWidth, topFlag = false }) => topFlag + ? css` + clip-path: polygon( + ${((collapsedWidth * .5) / width) * 100}% 0, + 95% 0, + ${((1 - ((collapsedWidth * .55) / width)) * 100)}% 100%, + 0 100% + ); + ` + : css` + clip-path: polygon( + ${((collapsedWidth * .5) / width) * 100}% 0, + 100% 0, + 100% 30%, + ${((1 - ((collapsedWidth * .34) / width)) * 100)}% 100%, + 0 100% + ); + `} `; -NationalFlag.displayName = "NationalFlag"; +FlagContainer.displayName = "FlagContainer"; + +type CountryFlagDivProps = { + src: string, + height: Px, + width: Px, + xOffset?: Px, +}; +export const CountryFlagDiv = styled.div` + height: ${({ height }) => `${height}px`}; + width: ${({ width }) => `${width}px`}; + background-image: url(${({ src }) => src}); + background-size: ${({ width, height }) => `${width}px ${height}px`}; + background-repeat: no-repeat; + ${({ xOffset }) => xOffset == null + ? css`background-position: center;` + : css`background-position-x: ${xOffset}px`} +`; +CountryFlagDiv.displayName = "CountryFlagDiv"; type SlashProps = { - x: Px, + x?: Px, height: Px, girth: Px, }; @@ -67,9 +110,9 @@ export const Sheen = styled.div` box-shadow: 0.02em 0 0.005em 0.015em rgba(0, 0, 0, 0.2), 1em 0 0 1em rgba(0, 0, 0, 0.5); - transform: skew(-45deg, 0deg) translateX(${({ x }) => `${x}px`}); + transform: skew(-45deg, 0deg) translateX(${({ x = 0 }) => `${x}px`}); - border-left: 0.015em solid rgba(255, 255, 255, 0.25); + border-left: 0.015em solid rgba(255, 255, 255, 0.1); `; Sheen.displayName = "Sheen"; @@ -79,18 +122,18 @@ export const Slant = styled.div` width: ${({ girth }) => `${girth}px`}; background: #1a1a28; - transform: skewX(-45deg) translateX(${({ x }) => `${x}px`}); + transform: skewX(-45deg) translateX(${({ x = 0 }) => `${x}px`}); `; Slant.displayName = "Slant"; -export const NationalFlagEdge = styled.div` +export const CountryFlagEdge = styled.div` position: absolute; height: ${({ height }) => `${height}px`}; width: ${({ girth }) => `${girth}px`}; background: ${p => p.theme.colors.lightGrey}; opacity: 0.5; - transform: skewX(-45deg) translateX(${({ x }) => `${x}px`}); + transform: skewX(-45deg) translateX(${({ x = 0 }) => `${x}px`}); mask-image: linear-gradient( to top, @@ -99,3 +142,4 @@ export const NationalFlagEdge = styled.div` black 100% ); `; +CountryFlagEdge.displayName = "CountryFlagEdge"; diff --git a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx index 3fce2ad..88d8f05 100644 --- a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx @@ -3,12 +3,17 @@ import { BasicBlock } from "./styles"; export function AngledFlagWorkSpace() { return ( - + + ); } diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts index 230462c..1c4db41 100644 --- a/src/domain/data/workspaces.ts +++ b/src/domain/data/workspaces.ts @@ -38,7 +38,7 @@ export const workspaces: WorkspaceObject = { "angled-flag-gbr.png", ], previewWindowDimensions: { - width: 500, + width: 800, height: 500, }, }, diff --git a/src/public/images/flags/AUS.svg b/src/public/images/countryFlags/AUS.svg similarity index 100% rename from src/public/images/flags/AUS.svg rename to src/public/images/countryFlags/AUS.svg diff --git a/src/public/images/flags/CAN.svg b/src/public/images/countryFlags/CAN.svg similarity index 100% rename from src/public/images/flags/CAN.svg rename to src/public/images/countryFlags/CAN.svg diff --git a/src/public/images/flags/CHN.svg b/src/public/images/countryFlags/CHN.svg similarity index 100% rename from src/public/images/flags/CHN.svg rename to src/public/images/countryFlags/CHN.svg diff --git a/src/public/images/flags/DEU.svg b/src/public/images/countryFlags/DEU.svg similarity index 100% rename from src/public/images/flags/DEU.svg rename to src/public/images/countryFlags/DEU.svg diff --git a/src/public/images/flags/ESP.svg b/src/public/images/countryFlags/ESP.svg similarity index 100% rename from src/public/images/flags/ESP.svg rename to src/public/images/countryFlags/ESP.svg diff --git a/src/public/images/flags/FIN.svg b/src/public/images/countryFlags/FIN.svg similarity index 100% rename from src/public/images/flags/FIN.svg rename to src/public/images/countryFlags/FIN.svg diff --git a/src/public/images/flags/FRA.svg b/src/public/images/countryFlags/FRA.svg similarity index 100% rename from src/public/images/flags/FRA.svg rename to src/public/images/countryFlags/FRA.svg diff --git a/src/public/images/flags/GBR.svg b/src/public/images/countryFlags/GBR.svg similarity index 100% rename from src/public/images/flags/GBR.svg rename to src/public/images/countryFlags/GBR.svg diff --git a/src/public/images/flags/ITA.svg b/src/public/images/countryFlags/ITA.svg similarity index 100% rename from src/public/images/flags/ITA.svg rename to src/public/images/countryFlags/ITA.svg diff --git a/src/public/images/flags/JPN.svg b/src/public/images/countryFlags/JPN.svg similarity index 100% rename from src/public/images/flags/JPN.svg rename to src/public/images/countryFlags/JPN.svg diff --git a/src/public/images/flags/MCO.svg b/src/public/images/countryFlags/MCO.svg similarity index 100% rename from src/public/images/flags/MCO.svg rename to src/public/images/countryFlags/MCO.svg diff --git a/src/public/images/flags/MEX.svg b/src/public/images/countryFlags/MEX.svg similarity index 100% rename from src/public/images/flags/MEX.svg rename to src/public/images/countryFlags/MEX.svg diff --git a/src/public/images/flags/NLD.svg b/src/public/images/countryFlags/NLD.svg similarity index 100% rename from src/public/images/flags/NLD.svg rename to src/public/images/countryFlags/NLD.svg diff --git a/src/public/images/flags/POL.svg b/src/public/images/countryFlags/POL.svg similarity index 100% rename from src/public/images/flags/POL.svg rename to src/public/images/countryFlags/POL.svg diff --git a/src/public/images/flags/RAF.svg b/src/public/images/countryFlags/RAF.svg similarity index 100% rename from src/public/images/flags/RAF.svg rename to src/public/images/countryFlags/RAF.svg diff --git a/src/public/images/flags/RUS.svg b/src/public/images/countryFlags/RUS.svg similarity index 100% rename from src/public/images/flags/RUS.svg rename to src/public/images/countryFlags/RUS.svg diff --git a/src/public/images/flags/THA.svg b/src/public/images/countryFlags/THA.svg similarity index 100% rename from src/public/images/flags/THA.svg rename to src/public/images/countryFlags/THA.svg diff --git a/src/public/images/flags/angled/AUS.svg b/src/public/images/countryFlags/angled/AUS.svg similarity index 100% rename from src/public/images/flags/angled/AUS.svg rename to src/public/images/countryFlags/angled/AUS.svg diff --git a/src/public/images/flags/angled/CAN.svg b/src/public/images/countryFlags/angled/CAN.svg similarity index 100% rename from src/public/images/flags/angled/CAN.svg rename to src/public/images/countryFlags/angled/CAN.svg diff --git a/src/public/images/flags/angled/CHN.svg b/src/public/images/countryFlags/angled/CHN.svg similarity index 100% rename from src/public/images/flags/angled/CHN.svg rename to src/public/images/countryFlags/angled/CHN.svg diff --git a/src/public/images/flags/angled/DEU.svg b/src/public/images/countryFlags/angled/DEU.svg similarity index 100% rename from src/public/images/flags/angled/DEU.svg rename to src/public/images/countryFlags/angled/DEU.svg diff --git a/src/public/images/flags/angled/ESP.svg b/src/public/images/countryFlags/angled/ESP.svg similarity index 100% rename from src/public/images/flags/angled/ESP.svg rename to src/public/images/countryFlags/angled/ESP.svg diff --git a/src/public/images/flags/angled/FIN.svg b/src/public/images/countryFlags/angled/FIN.svg similarity index 100% rename from src/public/images/flags/angled/FIN.svg rename to src/public/images/countryFlags/angled/FIN.svg diff --git a/src/public/images/flags/angled/FRA.svg b/src/public/images/countryFlags/angled/FRA.svg similarity index 100% rename from src/public/images/flags/angled/FRA.svg rename to src/public/images/countryFlags/angled/FRA.svg diff --git a/src/public/images/flags/angled/GBR.svg b/src/public/images/countryFlags/angled/GBR.svg similarity index 100% rename from src/public/images/flags/angled/GBR.svg rename to src/public/images/countryFlags/angled/GBR.svg diff --git a/src/public/images/flags/angled/ITA.svg b/src/public/images/countryFlags/angled/ITA.svg similarity index 100% rename from src/public/images/flags/angled/ITA.svg rename to src/public/images/countryFlags/angled/ITA.svg diff --git a/src/public/images/flags/angled/JPN.svg b/src/public/images/countryFlags/angled/JPN.svg similarity index 100% rename from src/public/images/flags/angled/JPN.svg rename to src/public/images/countryFlags/angled/JPN.svg diff --git a/src/public/images/flags/angled/MCO.svg b/src/public/images/countryFlags/angled/MCO.svg similarity index 100% rename from src/public/images/flags/angled/MCO.svg rename to src/public/images/countryFlags/angled/MCO.svg diff --git a/src/public/images/flags/angled/MEX.svg b/src/public/images/countryFlags/angled/MEX.svg similarity index 100% rename from src/public/images/flags/angled/MEX.svg rename to src/public/images/countryFlags/angled/MEX.svg diff --git a/src/public/images/flags/angled/NLD.svg b/src/public/images/countryFlags/angled/NLD.svg similarity index 100% rename from src/public/images/flags/angled/NLD.svg rename to src/public/images/countryFlags/angled/NLD.svg diff --git a/src/public/images/flags/angled/POL.svg b/src/public/images/countryFlags/angled/POL.svg similarity index 100% rename from src/public/images/flags/angled/POL.svg rename to src/public/images/countryFlags/angled/POL.svg diff --git a/src/public/images/flags/angled/RAF.svg b/src/public/images/countryFlags/angled/RAF.svg similarity index 100% rename from src/public/images/flags/angled/RAF.svg rename to src/public/images/countryFlags/angled/RAF.svg diff --git a/src/public/images/flags/angled/RUS.svg b/src/public/images/countryFlags/angled/RUS.svg similarity index 100% rename from src/public/images/flags/angled/RUS.svg rename to src/public/images/countryFlags/angled/RUS.svg diff --git a/src/public/images/flags/angled/THA.svg b/src/public/images/countryFlags/angled/THA.svg similarity index 100% rename from src/public/images/flags/angled/THA.svg rename to src/public/images/countryFlags/angled/THA.svg