Skip to content

V1.1.28 #116

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 3 commits into from
May 13, 2024
Merged

V1.1.28 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f6d40d
updateDependencies
May 13, 2024
14f2f0d
fix:types
May 13, 2024
29b0cc5
fix:types
May 13, 2024
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
23 changes: 13 additions & 10 deletions app/_home/Playground.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,21 +112,22 @@ export const Playground = ({
}),
[hsv, marble]
),
onBeforeCompile: useCallback((shader: THREE.Shader) => {
shader.fragmentShader = shader.fragmentShader.replace(
"#usf <uniforms>",
`
onBeforeCompile: useCallback(
(shader: THREE.WebGLProgramParametersWithUniforms) => {
shader.fragmentShader = shader.fragmentShader.replace(
"#usf <uniforms>",
`
uniform sampler2D u_noise;
uniform float u_noiseIntensity;
uniform sampler2D u_colorStrata;
float rand(vec2 n) {
return fract(sin(dot(n ,vec2(12.9898,78.233))) * 43758.5453);
}
`
);
shader.fragmentShader = shader.fragmentShader.replace(
"#usf <main>",
`
);
shader.fragmentShader = shader.fragmentShader.replace(
"#usf <main>",
`
vec2 uv = vUv;
float grain=rand(uv+sin(uTime))*.4;
grain=grain*.5+.5;
Expand All @@ -135,8 +136,10 @@ export const Playground = ({
vec4 colorStrata = texture2D(u_colorStrata,uv);
usf_FragColor = colorStrata*grain;
`
);
}, []),
);
},
[]
),
});

// set fxs
Expand Down
73 changes: 73 additions & 0 deletions app/bananaStickers/Playground.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
"use client";

import { Environment } from "@react-three/drei";
import { useStickers } from "./useStickers";

export const Playground = () => {
const { sticker, setStickerState } = useStickers();

return (
<mesh
// geometry={balloon.nodes.ball.geometry}
onClick={(e) => {
setStickerState(e.uv!);
}}>
<Environment preset="city" />
<icosahedronGeometry args={[2, 20]} />
<meshPhysicalMaterial
map={sticker}
// ここからの設定はmapのalphaを乗算することでmapだけに適用される仕組み
roughness={1}
clearcoat={1}
iridescence={1}
metalness={1}
iridescenceIOR={1}
iridescenceThicknessRange={[0, 1400]}
// ここまで
// onBeforeCompile={(shader) => {
// //mapのalphaをfloat変数に格納;
// shader.fragmentShader = shader.fragmentShader.replace(
// "#include <map_fragment>",
// `
// #include <map_fragment>
// float customMapAlpha = sampledDiffuseColor.a;
// `
// );
// // iridescenceにmapのalphaをかける（mapだけiridescenceする）
// shader.fragmentShader = shader.fragmentShader.replace(
// "#include <lights_fragment_begin>",
// `
// #include <lights_fragment_begin>
// material.iridescenceFresnel *= customMapAlpha;
// material.iridescenceF0 *= customMapAlpha;
// `
// );
// // クリアコートにmapのalphaをかける（mapだけclearcoatする）
// shader.fragmentShader = shader.fragmentShader.replace(
// "outgoingLight = outgoingLight * ( 1.0 - material.clearcoat * Fcc ) + ( clearcoatSpecularDirect + clearcoatSpecularIndirect ) * material.clearcoat;",
// `
// outgoingLight = outgoingLight * ( 1.0 - material.clearcoat * Fcc ) + ( clearcoatSpecularDirect + clearcoatSpecularIndirect ) * material.clearcoat * customMapAlpha;
// `
// );
// // roughnessにmapのalphaをかける（mapだけroughnessする）
// shader.fragmentShader = shader.fragmentShader.replace(
// "#include <lights_physical_fragment>",
// `
// #include <lights_physical_fragment>
// material.roughness = clamp(material.roughness * customMapAlpha,.24,1.);
// `
// );
// // metalnessにmapのalphaをかける（mapだけmetalnessする。あるいは強くする）
// shader.fragmentShader = shader.fragmentShader.replace(
// "#include <metalnessmap_fragment>",
// `
// #include <metalnessmap_fragment>
// metalnessFactor *= customMapAlpha;
// `
// );
// console.log(shader.fragmentShader);
// }}
/>
</mesh>
);
};
19 changes: 19 additions & 0 deletions app/bananaStickers/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { Suspense } from "react";
import { ShaderFx } from "../ShaderFx";
import { Playground } from "./Playground";

