From 0f97693500d6c4758f515c38a4b2015376117904 Mon Sep 17 00:00:00 2001 From: Matchu Date: Wed, 12 Aug 2020 01:32:25 -0700 Subject: [PATCH] add conflict resolution mode for SWF screenshots MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "Dyeworks Pink: Peaceful Tree Garland" was a tricky case, with animated falling leaves… we decided that having transparency in the main pet area, and some incorrect transparent holes in the trees, was a better conflict resolution for this one Probably would be good to manually upload a Totally Good version, but like, this flag is probably good to have --- .../support/ItemLayerSupportUploadModal.js | 118 ++++++++++++++---- 1 file changed, 96 insertions(+), 22 deletions(-) diff --git a/src/app/WardrobePage/support/ItemLayerSupportUploadModal.js b/src/app/WardrobePage/support/ItemLayerSupportUploadModal.js index 9be102f..c5c04b7 100644 --- a/src/app/WardrobePage/support/ItemLayerSupportUploadModal.js +++ b/src/app/WardrobePage/support/ItemLayerSupportUploadModal.js @@ -10,6 +10,7 @@ import { ModalFooter, ModalHeader, ModalOverlay, + Select, useToast, } from "@chakra-ui/core"; import { ExternalLinkIcon } from "@chakra-ui/icons"; @@ -33,6 +34,8 @@ function ItemLayerSupportUploadModal({ item, itemLayer, isOpen, onClose }) { const [isUploading, setIsUploading] = React.useState(false); const [uploadError, setUploadError] = React.useState(null); + const [conflictMode, setConflictMode] = React.useState("onBlack"); + const supportSecret = useSupportSecret(); const toast = useToast(); const apolloClient = useApolloClient(); @@ -47,14 +50,16 @@ function ItemLayerSupportUploadModal({ item, itemLayer, isOpen, onClose }) { setNumWarnings(null); setIsUploading(false); - mergeIntoImageWithAlpha(imageOnBlackUrl, imageOnWhiteUrl).then( - ([url, blob, numWarnings]) => { - setImageWithAlphaUrl(url); - setImageWithAlphaBlob(blob); - setNumWarnings(numWarnings); - } - ); - }, [imageOnBlackUrl, imageOnWhiteUrl]); + mergeIntoImageWithAlpha( + imageOnBlackUrl, + imageOnWhiteUrl, + conflictMode + ).then(([url, blob, numWarnings]) => { + setImageWithAlphaUrl(url); + setImageWithAlphaBlob(blob); + setNumWarnings(numWarnings); + }); + }, [imageOnBlackUrl, imageOnWhiteUrl, conflictMode]); const onUpload = React.useCallback( (e) => { @@ -167,6 +172,8 @@ function ItemLayerSupportUploadModal({ item, itemLayer, isOpen, onClose }) { )} @@ -250,7 +257,12 @@ function ItemLayerSupportScreenshotStep({ itemLayer, step, onUpload }) { ); } -function ItemLayerSupportReviewStep({ imageWithAlphaUrl, numWarnings }) { +function ItemLayerSupportReviewStep({ + imageWithAlphaUrl, + numWarnings, + conflictMode, + onChangeConflictMode, +}) { if (imageWithAlphaUrl == null) { return Generating image…; } @@ -283,6 +295,31 @@ function ItemLayerSupportReviewStep({ imageWithAlphaUrl, numWarnings }) { /> )} + + {numWarnings > 0 && ( + + + When pixels conflict, we use… + + + + )} + ); } @@ -386,7 +423,11 @@ function ItemLayerSupportFlashPlayer({ swfUrl, backgroundColor }) { ); } -async function mergeIntoImageWithAlpha(imageOnBlackUrl, imageOnWhiteUrl) { +async function mergeIntoImageWithAlpha( + imageOnBlackUrl, + imageOnWhiteUrl, + conflictMode +) { const [imageOnBlack, imageOnWhite] = await Promise.all([ readImageDataFromUrl(imageOnBlackUrl), readImageDataFromUrl(imageOnWhiteUrl), @@ -394,7 +435,8 @@ async function mergeIntoImageWithAlpha(imageOnBlackUrl, imageOnWhiteUrl) { const [imageWithAlphaData, numWarnings] = mergeDataIntoImageWithAlpha( imageOnBlack, - imageOnWhite + imageOnWhite, + conflictMode ); const [ imageWithAlphaUrl, @@ -404,7 +446,7 @@ async function mergeIntoImageWithAlpha(imageOnBlackUrl, imageOnWhiteUrl) { return [imageWithAlphaUrl, imageWithAlphaBlob, numWarnings]; } -function mergeDataIntoImageWithAlpha(imageOnBlack, imageOnWhite) { +function mergeDataIntoImageWithAlpha(imageOnBlack, imageOnWhite, conflictMode) { const imageWithAlpha = new ImageData(600, 600); let numWarnings = 0; @@ -428,13 +470,29 @@ function mergeDataIntoImageWithAlpha(imageOnBlack, imageOnWhite) { ` vs ` + `#${rOnBlack.toString(16)}${bOnBlack.toString(16)}` + `${gOnWhite.toString(16)}. ` + - `Falling back to the pixel on black, with alpha = 100%. ` + `Using conflict mode ${conflictMode} to fall back.` ); } - imageWithAlpha.data[pixelIndex] = rOnBlack; - imageWithAlpha.data[pixelIndex + 1] = gOnBlack; - imageWithAlpha.data[pixelIndex + 2] = bOnBlack; - imageWithAlpha.data[pixelIndex + 3] = 255; + + if (conflictMode === "onBlack") { + imageWithAlpha.data[pixelIndex] = rOnBlack; + imageWithAlpha.data[pixelIndex + 1] = gOnBlack; + imageWithAlpha.data[pixelIndex + 2] = bOnBlack; + imageWithAlpha.data[pixelIndex + 3] = 255; + } else if (conflictMode === "onWhite") { + imageWithAlpha.data[pixelIndex] = rOnWhite; + imageWithAlpha.data[pixelIndex + 1] = gOnWhite; + imageWithAlpha.data[pixelIndex + 2] = bOnWhite; + imageWithAlpha.data[pixelIndex + 3] = 255; + } else if (conflictMode === "transparent") { + imageWithAlpha.data[pixelIndex] = 0; + imageWithAlpha.data[pixelIndex + 1] = 0; + imageWithAlpha.data[pixelIndex + 2] = 0; + imageWithAlpha.data[pixelIndex + 3] = 0; + } else { + throw new Error(`unexpected conflict mode ${conflictMode}`); + } + numWarnings++; continue; } @@ -460,13 +518,29 @@ function mergeDataIntoImageWithAlpha(imageOnBlack, imageOnWhite) { ` vs ` + `#${rOnBlack.toString(16)}${bOnBlack.toString(16)}` + `${gOnWhite.toString(16)}. ` + - `Falling back to the pixel on black, with alpha = 100%. ` + `Using conflict mode ${conflictMode} to fall back.` ); } - imageWithAlpha.data[pixelIndex] = rOnBlack; - imageWithAlpha.data[pixelIndex + 1] = gOnBlack; - imageWithAlpha.data[pixelIndex + 2] = bOnBlack; - imageWithAlpha.data[pixelIndex + 3] = 255; + + if (conflictMode === "onBlack") { + imageWithAlpha.data[pixelIndex] = rOnBlack; + imageWithAlpha.data[pixelIndex + 1] = gOnBlack; + imageWithAlpha.data[pixelIndex + 2] = bOnBlack; + imageWithAlpha.data[pixelIndex + 3] = 255; + } else if (conflictMode === "onWhite") { + imageWithAlpha.data[pixelIndex] = rOnWhite; + imageWithAlpha.data[pixelIndex + 1] = gOnWhite; + imageWithAlpha.data[pixelIndex + 2] = bOnWhite; + imageWithAlpha.data[pixelIndex + 3] = 255; + } else if (conflictMode === "transparent") { + imageWithAlpha.data[pixelIndex] = 0; + imageWithAlpha.data[pixelIndex + 1] = 0; + imageWithAlpha.data[pixelIndex + 2] = 0; + imageWithAlpha.data[pixelIndex + 3] = 0; + } else { + throw new Error(`unexpected conflict mode ${conflictMode}`); + } + numWarnings++; continue; }