Skip to content

merge useCosPallette #75

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
takuma-hmng8 merged 1 commit into from
Feb 27, 2024
Merged

merge useCosPallette #75

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
18 changes: 9 additions & 9 deletions .storybook/stories/UseCosPalette.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ import * as React from "react";
import * as THREE from "three";
import { useFrame, extend, useThree, useLoader } from "@react-three/fiber";
import { FxMaterial, FxMaterialProps } from "../../utils/fxMaterial";
import { CONSTANT } from "../constant";
import GUI from "lil-gui";
import { useGUI } from "../../utils/useGUI";
import { useCosPalette, useFxTexture } from "../../packages/use-shader-fx/src";
import {
useCosPalette,
useCoverTexture,
} from "../../packages/use-shader-fx/src";
import {
CosPaletteParams,
COSPALETTE_PARAMS,
} from "../../packages/use-shader-fx/src/hooks/useCosPalette";
} from "../../packages/use-shader-fx/src/fxs/noises/useCosPalette";

extend({ FxMaterial });

Expand All @@ -29,7 +31,6 @@ const setConfig = () => {
} as CosPaletteParams;
};


export const UseCosPalette = (args: CosPaletteParams) => {
const updateGUI = useGUI(setGUI);
const [bg] = useLoader(THREE.TextureLoader, ["momo.jpg"]);
Expand All @@ -39,15 +40,14 @@ export const UseCosPalette = (args: CosPaletteParams) => {
return { size: state.size, dpr: state.viewport.dpr };
});
const [updateCosPalette] = useCosPalette({ size, dpr });
const [updateFxTexture, setFxTexture] = useFxTexture({ size, dpr });
const [updateCover, setCover] = useCoverTexture({ size, dpr });

setFxTexture({
textureResolution: CONSTANT.textureResolution,
texture0: bg,
setCover({
texture: bg,
});

useFrame((props) => {
const tex = updateFxTexture(props);
const tex = updateCover(props);
const fx = updateCosPalette(props, {
...setConfig(),
texture: tex,
Expand Down
6 changes: 3 additions & 3 deletions .storybook/stories/useCosPalette.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import { Setup } from "../utils/Setup";
import type { Meta } from "@storybook/react";
import { UseCosPalette } from "./UseCosPalette";
import {
COSPALETTE_PARAMS,
CosPaletteParams,
} from "../../packages/use-shader-fx/src/hooks/useCosPalette";
COSPALETTE_PARAMS,
} from "../../packages/use-shader-fx/src/fxs/noises/useCosPalette";

const meta = {
title: "useCosPalette",
title: "noises/useCosPalette",
component: UseCosPalette,
tags: ["autodocs"],
decorators: [(storyFn: any) => <Setup>{storyFn()}</Setup>],
Expand Down
Loading