Skip to content

Commit

Permalink
fix: model loading progress callback (was in v2) #122
Browse files Browse the repository at this point in the history
  • Loading branch information
brianzinn committed Feb 18, 2021
1 parent f77e210 commit a8c7fe2
Show file tree
Hide file tree
Showing 2 changed files with 200 additions and 168 deletions.
21 changes: 15 additions & 6 deletions src/customComponents/Model.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import { ILoadedModel } from "../hooks/loaders/loadedModel";
import { SceneLoaderOptions, useSceneLoader } from "../hooks/loaders/useSceneLoader";

export type ModelProps = {
/**
/**
* Only used on init. Will not update dynamically (scaling will update dynamically and override this)
* An array of mesh names, a single mesh name, or empty string for all meshes that filter what meshes are imported
*/
meshNames?: any
receiveShadows?: boolean
Expand All @@ -24,13 +25,21 @@ export type ModelProps = {
} & FiberAbstractMeshProps & FiberAbstractMeshPropsCtor;

const Model: React.FC<ModelProps> = (props: ModelProps) => {
const { alwaysSelectAsActiveMesh, onModelLoaded, pluginExtension, rootUrl, receiveShadows, reportProgress, scaleToDimension, sceneFilename, ...rest } = props;
const {
alwaysSelectAsActiveMesh, meshNames, onLoadProgress, onModelError, onModelLoaded, receiveShadows, reportProgress, scaleToDimension, // SceneLoaderOptions
rootUrl, sceneFilename, pluginExtension, // other parameters
...rest // passed on to "rootMesh"
} = props;

const options: SceneLoaderOptions = {
receiveShadows,
scaleToDimension,
alwaysSelectAsActiveMesh,
meshNames,
onLoadProgress,
onModelError,
onModelLoaded,
receiveShadows,
reportProgress,
onModelLoaded
scaleToDimension,
}
const sceneLoaderResults = useSceneLoader(rootUrl, sceneFilename, pluginExtension, options);

Expand All @@ -41,7 +50,7 @@ const Model: React.FC<ModelProps> = (props: ModelProps) => {
}
}, []);

return <abstractMesh fromInstance={sceneLoaderResults.rootMesh!} {...rest} />;
return <abstractMesh fromInstance={sceneLoaderResults.rootMesh!} {...rest} />;
}

export default Model;
Loading

0 comments on commit a8c7fe2

Please sign in to comment.