Skip to content

Commit 32257cd

Browse files
committed
fix: set loader name from OnPluginActivatedObservable
1 parent 56bc412 commit 32257cd

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

packages/react-babylonjs/src/hooks/loaders/loadedModel.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ export class LoadedModel implements ILoadedModel {
4848
public rootMesh?: Mesh
4949
public errorMessage?: string
5050
/**
51-
* Not supported anymore:
52-
* https://forum.babylonjs.com/t/potential-new-breaking-change-please-chime-in/54651/5
51+
* OnPluginActivatedObservable should set this correctly.
5352
*/
5453
public loaderName?: string
5554
public meshes?: AbstractMesh[]

packages/react-babylonjs/src/hooks/loaders/useSceneLoader.tsx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
1-
import { AnimationGroup } from '@babylonjs/core/Animations/animationGroup.js'
2-
import { Skeleton } from '@babylonjs/core/Bones/skeleton.js'
3-
import {
4-
ISceneLoaderPlugin,
5-
ISceneLoaderPluginAsync,
6-
ISceneLoaderProgressEvent,
7-
SceneLoader,
8-
} from '@babylonjs/core/Loading/sceneLoader.js'
9-
import { AbstractMesh } from '@babylonjs/core/Meshes/abstractMesh.js'
1+
import { ISceneLoaderProgressEvent, SceneLoader } from '@babylonjs/core/Loading/sceneLoader.js'
102
import { Mesh } from '@babylonjs/core/Meshes/mesh.js'
11-
import { IParticleSystem } from '@babylonjs/core/Particles/IParticleSystem.js'
123
import { Scene } from '@babylonjs/core/scene.js'
134
import { Nullable } from '@babylonjs/core/types.js'
145
import React, { useContext, useState } from 'react'
@@ -158,7 +149,12 @@ const useSceneLoaderWithCache = (): ((
158149
const loadedModel = new LoadedModel()
159150

160151
loadedModel.status = LoaderStatus.Loading
161-
loadedModel.loaderName = 'no longer supported /BabylonJS/Babylon.js/pull/15798'
152+
153+
// /BabylonJS/Babylon.js/pull/15798
154+
// NOTE: consider making this callback available as a prop
155+
SceneLoader.OnPluginActivatedObservable.addOnce((callback) => {
156+
loadedModel.loaderName = callback.name
157+
})
162158

163159
/* const loader: Nullable<ISceneLoaderPlugin | ISceneLoaderPluginAsync> = */
164160
SceneLoader.ImportMeshAsync(
@@ -246,7 +242,6 @@ const useSceneLoaderWithCache = (): ((
246242
}
247243
reject(error)
248244
})
249-
loadedModel.loaderName = 'Not supported for backwards compat'
250245
})
251246

252247
let result: LoadedModel

0 commit comments

Comments
 (0)