diff --git a/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx b/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx index 86972f3de..af76ffd0c 100644 --- a/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx +++ b/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx @@ -132,6 +132,7 @@ export function TankDisplay({ duel }: TankDisplayProps) { > + {/* */} diff --git a/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx b/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx index 6a66cb314..b0a77603f 100644 --- a/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx +++ b/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx @@ -16,9 +16,6 @@ interface OptionsProps { export function Options({ isFullScreen, canvas }: OptionsProps) { const showGrid = useTankopedia((state) => state.model.visual.showGrid); - const showSpacedArmor = useTankopedia( - (state) => state.model.visual.showSpacedArmor, - ); return ( Show grid - - { - mutateTankopedia((draft) => { - draft.model.visual.showSpacedArmor = checked; - }); - }} - > - Spaced armor - diff --git a/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/ArmorHighlighting.tsx b/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/ArmorHighlighting.tsx index 509c33806..29547eeb1 100644 --- a/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/ArmorHighlighting.tsx +++ b/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/ArmorHighlighting.tsx @@ -27,9 +27,6 @@ interface ArmorHighlightingProps { export function ArmorHighlighting({ duel }: ArmorHighlightingProps) { const wrapper = useRef(null); const awaitedModelDefinitions = useModelDefinitions(); - const showSpacedArmor = useTankopedia( - (state) => state.model.visual.showSpacedArmor, - ); const turretContainer = useRef(null); const gunContainer = useRef(null); const initialTankopediaState = useTankopedia.getState(); @@ -165,12 +162,7 @@ export function ArmorHighlighting({ duel }: ArmorHighlightingProps) { armorId, ); - if ( - !isVisible || - thickness === undefined || - (spaced && !showSpacedArmor) - ) - return null; + if (!isVisible || thickness === undefined || spaced) return null; return ( ); @@ -197,12 +188,7 @@ export function ArmorHighlighting({ duel }: ArmorHighlightingProps) { armorId, ); - if ( - !isVisible || - thickness === undefined || - (spaced && !showSpacedArmor) - ) - return null; + if (!isVisible || thickness === undefined || spaced) return null; return ( ); @@ -229,12 +214,7 @@ export function ArmorHighlighting({ duel }: ArmorHighlightingProps) { armorId, ); - if ( - !isVisible || - thickness === undefined || - (spaced && !showSpacedArmor) - ) - return null; + if (!isVisible || thickness === undefined || spaced) return null; return ( ); diff --git a/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/ExternalModuleMask.tsx b/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/ExternalModuleMask.tsx index a9f3c1743..f69ebc859 100644 --- a/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/ExternalModuleMask.tsx +++ b/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/ExternalModuleMask.tsx @@ -34,9 +34,6 @@ interface ExternalModuleMaskProps { export const ExternalModuleMask = memo(({ duel }) => { const wrapper = useRef(null); const awaitedModelDefinitions = useModelDefinitions(); - const showSpacedArmor = useTankopedia( - (state) => state.model.visual.showSpacedArmor, - ); const turretContainer = useRef(null); const gunContainer = useRef(null); const initialTankopediaState = useTankopedia.getState(); @@ -164,12 +161,7 @@ export const ExternalModuleMask = memo(({ duel }) => { armorId, ); - if ( - !isVisible || - thickness === undefined || - (spaced && !showSpacedArmor) - ) - return null; + if (!isVisible || thickness === undefined) return null; return ( (({ duel }) => { const isTrack = node.name.startsWith('chassis_track_'); const isVisible = isWheel || isTrack; - if (!isVisible || !showSpacedArmor) return null; + if (!isVisible) return null; return ( (({ duel }) => { armorId, ); - if ( - !isVisible || - thickness === undefined || - (spaced && !showSpacedArmor) - ) - return null; + if (!isVisible || thickness === undefined) return null; return ( (({ duel }) => { armorId, ); - if ( - !isVisible || - thickness === undefined || - (spaced && !showSpacedArmor) - ) - return null; + if (!isVisible || thickness === undefined) return null; return ( (({ duel }) => { `gun_${gunModelDefinition.model.toString().padStart(2, '0')}`; const isVisible = isCurrentGun; - if (!isVisible || !showSpacedArmor) return null; + if (!isVisible) return null; return ( (({ duel }) => { const wrapper = useRef(null); const awaitedModelDefinitions = useModelDefinitions(); - const showSpacedArmor = useTankopedia( - (state) => state.model.visual.showSpacedArmor, - ); const turretContainer = useRef(null); const gunContainer = useRef(null); const initialTankopediaState = useTankopedia.getState(); @@ -177,12 +174,7 @@ export const SpacedArmorDepth = memo(({ duel }) => { armorId, ); - if ( - !isVisible || - thickness === undefined || - (spaced && !showSpacedArmor) - ) - return null; + if (!isVisible || thickness === undefined) return null; return ( (({ duel }) => { const isTrack = node.name.startsWith('chassis_track_'); const isVisible = isWheel || isTrack; - if (!isVisible || !showSpacedArmor) return null; + if (!isVisible) return null; return ( (({ duel }) => { armorId, ); - if ( - !isVisible || - thickness === undefined || - (spaced && !showSpacedArmor) - ) - return null; + if (!isVisible || thickness === undefined) return null; return ( (({ duel }) => { armorId, ); - if ( - !isVisible || - thickness === undefined || - (spaced && !showSpacedArmor) - ) - return null; + if (!isVisible || thickness === undefined) return null; return ( (({ duel }) => { `gun_${gunModelDefinition.model.toString().padStart(2, '0')}`; const isVisible = isCurrentGun; - if (!isVisible || !showSpacedArmor) return null; + if (!isVisible) return null; return ( - {!isSpaced && ( - - - - )} + + + ()( visual: { controlsEnabled: true, showGrid: true, - showSpacedArmor: true, }, }, areTanksAssigned: false,