Commit 2f8927d

authored

Merge pull request #64 from takuma-hmng8/dev

Dev

2 parents c2b2e78 + 80f96c0 commit 2f8927dCopy full SHA for 2f8927d

File tree

+494

-444

lines changed

+494

-444

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export const ShaderFx = ({ children }: { children: React.ReactNode }) => {`
`16`	`16`	`setDpr(Math.round((0.5 + 1.0 * factor) * 10) / 10);`
`17`	`17`	`}}>`
`18`	`18`	`<Suspense fallback={null}>{children}</Suspense>`
`19`		`- {/* <Perf position={"bottom-left"} minimal={false} /> */}`
	`19`	`+ <Perf position={"bottom-left"} minimal={false} />`
`20`	`20`	`</PerformanceMonitor>`
`21`	`21`	`</Canvas>`
`22`	`22`	`);`

Lines changed: 10 additions & 26 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,32 +51,16 @@ export const DomSyncer = ({ state }: { state: number }) => {`
`51`	`51`	`);`
`52`	`52`
`53`	`53`	`const { setFrameloop } = useThree();`
`54`		`- const isPlaying = useRef<boolean>(true);`
`55`		`-`
`56`		`- useEffect(() => {`
`57`		`- let id: number;`
`58`		`- const filterIntersection = () => {`
`59`		`- if (domSyncerObj.intersections.some((item) => item)) {`
`60`		`- // どっかには交差してる`
`61`		`- if (!isPlaying.current) {`
`62`		`- setFrameloop("always");`
`63`		`- isPlaying.current = true;`
`64`		`- }`
`65`		`- } else {`
`66`		`- // どこにも交差してない`
`67`		`- if (isPlaying.current) {`
`68`		`- setFrameloop("never");`
`69`		`- isPlaying.current = false;`
`70`		`- }`
`71`		`- }`
`72`		`-`
`73`		`- id = requestAnimationFrame(filterIntersection);`
`74`		`- };`
`75`		`- id = requestAnimationFrame(filterIntersection);`
`76`		`- return () => {`
`77`		`- cancelAnimationFrame(id);`
`78`		`- };`
`79`		`- }, [domSyncerObj.intersections, setFrameloop]);`
	`54`	`+ domSyncerObj.useDomView({`
	`55`	`+ onView: () => {`
	`56`	`+ console.log("play");`
	`57`	`+ setFrameloop("always");`
	`58`	`+ },`
	`59`	`+ onHidden: () => {`
	`60`	`+ console.log("stop");`
	`61`	`+ setFrameloop("never");`
	`62`	`+ },`
	`63`	`+ });`
`80`	`64`
`81`	`65`	`const domArr = useRef<(HTMLElement \| Element)[]>([]);`
`82`	`66`	`const contentArr = useRef<HTMLElement[]>([]);`

Comments

(0)