Skip to content

Commit 84884b4

Browse files
author
takuma-hmng8
committed
微修正
1 parent 037679f commit 84884b4

File tree

11 files changed

+42
-28
lines changed

11 files changed

+42
-28
lines changed

‎.storybook/stories/UseBrush.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ const setConfig = () => {
3636
export const UseBrush = (args: BrushParams) => {
3737
const updateGUI = useGUI(setGUI);
3838
const fxRef = React.useRef<FxMaterialProps>();
39-
const size = useThree((state) => state.size);
40-
const dpr = useThree((state) => state.viewport.dpr);
39+
const { size, dpr } = useThree((state) => {
40+
return { size: state.size, dpr: state.viewport.dpr };
41+
});
4142
const [updateBrush] = useBrush({ size, dpr });
4243
useFrame((props) => {
4344
const fx = updateBrush(props, setConfig());
@@ -57,8 +58,9 @@ export const UseBrushWithTexture = (args: BrushParams) => {
5758
const [bg] = useLoader(THREE.TextureLoader, ["thumbnail.jpg"]);
5859
const updateGUI = useGUI(setGUI);
5960
const fxRef = React.useRef<FxMaterialProps>();
60-
const size = useThree((state) => state.size);
61-
const dpr = useThree((state) => state.viewport.dpr);
61+
const { size, dpr } = useThree((state) => {
62+
return { size: state.size, dpr: state.viewport.dpr };
63+
});
6264
const [updateFxTexture] = useFxTexture({ size, dpr });
6365
const [updateBrush] = useBrush({ size, dpr });
6466

‎.storybook/stories/UseDuoTone.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ export const UseDuoTone = (args: DuoToneParams) => {
2929
const updateGUI = useGUI(setGUI);
3030
const [bg] = useLoader(THREE.TextureLoader, ["thumbnail.jpg"]);
3131
const fxRef = React.useRef<FxMaterialProps>();
32-
const size = useThree((state) => state.size);
33-
const dpr = useThree((state) => state.viewport.dpr);
32+
const { size, dpr } = useThree((state) => {
33+
return { size: state.size, dpr: state.viewport.dpr };
34+
});
3435
const [updateFxTexture] = useFxTexture({ size, dpr });
3536
const [updateDuoTone] = useDuoTone({ size, dpr });
3637

‎.storybook/stories/UseFluid.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ export const UseFluid = (args: FluidParams) => {
3939
const updateGUI = useGUI(setGUI);
4040

4141
const fxRef = React.useRef<FxMaterialProps>();
42-
const size = useThree((state) => state.size);
43-
const dpr = useThree((state) => state.viewport.dpr);
42+
const { size, dpr } = useThree((state) => {
43+
return { size: state.size, dpr: state.viewport.dpr };
44+
});
4445
const [updateFluid] = useFluid({ size, dpr });
4546

4647
useFrame((props) => {
@@ -60,8 +61,9 @@ export const UseFluid = (args: FluidParams) => {
6061
export const UseFluidWithTexture = (args: FluidParams) => {
6162
const updateGUI = useGUI(setGUI);
6263
const fxRef = React.useRef<FxMaterialProps>();
63-
const size = useThree((state) => state.size);
64-
const dpr = useThree((state) => state.viewport.dpr);
64+
const { size, dpr } = useThree((state) => {
65+
return { size: state.size, dpr: state.viewport.dpr };
66+
});
6567
const [updateFluid] = useFluid({ size, dpr });
6668

6769
const [bg] = useLoader(THREE.TextureLoader, ["thumbnail.jpg"]);

‎.storybook/stories/UseFogProjection.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ export const UseFogProjection = (args: FogProjectionParams) => {
4040
const updateGUI = useGUI(setGUI);
4141
const [bg] = useLoader(THREE.TextureLoader, ["thumbnail.jpg"]);
4242
const fxRef = React.useRef<FxMaterialProps>();
43-
const size = useThree((state) => state.size);
44-
const dpr = useThree((state) => state.viewport.dpr);
43+
const { size, dpr } = useThree((state) => {
44+
return { size: state.size, dpr: state.viewport.dpr };
45+
});
4546
const [updateFxTexture] = useFxTexture({ size, dpr });
4647
const [updateNoise] = useNoise({ size, dpr });
4748
const [updateFogProjection] = useFogProjection({ size, dpr });

‎.storybook/stories/UseFxTexture.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ export const UseFxTexture = (args: FxTextureParams) => {
3939
"momo.jpg",
4040
]);
4141
const fxRef = React.useRef<FxMaterialProps>();
42-
const size = useThree((state) => state.size);
43-
const dpr = useThree((state) => state.viewport.dpr);
42+
const { size, dpr } = useThree((state) => {
43+
return { size: state.size, dpr: state.viewport.dpr };
44+
});
4445
const [updateFxTexture] = useFxTexture({ size, dpr });
4546
const [updateNoise] = useNoise({ size, dpr });
4647

‎.storybook/stories/UseNoise.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ export const UseNoise = (args: NoiseParams) => {
3232
const updateGUI = useGUI(setGUI);
3333

3434
const fxRef = React.useRef<FxMaterialProps>();
35-
const size = useThree((state) => state.size);
36-
const dpr = useThree((state) => state.viewport.dpr);
35+
const { size, dpr } = useThree((state) => {
36+
return { size: state.size, dpr: state.viewport.dpr };
37+
});
3738
const [updateNoise] = useNoise({ size, dpr });
3839

3940
useFrame((props) => {

‎.storybook/stories/UseRipple.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ export const UseRippleWithTexture = (args: RippleParams) => {
5858
]);
5959
const updateGUI = useGUI(setGUI);
6060
const fxRef = React.useRef<FxMaterialProps>();
61-
const size = useThree((state) => state.size);
62-
const dpr = useThree((state) => state.viewport.dpr);
61+
const { size, dpr } = useThree((state) => {
62+
return { size: state.size, dpr: state.viewport.dpr };
63+
});
6364
const [updateFxTexture] = useFxTexture({ size, dpr });
6465
const [updateRipple] = useRipple({ size, texture: ripple });
6566

‎.storybook/stories/UseSimpleBlur.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ export const UseSimpleBlur = (args: SimpleBlurParams) => {
3030
const updateGUI = useGUI(setGUI);
3131
const [bg] = useLoader(THREE.TextureLoader, ["thumbnail.jpg"]);
3232
const fxRef = React.useRef<FxMaterialProps>();
33-
const size = useThree((state) => state.size);
34-
const dpr = useThree((state) => state.viewport.dpr);
33+
const { size, dpr } = useThree((state) => {
34+
return { size: state.size, dpr: state.viewport.dpr };
35+
});
3536
const [updateFxTexture] = useFxTexture({ size, dpr });
3637
const [updateSimpleBlur] = useSimpleBlur({ size, dpr });
3738

‎.storybook/stories/UseWave.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ export const UseWave = (args: WaveParams) => {
4646
const updateGUI = useGUI(setGUI);
4747

4848
const fxRef = React.useRef<FxMaterialProps>();
49-
const size = useThree((state) => state.size);
50-
const dpr = useThree((state) => state.viewport.dpr);
49+
const { size, dpr } = useThree((state) => {
50+
return { size: state.size, dpr: state.viewport.dpr };
51+
});
5152
const [updateWave] = useWave({ size, dpr });
5253

5354
useFrame((props) => {
@@ -67,8 +68,9 @@ export const UseWave = (args: WaveParams) => {
6768
export const UseWaveWithTexture = (args: WaveParams) => {
6869
const updateGUI = useGUI(setGUI);
6970
const fxRef = React.useRef<FxMaterialProps>();
70-
const size = useThree((state) => state.size);
71-
const dpr = useThree((state) => state.viewport.dpr);
71+
const { size, dpr } = useThree((state) => {
72+
return { size: state.size, dpr: state.viewport.dpr };
73+
});
7274

7375
const [updateWave] = useWave({ size, dpr });
7476
const [updateFxTexture] = useFxTexture({ size, dpr });

‎app/_home/index.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ export const Home = () => {
1919
const updateGUI = useGUI(setGUI);
2020
const mainShaderRef = useRef<FxTransparentMaterialProps>();
2121

22-
const size = useThree((state) => state.size);
23-
const dpr = useThree((state) => state.viewport.dpr);
22+
const { size, dpr } = useThree((state) => {
23+
return { size: state.size, dpr: state.viewport.dpr };
24+
});
2425

2526
const [updateNoise] = useNoise({ size, dpr });
2627

0 commit comments

Comments
 (0)