Skip to content

微修正 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 15, 2023
Merged

微修正 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .storybook/stories/UseBrush.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ const setConfig = () => {
export const UseBrush = (args: BrushParams) => {
const updateGUI = useGUI(setGUI);
const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateBrush] = useBrush({ size, dpr });
useFrame((props) => {
const fx = updateBrush(props, setConfig());
Expand All @@ -57,8 +58,9 @@ export const UseBrushWithTexture = (args: BrushParams) => {
const [bg] = useLoader(THREE.TextureLoader, ["thumbnail.jpg"]);
const updateGUI = useGUI(setGUI);
const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateFxTexture] = useFxTexture({ size, dpr });
const [updateBrush] = useBrush({ size, dpr });

Expand Down
5 changes: 3 additions & 2 deletions .storybook/stories/UseDuoTone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ export const UseDuoTone = (args: DuoToneParams) => {
const updateGUI = useGUI(setGUI);
const [bg] = useLoader(THREE.TextureLoader, ["thumbnail.jpg"]);
const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateFxTexture] = useFxTexture({ size, dpr });
const [updateDuoTone] = useDuoTone({ size, dpr });

Expand Down
10 changes: 6 additions & 4 deletions .storybook/stories/UseFluid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ export const UseFluid = (args: FluidParams) => {
const updateGUI = useGUI(setGUI);

const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateFluid] = useFluid({ size, dpr });

useFrame((props) => {
Expand All @@ -60,8 +61,9 @@ export const UseFluid = (args: FluidParams) => {
export const UseFluidWithTexture = (args: FluidParams) => {
const updateGUI = useGUI(setGUI);
const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateFluid] = useFluid({ size, dpr });

const [bg] = useLoader(THREE.TextureLoader, ["thumbnail.jpg"]);
Expand Down
5 changes: 3 additions & 2 deletions .storybook/stories/UseFogProjection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ export const UseFogProjection = (args: FogProjectionParams) => {
const updateGUI = useGUI(setGUI);
const [bg] = useLoader(THREE.TextureLoader, ["thumbnail.jpg"]);
const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateFxTexture] = useFxTexture({ size, dpr });
const [updateNoise] = useNoise({ size, dpr });
const [updateFogProjection] = useFogProjection({ size, dpr });
Expand Down
5 changes: 3 additions & 2 deletions .storybook/stories/UseFxTexture.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ export const UseFxTexture = (args: FxTextureParams) => {
"momo.jpg",
]);
const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateFxTexture] = useFxTexture({ size, dpr });
const [updateNoise] = useNoise({ size, dpr });

Expand Down
5 changes: 3 additions & 2 deletions .storybook/stories/UseNoise.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ export const UseNoise = (args: NoiseParams) => {
const updateGUI = useGUI(setGUI);

const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateNoise] = useNoise({ size, dpr });

useFrame((props) => {
Expand Down
5 changes: 3 additions & 2 deletions .storybook/stories/UseRipple.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ export const UseRippleWithTexture = (args: RippleParams) => {
]);
const updateGUI = useGUI(setGUI);
const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateFxTexture] = useFxTexture({ size, dpr });
const [updateRipple] = useRipple({ size, texture: ripple });

Expand Down
5 changes: 3 additions & 2 deletions .storybook/stories/UseSimpleBlur.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ export const UseSimpleBlur = (args: SimpleBlurParams) => {
const updateGUI = useGUI(setGUI);
const [bg] = useLoader(THREE.TextureLoader, ["thumbnail.jpg"]);
const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateFxTexture] = useFxTexture({ size, dpr });
const [updateSimpleBlur] = useSimpleBlur({ size, dpr });

Expand Down
10 changes: 6 additions & 4 deletions .storybook/stories/UseWave.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ export const UseWave = (args: WaveParams) => {
const updateGUI = useGUI(setGUI);

const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateWave] = useWave({ size, dpr });

useFrame((props) => {
Expand All @@ -67,8 +68,9 @@ export const UseWave = (args: WaveParams) => {
export const UseWaveWithTexture = (args: WaveParams) => {
const updateGUI = useGUI(setGUI);
const fxRef = React.useRef<FxMaterialProps>();
const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});

const [updateWave] = useWave({ size, dpr });
const [updateFxTexture] = useFxTexture({ size, dpr });
Expand Down
5 changes: 3 additions & 2 deletions app/_home/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ export const Home = () => {
const updateGUI = useGUI(setGUI);
const mainShaderRef = useRef<FxTransparentMaterialProps>();

const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});

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

Expand Down
5 changes: 3 additions & 2 deletions app/domSyncer/DomSyncer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ export const DomSyncer = ({ state }: { state: number }) => {

const [momo] = useLoader(THREE.TextureLoader, ["momo.jpg"]);

const size = useThree((state) => state.size);
const dpr = useThree((state) => state.viewport.dpr);
const { size, dpr } = useThree((state) => {
return { size: state.size, dpr: state.viewport.dpr };
});

const [updateFxTexture, , fxTextureObj] = useFxTexture({ size, dpr });
const [updateWave] = useWave({ size, dpr });
Expand Down