export default function Page() {
return (
<div
style={{
position: "fixed",
width: "100%",
height: "100svh",
pointerEvents: "none",
}}>
<ShaderFx isDprUpdate={false}>
<Playground />
</ShaderFx>
</div>
);
}
121 changes: 121 additions & 0 deletions app/bananaStickers/useStickers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
import * as THREE from "three";
import { useMemo, useCallback, useReducer } from "react";
import { useFrame, useThree, useLoader } from "@react-three/fiber";
import { useBlank } from "@/packages/use-shader-fx/src";

type StickersState = {
point: THREE.Vector2;
sticker?: THREE.Texture;
size?: number;
};

const STICKERSIZE = {
min: 0.04,
max: 0.1,
};

export const useStickers = () => {
const stickers = useLoader(THREE.TextureLoader, [
"/stickers/sticker0.png",
"/stickers/sticker1.png",
"/stickers/sticker2.png",
"/stickers/sticker3.png",
"/stickers/sticker4.png",
"/stickers/sticker5.png",
"/stickers/sticker6.png",
"/stickers/sticker8.png",
"/stickers/sticker9.png",
"/stickers/sticker10.png",
"/stickers/sticker11.png",
"/stickers/sticker12.png",
"/stickers/sticker13.png",
"/stickers/sticker14.png",
"/stickers/sticker15.png",
"/stickers/sticker16.png",
]);
const { size } = useThree();

const [updateBlank, _, { output: sticker }] = useBlank({
size,
dpr: 4,
uniforms: useMemo(
() => ({
uStampPoint: {
value: new THREE.Vector2(0),
},
uRandomSize: {
value: STICKERSIZE.min,
},
}),
[]
),
onBeforeCompile: useCallback((shader: any) => {
shader.fragmentShader = shader.fragmentShader.replace(
"#usf <uniforms>",
`
uniform vec2 uStampPoint;
uniform float uRandomSize;
`
);

shader.fragmentShader = shader.fragmentShader.replace(
"#usf <main>",
`
vec2 uv = vUv;
vec2 stamp = uStampPoint;

// バッファー取得
vec4 backColor = texture2D(uBackbuffer,uv);

uv.x *= 2.;
stamp.x *= 2.;

// 距離と半径
float d = distance(uv, stamp);
float r = uRandomSize;

// スタンプ
vec4 stampColor = texture2D(uTexture,(uv-stamp)/(r*2.)+.5);

// 最終色
vec4 finalColor = d<r ? mix(backColor,stampColor,stampColor.a) : backColor;

usf_FragColor = finalColor;
`
);
}, []),
});

const [stickerState, setStickerState] = useReducer(
(state: StickersState, point: THREE.Vector2): StickersState => {
return {
...state,
point: point,
sticker: stickers[Math.floor(Math.random() * stickers.length)],
size:
Math.random() * (STICKERSIZE.max - STICKERSIZE.min) +
STICKERSIZE.min,
};
},
{
point: new THREE.Vector2(0, 0),
sticker: stickers[0],
size: STICKERSIZE.max,
}
);

useFrame((state) => {
updateBlank(
state,
{
texture: stickerState.sticker,
},
{
uStampPoint: stickerState.point,
uRandomSize: stickerState.size,
}
);
});

return { sticker, setStickerState };
};
Loading