Feat/map-environment #6
@@ -3,6 +3,7 @@ import type { RefObject } from "react";
|
|||||||
import type { Object3D } from "three";
|
import type { Object3D } from "three";
|
||||||
import { Octree } from "three/addons/math/Octree.js";
|
import { Octree } from "three/addons/math/Octree.js";
|
||||||
import type { OctreeReadyHandler } from "@/types/three/three";
|
import type { OctreeReadyHandler } from "@/types/three/three";
|
||||||
|
import { logger } from "@/utils/core/Logger";
|
||||||
|
|
||||||
export function useOctreeGraphNode(
|
export function useOctreeGraphNode(
|
||||||
graphNodeRef: RefObject<Object3D | null>,
|
graphNodeRef: RefObject<Object3D | null>,
|
||||||
@@ -17,16 +18,25 @@ export function useOctreeGraphNode(
|
|||||||
}, [rebuildKey]);
|
}, [rebuildKey]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
logger.debug("useOctreeGraphNode", "Check", {
|
||||||
|
enabled,
|
||||||
|
octreeBuilt: octreeBuilt.current,
|
||||||
|
hasGraphNode: !!graphNodeRef.current,
|
||||||
|
rebuildKey,
|
||||||
|
});
|
||||||
|
|
||||||
if (!enabled) return;
|
if (!enabled) return;
|
||||||
|
|
||||||
const graphNode = graphNodeRef.current;
|
const graphNode = graphNodeRef.current;
|
||||||
if (!enabled || octreeBuilt.current || !graphNode) return;
|
if (!enabled || octreeBuilt.current || !graphNode) return;
|
||||||
octreeBuilt.current = true;
|
octreeBuilt.current = true;
|
||||||
|
|
||||||
|
logger.info("useOctreeGraphNode", "Building octree from graph node");
|
||||||
graphNode.updateMatrixWorld(true);
|
graphNode.updateMatrixWorld(true);
|
||||||
|
|
||||||
const octree = new Octree();
|
const octree = new Octree();
|
||||||
octree.fromGraphNode(graphNode);
|
octree.fromGraphNode(graphNode);
|
||||||
|
logger.info("useOctreeGraphNode", "Octree built, calling onOctreeReady");
|
||||||
onOctreeReady(octree);
|
onOctreeReady(octree);
|
||||||
}, [enabled, graphNodeRef, onOctreeReady, rebuildKey]);
|
}, [enabled, graphNodeRef, onOctreeReady, rebuildKey]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useState } from "react";
|
|||||||
import type { Octree } from "three/addons/math/Octree.js";
|
import type { Octree } from "three/addons/math/Octree.js";
|
||||||
import type { SceneMode } from "@/types/debug/debug";
|
import type { SceneMode } from "@/types/debug/debug";
|
||||||
import type { SceneLoadingChangeHandler } from "@/types/world/sceneLoading";
|
import type { SceneLoadingChangeHandler } from "@/types/world/sceneLoading";
|
||||||
|
import { logger } from "@/utils/core/Logger";
|
||||||
|
|
||||||
interface UseWorldSceneLoadingOptions {
|
interface UseWorldSceneLoadingOptions {
|
||||||
onLoadingStateChange?: SceneLoadingChangeHandler | undefined;
|
onLoadingStateChange?: SceneLoadingChangeHandler | undefined;
|
||||||
@@ -31,10 +32,12 @@ export function useWorldSceneLoading({
|
|||||||
(sceneMode === "physics" && octree !== null);
|
(sceneMode === "physics" && octree !== null);
|
||||||
|
|
||||||
const handleGameMapLoaded = useCallback(() => {
|
const handleGameMapLoaded = useCallback(() => {
|
||||||
|
logger.info("WorldSceneLoading", "GameMap loaded");
|
||||||
setGameMapLoaded(true);
|
setGameMapLoaded(true);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const handleGameStageLoaded = useCallback(() => {
|
const handleGameStageLoaded = useCallback(() => {
|
||||||
|
logger.info("WorldSceneLoading", "GameStage loaded");
|
||||||
setGameStageLoaded(true);
|
setGameStageLoaded(true);
|
||||||
onLoadingStateChange?.({
|
onLoadingStateChange?.({
|
||||||
currentStep: "Initialisation gameplay",
|
currentStep: "Initialisation gameplay",
|
||||||
@@ -45,6 +48,7 @@ export function useWorldSceneLoading({
|
|||||||
|
|
||||||
const handleOctreeReady = useCallback(
|
const handleOctreeReady = useCallback(
|
||||||
(nextOctree: Octree) => {
|
(nextOctree: Octree) => {
|
||||||
|
logger.info("WorldSceneLoading", "Octree ready");
|
||||||
setOctree(nextOctree);
|
setOctree(nextOctree);
|
||||||
onLoadingStateChange?.({
|
onLoadingStateChange?.({
|
||||||
currentStep: "Collision prête",
|
currentStep: "Collision prête",
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import { useOctreeGraphNode } from "@/hooks/three/useOctreeGraphNode";
|
|||||||
import type { MapNode } from "@/types/editor/editor";
|
import type { MapNode } from "@/types/editor/editor";
|
||||||
import type { OctreeReadyHandler } from "@/types/three/three";
|
import type { OctreeReadyHandler } from "@/types/three/three";
|
||||||
import type { SceneLoadingChangeHandler } from "@/types/world/sceneLoading";
|
import type { SceneLoadingChangeHandler } from "@/types/world/sceneLoading";
|
||||||
|
import { logger } from "@/utils/core/Logger";
|
||||||
import { logModelLoadError } from "@/utils/three/modelLoadLogger";
|
import { logModelLoadError } from "@/utils/three/modelLoadLogger";
|
||||||
|
|
||||||
export interface GameMapCollisionNode {
|
export interface GameMapCollisionNode {
|
||||||
@@ -108,6 +109,14 @@ export function GameMapCollision({
|
|||||||
const collisionReady =
|
const collisionReady =
|
||||||
mapReady && settledCollisionNodeCount >= collisionNodes.length;
|
mapReady && settledCollisionNodeCount >= collisionNodes.length;
|
||||||
|
|
||||||
|
logger.debug("GameMapCollision", "State", {
|
||||||
|
mapReady,
|
||||||
|
collisionNodesCount: collisionNodes.length,
|
||||||
|
settledCollisionNodeCount,
|
||||||
|
collisionReady,
|
||||||
|
buildOctree,
|
||||||
|
});
|
||||||
|
|
||||||
const notifyLoaded = useCallback(() => {
|
const notifyLoaded = useCallback(() => {
|
||||||
if (loadedNotifiedRef.current) return;
|
if (loadedNotifiedRef.current) return;
|
||||||
|
|
||||||
@@ -124,6 +133,7 @@ export function GameMapCollision({
|
|||||||
|
|
||||||
const handleOctreeReady = useCallback<OctreeReadyHandler>(
|
const handleOctreeReady = useCallback<OctreeReadyHandler>(
|
||||||
(octree) => {
|
(octree) => {
|
||||||
|
logger.info("GameMapCollision", "Octree built, calling onOctreeReady");
|
||||||
onLoadingStateChange?.({
|
onLoadingStateChange?.({
|
||||||
currentStep: "Collision prête",
|
currentStep: "Collision prête",
|
||||||
progress: 0.92,
|
progress: 0.92,
|
||||||
|
|||||||
Reference in New Issue
Block a user