Skip to content

Commit 4685768

Browse files
author
takuma-hmng8
committed
v1.1.37
1 parent f4b1a82 commit 4685768

File tree

98 files changed

+1796
-1635
lines changed

Some content is hidden

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

98 files changed

+1796
-1635
lines changed

app/stickers/StickerBall/useStickers.ts

+7-12
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,15 @@ const STICKER_TEXTURES = [
4040
"/stickers/webp/sticker7.webp",
4141
"/stickers/webp/sticker8.webp",
4242
"/stickers/webp/sticker9.webp",
43-
"/stickers/webp/sticker10.webp",
44-
"/stickers/webp/sticker11.webp",
45-
"/stickers/webp/sticker12.webp",
46-
"/stickers/webp/sticker13.webp",
47-
"/stickers/webp/sticker14.webp",
48-
"/stickers/webp/sticker15.webp",
49-
"/stickers/webp/sticker16.webp",
50-
"/stickers/webp/sticker17.webp",
51-
"/stickers/webp/sticker18.webp",
52-
"/stickers/webp/sticker19.webp",
5343
];
5444

5545
export const STICKER_TEXTURES_LENGTH = STICKER_TEXTURES.length;
5646

47+
const MAX_DPR = {
48+
sticker: 5,
49+
normal: 5,
50+
};
51+
5752
export const useStickers = (resizeBoundary: ResizeBoundary) => {
5853
const canvasState = CanvasState.getInstance();
5954

@@ -75,7 +70,7 @@ export const useStickers = (resizeBoundary: ResizeBoundary) => {
7570

7671
const [updateSticker, _, { output: stickerMap }] = useBlank({
7772
size,
78-
dpr: Math.min(resizeBoundary.maxDpr, 6),
73+
dpr: Math.min(resizeBoundary.maxDpr, MAX_DPR.sticker),
7974
isSizeUpdate: resizeBoundary.isUpdate,
8075
onBeforeInit: useCallback(
8176
(parameters: any) => {
@@ -127,7 +122,7 @@ export const useStickers = (resizeBoundary: ResizeBoundary) => {
127122

128123
const [updateNormal, __, { output: normalMap }] = useBlank({
129124
size,
130-
dpr: Math.min(resizeBoundary.maxDpr, 4),
125+
dpr: Math.min(resizeBoundary.maxDpr, MAX_DPR.normal),
131126
isSizeUpdate: resizeBoundary.isUpdate,
132127
onBeforeInit: useCallback(
133128
(shader: any) => {

app/stickers/UI/Cursor/Confetti.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const Confetti = ({ state }: { state: number }) => {
2222
{styles.map((style, i) => (
2323
<div className={s.confetti} key={i} style={style}>
2424
<Image
25-
src="/stickers/gif/gif3.gif"
25+
src="/stickers/gif/gif11.gif"
2626
fill
2727
alt=""
2828
unoptimized

app/stickers/romanticism/FxMaterial.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ export const FxMaterial = shaderMaterial(
7474
vec4 romanticColor = vec4(vec3(clamp(gamma * noise,0.,1.)),romance.a);
7575
7676
// mix
77-
gl_FragColor = mix(originalColor, romanticColor, sin(u_time)*0.5+0.5);
78-
// gl_FragColor = mix(originalColor, romanticColor, 0.);
77+
// gl_FragColor = mix(originalColor, romanticColor, sin(u_time)*0.5+0.5);
78+
gl_FragColor = mix(originalColor, romanticColor, 0.);
7979
}
8080
`
8181
);

0 commit comments

Comments
 (0)