Skip to content

Commit 9d50c82

Browse files
authored
Merge pull request #75 from FunTechInc/mergeCosPallet
merge useCosPallette
2 parents 548109b + 39810ba commit 9d50c82

File tree

52 files changed

+587
-404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+587
-404
lines changed

.storybook/stories/UseCosPalette.tsx

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@ import * as React from "react";
22
import * as THREE from "three";
33
import { useFrame, extend, useThree, useLoader } from "@react-three/fiber";
44
import { FxMaterial, FxMaterialProps } from "../../utils/fxMaterial";
5-
import { CONSTANT } from "../constant";
65
import GUI from "lil-gui";
76
import { useGUI } from "../../utils/useGUI";
8-
import { useCosPalette, useFxTexture } from "../../packages/use-shader-fx/src";
7+
import {
8+
useCosPalette,
9+
useCoverTexture,
10+
} from "../../packages/use-shader-fx/src";
911
import {
1012
CosPaletteParams,
1113
COSPALETTE_PARAMS,
12-
} from "../../packages/use-shader-fx/src/hooks/useCosPalette";
14+
} from "../../packages/use-shader-fx/src/fxs/noises/useCosPalette";
1315

1416
extend({ FxMaterial });
1517

@@ -29,7 +31,6 @@ const setConfig = () => {
2931
} as CosPaletteParams;
3032
};
3133

32-
3334
export const UseCosPalette = (args: CosPaletteParams) => {
3435
const updateGUI = useGUI(setGUI);
3536
const [bg] = useLoader(THREE.TextureLoader, ["momo.jpg"]);
@@ -39,15 +40,14 @@ export const UseCosPalette = (args: CosPaletteParams) => {
3940
return { size: state.size, dpr: state.viewport.dpr };
4041
});
4142
const [updateCosPalette] = useCosPalette({ size, dpr });
42-
const [updateFxTexture, setFxTexture] = useFxTexture({ size, dpr });
43+
const [updateCover, setCover] = useCoverTexture({ size, dpr });
4344

44-
setFxTexture({
45-
textureResolution: CONSTANT.textureResolution,
46-
texture0: bg,
45+
setCover({
46+
texture: bg,
4747
});
4848

4949
useFrame((props) => {
50-
const tex = updateFxTexture(props);
50+
const tex = updateCover(props);
5151
const fx = updateCosPalette(props, {
5252
...setConfig(),
5353
texture: tex,

.storybook/stories/useCosPalette.stories.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import { Setup } from "../utils/Setup";
55
import type { Meta } from "@storybook/react";
66
import { UseCosPalette } from "./UseCosPalette";
77
import {
8-
COSPALETTE_PARAMS,
98
CosPaletteParams,
10-
} from "../../packages/use-shader-fx/src/hooks/useCosPalette";
9+
COSPALETTE_PARAMS,
10+
} from "../../packages/use-shader-fx/src/fxs/noises/useCosPalette";
1111

1212
const meta = {
13-
title: "useCosPalette",
13+
title: "noises/useCosPalette",
1414
component: UseCosPalette,
1515
tags: ["autodocs"],
1616
decorators: [(storyFn: any) => <Setup>{storyFn()}</Setup>],

0 commit comments

Comments
 (0)