Revert "Initialize studio controller refs before UI boot"
This reverts commit 091c0102da.
This commit is contained in:
parent
31f7018204
commit
a3588b157c
2 changed files with 14 additions and 24 deletions
|
|
@ -4755,16 +4755,14 @@ export function startWorldshaperStudio(bootstrap: WorldshaperStudioBootstrap, in
|
|||
worldRuntimeState,
|
||||
syncWorldNeighborhoodForViewport,
|
||||
drawNow,
|
||||
setControllerRefs: (controllerRefs) => {
|
||||
historyController = controllerRefs.historyController;
|
||||
npcController = controllerRefs.npcController;
|
||||
sidebarController = controllerRefs.sidebarController;
|
||||
renderController = controllerRefs.renderController;
|
||||
persistenceController = controllerRefs.persistenceController;
|
||||
importController = controllerRefs.importController;
|
||||
interactionController = controllerRefs.interactionController;
|
||||
},
|
||||
});
|
||||
historyController = runtimeControllerBootstrap.historyController;
|
||||
npcController = runtimeControllerBootstrap.npcController;
|
||||
sidebarController = runtimeControllerBootstrap.sidebarController;
|
||||
renderController = runtimeControllerBootstrap.renderController;
|
||||
persistenceController = runtimeControllerBootstrap.persistenceController;
|
||||
importController = runtimeControllerBootstrap.importController;
|
||||
interactionController = runtimeControllerBootstrap.interactionController;
|
||||
statusLogWindowController = runtimeControllerBootstrap.statusLogWindowController;
|
||||
runtimeLogging.setStatusLogWindowController(statusLogWindowController);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ export function initializeRuntimeControllers(config) {
|
|||
worldRuntimeState,
|
||||
syncWorldNeighborhoodForViewport,
|
||||
drawNow,
|
||||
setControllerRefs,
|
||||
} = config;
|
||||
|
||||
const toolWindowController = createToolWindowController(scope);
|
||||
|
|
@ -151,19 +150,6 @@ export function initializeRuntimeControllers(config) {
|
|||
const persistenceController = createPersistenceController(scope);
|
||||
const importController = createImportController(scope);
|
||||
const interactionController = createInteractionController(scope);
|
||||
const controllerRefs = {
|
||||
historyController,
|
||||
npcController,
|
||||
sidebarController,
|
||||
renderController,
|
||||
persistenceController,
|
||||
importController,
|
||||
interactionController,
|
||||
};
|
||||
|
||||
if (typeof setControllerRefs === "function") {
|
||||
setControllerRefs(controllerRefs);
|
||||
}
|
||||
|
||||
const persistPopupBoundsDeferred = createDebouncedCallback(() => {
|
||||
persistPopupBounds();
|
||||
|
|
@ -207,7 +193,13 @@ export function initializeRuntimeControllers(config) {
|
|||
});
|
||||
|
||||
return {
|
||||
...controllerRefs,
|
||||
historyController,
|
||||
npcController,
|
||||
sidebarController,
|
||||
renderController,
|
||||
persistenceController,
|
||||
importController,
|
||||
interactionController,
|
||||
statusLogWindowController,
|
||||
changelogSplashWindowController,
|
||||
persistPopupBoundsDeferred,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue