From 72506461ab8e8302eae19952c08bc0c313d240ff Mon Sep 17 00:00:00 2001 From: Daan Vanden Bosch Date: Wed, 21 Aug 2019 17:56:46 +0200 Subject: [PATCH] Swapped code using new and old UI system around. --- assets_generation/update_drops_ephinea.ts | 4 +- assets_generation/update_ephinea_data.ts | 4 +- .../application/gui/ApplicationView.ts | 0 .../application/gui/MainContentView.ts | 0 .../application/gui/NavigationView.css | 0 .../application/gui/NavigationView.ts | 0 src/application/stores/ApplicationStore.ts | 39 --- src/application/ui/ApplicationComponent.css | 48 --- src/application/ui/ApplicationComponent.tsx | 86 ----- src/core/data_formats/parsing/quest/bin.ts | 10 +- src/core/data_formats/parsing/quest/index.ts | 4 +- src/{new => }/core/gui/Button.css | 0 src/{new => }/core/gui/Button.ts | 0 src/{new => }/core/gui/CheckBox.ts | 0 src/{new => }/core/gui/Control.ts | 0 src/{new => }/core/gui/FileButton.css | 0 src/{new => }/core/gui/FileButton.ts | 0 src/{new => }/core/gui/Input.css | 0 src/{new => }/core/gui/Label.css | 0 src/{new => }/core/gui/Label.ts | 0 src/{new => }/core/gui/LabelledControl.ts | 0 src/{new => }/core/gui/LazyView.ts | 0 src/{new => }/core/gui/NumberInput.css | 0 src/{new => }/core/gui/NumberInput.ts | 4 +- src/{new => }/core/gui/RendererView.ts | 11 +- src/{new => }/core/gui/Resizable.ts | 0 src/{new => }/core/gui/ResizableView.ts | 0 src/{new => }/core/gui/TabContainer.css | 0 src/{new => }/core/gui/TabContainer.ts | 0 src/{new => }/core/gui/ToolBar.css | 0 src/{new => }/core/gui/ToolBar.ts | 0 src/{new => }/core/gui/View.ts | 0 src/{new => }/core/gui/dom.ts | 0 src/{new => }/core/observable/Disposable.ts | 0 src/{new => }/core/observable/Emitter.ts | 0 .../core/observable/MappedProperty.ts | 0 src/{new => }/core/observable/Observable.ts | 0 src/{new => }/core/observable/Property.ts | 6 +- .../core/observable/SimpleEmitter.ts | 0 .../core/observable/SimpleProperty.ts | 0 .../core/observable/WritableProperty.ts | 0 src/{new => }/core/observable/index.ts | 0 src/core/rendering/Renderer.ts | 1 + src/{new => }/core/stores/GuiStore.ts | 0 src/{new => }/index.css | 0 src/{new => }/index.ts | 26 +- src/index.tsx | 41 --- src/new/viewer/rendering/ModelRenderer.ts | 216 ------------ src/{ => old}/core/Loadable.ts | 0 src/{ => old}/core/domain/index.ts | 2 +- src/{ => old}/core/domain/items.ts | 0 src/{ => old}/core/dto.ts | 0 src/{ => old}/core/persistence.ts | 0 src/{ => old}/core/primitive_conversion.ts | 0 src/{ => old}/core/stores/ItemTypeStore.ts | 0 src/{ => old}/core/stores/ServerMap.ts | 5 +- src/{ => old}/core/ui/BigSelect.css | 0 src/{ => old}/core/ui/BigSelect.tsx | 0 src/{ => old}/core/ui/BigTable.css | 0 src/{ => old}/core/ui/BigTable.tsx | 0 .../core/ui/DisabledTextComponent.css | 0 .../core/ui/DisabledTextComponent.tsx | 0 src/{ => old}/core/ui/ErrorBoundary.css | 0 src/{ => old}/core/ui/ErrorBoundary.tsx | 0 src/{ => old}/core/ui/NumberInput.tsx | 0 src/{ => old}/core/ui/RendererComponent.tsx | 2 +- src/{ => old}/core/ui/SectionIdIcon.tsx | 0 src/{ => old}/core/ui/TextArea.tsx | 0 src/{ => old}/core/ui/TextInput.tsx | 0 src/{ => old}/core/ui/index.css | 0 src/{ => old}/core/ui/time.ts | 0 src/{ => old}/core/undo.test.ts | 0 src/{ => old}/core/undo.ts | 0 src/{ => old}/dps_calc/stores/DpsCalcStore.ts | 0 .../dps_calc/ui/DpsCalcComponent.tsx | 0 src/{ => old}/hunt_optimizer/domain/index.ts | 4 +- .../persistence/HuntMethodPersister.ts | 0 .../persistence/HuntOptimizerPersister.ts | 0 .../hunt_optimizer/stores/HuntMethodStore.ts | 2 +- .../stores/HuntOptimizerStore.ts | 15 +- .../hunt_optimizer/stores/ItemDropStore.ts | 2 +- .../ui/HuntOptimizerComponent.css | 0 .../ui/HuntOptimizerComponent.tsx | 0 .../hunt_optimizer/ui/MethodsComponent.css | 0 .../hunt_optimizer/ui/MethodsComponent.tsx | 4 +- .../ui/OptimizationResultComponent.css | 0 .../ui/OptimizationResultComponent.tsx | 2 +- .../hunt_optimizer/ui/OptimizerComponent.css | 0 .../hunt_optimizer/ui/OptimizerComponent.tsx | 0 .../ui/WantedItemsComponent.css | 0 .../ui/WantedItemsComponent.tsx | 0 .../quest_editor/domain/ObservableArea.ts | 0 .../domain/ObservableAreaVariant.ts | 0 .../quest_editor/domain/ObservableQuest.ts | 4 +- src/{ => old}/quest_editor/domain/Section.ts | 2 +- .../domain/observable_quest_entities.ts | 8 +- .../quest_editor/loading/LoadingCache.ts | 0 src/{ => old}/quest_editor/loading/areas.ts | 12 +- .../quest_editor/loading/entities.ts | 18 +- .../persistence/QuestEditorUiPersister.ts | 0 .../rendering/QuestEntityControls.ts | 2 +- .../rendering/QuestModelManager.ts | 0 .../quest_editor/rendering/QuestRenderer.ts | 2 +- .../rendering/conversion/areas.ts | 8 +- .../rendering/conversion/entities.ts | 6 +- .../scripting/AssemblyAnalyser.ts | 0 .../scripting/AssemblyLexer.test.ts | 0 .../quest_editor/scripting/AssemblyLexer.ts | 0 .../quest_editor/scripting/assembly.test.ts | 0 .../quest_editor/scripting/assembly.ts | 0 .../quest_editor/scripting/assembly_worker.ts | 0 .../scripting/assembly_worker_messages.ts | 0 .../ControlFlowGraph.test.ts | 0 .../data_flow_analysis/ControlFlowGraph.ts | 0 .../data_flow_analysis/ValueSet.test.ts | 0 .../scripting/data_flow_analysis/ValueSet.ts | 0 .../data_flow_analysis/register_value.test.ts | 0 .../data_flow_analysis/register_value.ts | 0 .../data_flow_analysis/stack_value.ts | 0 .../scripting/disassembly.test.ts | 10 +- .../quest_editor/scripting/disassembly.ts | 0 .../quest_editor/scripting/instructions.ts | 0 .../quest_editor/scripting/opcodes.ts | 0 .../quest_editor/scripting/vm/index.ts | 0 .../quest_editor/stores/AreaStore.ts | 4 +- .../quest_editor/stores/QuestEditorStore.ts | 43 ++- .../quest_editor/stores/quest_creation.ts | 8 +- .../quest_editor/ui/AddObjectComponent.tsx | 2 +- .../ui/AssemblyEditorComponent.css | 0 .../ui/AssemblyEditorComponent.tsx | 0 .../quest_editor/ui/EntityInfoComponent.css | 0 .../quest_editor/ui/EntityInfoComponent.tsx | 4 +- .../quest_editor/ui/NpcCountsComponent.css | 0 .../quest_editor/ui/NpcCountsComponent.tsx | 2 +- .../quest_editor/ui/QuestEditorComponent.css | 0 .../quest_editor/ui/QuestEditorComponent.tsx | 0 .../quest_editor/ui/QuestInfoComponent.css | 0 .../quest_editor/ui/QuestInfoComponent.tsx | 2 +- .../ui/QuestRendererComponent.tsx | 0 src/{ => old}/quest_editor/ui/Toolbar.css | 0 src/{ => old}/quest_editor/ui/Toolbar.tsx | 2 +- .../viewer/domain/CharacterClassAnimation.ts | 0 .../viewer/domain/CharacterClassModel.ts | 0 src/viewer/domain/index.ts | 12 - src/{new => }/viewer/gui/ModelView.css | 0 src/{new => }/viewer/gui/ModelView.ts | 15 +- src/{new => }/viewer/gui/TextureView.ts | 0 src/{new => }/viewer/gui/ViewerView.ts | 0 src/viewer/loading/character_class.ts | 6 +- src/viewer/rendering/ModelRenderer.ts | 232 +++++++++--- src/viewer/rendering/TextureRenderer.ts | 117 ------- src/{new => }/viewer/stores/ModelStore.ts | 36 +- src/viewer/stores/ModelViewerStore.ts | 329 ------------------ src/viewer/stores/TextureViewerStore.ts | 24 -- src/viewer/ui/ViewerComponent.css | 23 -- src/viewer/ui/ViewerComponent.tsx | 22 -- .../ui/models/AnimationSelectionComponent.css | 25 -- .../ui/models/AnimationSelectionComponent.tsx | 32 -- .../ui/models/ModelSelectionComponent.css | 15 - .../ui/models/ModelSelectionComponent.tsx | 43 --- src/viewer/ui/models/ModelViewerComponent.css | 35 -- src/viewer/ui/models/ModelViewerComponent.tsx | 116 ------ .../ui/textures/TextureViewerComponent.css | 14 - .../ui/textures/TextureViewerComponent.tsx | 60 ---- webpack.common.js | 2 +- 165 files changed, 347 insertions(+), 1488 deletions(-) rename src/{new => }/application/gui/ApplicationView.ts (100%) rename src/{new => }/application/gui/MainContentView.ts (100%) rename src/{new => }/application/gui/NavigationView.css (100%) rename src/{new => }/application/gui/NavigationView.ts (100%) delete mode 100644 src/application/stores/ApplicationStore.ts delete mode 100644 src/application/ui/ApplicationComponent.css delete mode 100644 src/application/ui/ApplicationComponent.tsx rename src/{new => }/core/gui/Button.css (100%) rename src/{new => }/core/gui/Button.ts (100%) rename src/{new => }/core/gui/CheckBox.ts (100%) rename src/{new => }/core/gui/Control.ts (100%) rename src/{new => }/core/gui/FileButton.css (100%) rename src/{new => }/core/gui/FileButton.ts (100%) rename src/{new => }/core/gui/Input.css (100%) rename src/{new => }/core/gui/Label.css (100%) rename src/{new => }/core/gui/Label.ts (100%) rename src/{new => }/core/gui/LabelledControl.ts (100%) rename src/{new => }/core/gui/LazyView.ts (100%) rename src/{new => }/core/gui/NumberInput.css (100%) rename src/{new => }/core/gui/NumberInput.ts (93%) rename src/{new => }/core/gui/RendererView.ts (71%) rename src/{new => }/core/gui/Resizable.ts (100%) rename src/{new => }/core/gui/ResizableView.ts (100%) rename src/{new => }/core/gui/TabContainer.css (100%) rename src/{new => }/core/gui/TabContainer.ts (100%) rename src/{new => }/core/gui/ToolBar.css (100%) rename src/{new => }/core/gui/ToolBar.ts (100%) rename src/{new => }/core/gui/View.ts (100%) rename src/{new => }/core/gui/dom.ts (100%) rename src/{new => }/core/observable/Disposable.ts (100%) rename src/{new => }/core/observable/Emitter.ts (100%) rename src/{new => }/core/observable/MappedProperty.ts (100%) rename src/{new => }/core/observable/Observable.ts (100%) rename src/{new => }/core/observable/Property.ts (58%) rename src/{new => }/core/observable/SimpleEmitter.ts (100%) rename src/{new => }/core/observable/SimpleProperty.ts (100%) rename src/{new => }/core/observable/WritableProperty.ts (100%) rename src/{new => }/core/observable/index.ts (100%) rename src/{new => }/core/stores/GuiStore.ts (100%) rename src/{new => }/index.css (100%) rename src/{new => }/index.ts (53%) delete mode 100644 src/index.tsx delete mode 100644 src/new/viewer/rendering/ModelRenderer.ts rename src/{ => old}/core/Loadable.ts (100%) rename src/{ => old}/core/domain/index.ts (91%) rename src/{ => old}/core/domain/items.ts (100%) rename src/{ => old}/core/dto.ts (100%) rename src/{ => old}/core/persistence.ts (100%) rename src/{ => old}/core/primitive_conversion.ts (100%) rename src/{ => old}/core/stores/ItemTypeStore.ts (100%) rename src/{ => old}/core/stores/ServerMap.ts (70%) rename src/{ => old}/core/ui/BigSelect.css (100%) rename src/{ => old}/core/ui/BigSelect.tsx (100%) rename src/{ => old}/core/ui/BigTable.css (100%) rename src/{ => old}/core/ui/BigTable.tsx (100%) rename src/{ => old}/core/ui/DisabledTextComponent.css (100%) rename src/{ => old}/core/ui/DisabledTextComponent.tsx (100%) rename src/{ => old}/core/ui/ErrorBoundary.css (100%) rename src/{ => old}/core/ui/ErrorBoundary.tsx (100%) rename src/{ => old}/core/ui/NumberInput.tsx (100%) rename src/{ => old}/core/ui/RendererComponent.tsx (95%) rename src/{ => old}/core/ui/SectionIdIcon.tsx (100%) rename src/{ => old}/core/ui/TextArea.tsx (100%) rename src/{ => old}/core/ui/TextInput.tsx (100%) rename src/{ => old}/core/ui/index.css (100%) rename src/{ => old}/core/ui/time.ts (100%) rename src/{ => old}/core/undo.test.ts (100%) rename src/{ => old}/core/undo.ts (100%) rename src/{ => old}/dps_calc/stores/DpsCalcStore.ts (100%) rename src/{ => old}/dps_calc/ui/DpsCalcComponent.tsx (100%) rename src/{ => old}/hunt_optimizer/domain/index.ts (93%) rename src/{ => old}/hunt_optimizer/persistence/HuntMethodPersister.ts (100%) rename src/{ => old}/hunt_optimizer/persistence/HuntOptimizerPersister.ts (100%) rename src/{ => old}/hunt_optimizer/stores/HuntMethodStore.ts (97%) rename src/{ => old}/hunt_optimizer/stores/HuntOptimizerStore.ts (95%) rename src/{ => old}/hunt_optimizer/stores/ItemDropStore.ts (97%) rename src/{ => old}/hunt_optimizer/ui/HuntOptimizerComponent.css (100%) rename src/{ => old}/hunt_optimizer/ui/HuntOptimizerComponent.tsx (100%) rename src/{ => old}/hunt_optimizer/ui/MethodsComponent.css (100%) rename src/{ => old}/hunt_optimizer/ui/MethodsComponent.tsx (97%) rename src/{ => old}/hunt_optimizer/ui/OptimizationResultComponent.css (100%) rename src/{ => old}/hunt_optimizer/ui/OptimizationResultComponent.tsx (98%) rename src/{ => old}/hunt_optimizer/ui/OptimizerComponent.css (100%) rename src/{ => old}/hunt_optimizer/ui/OptimizerComponent.tsx (100%) rename src/{ => old}/hunt_optimizer/ui/WantedItemsComponent.css (100%) rename src/{ => old}/hunt_optimizer/ui/WantedItemsComponent.tsx (100%) rename src/{ => old}/quest_editor/domain/ObservableArea.ts (100%) rename src/{ => old}/quest_editor/domain/ObservableAreaVariant.ts (100%) rename src/{ => old}/quest_editor/domain/ObservableQuest.ts (97%) rename src/{ => old}/quest_editor/domain/Section.ts (93%) rename src/{ => old}/quest_editor/domain/observable_quest_entities.ts (94%) rename src/{ => old}/quest_editor/loading/LoadingCache.ts (100%) rename src/{ => old}/quest_editor/loading/areas.ts (91%) rename src/{ => old}/quest_editor/loading/entities.ts (92%) rename src/{ => old}/quest_editor/persistence/QuestEditorUiPersister.ts (100%) rename src/{ => old}/quest_editor/rendering/QuestEntityControls.ts (99%) rename src/{ => old}/quest_editor/rendering/QuestModelManager.ts (100%) rename src/{ => old}/quest_editor/rendering/QuestRenderer.ts (98%) rename src/{ => old}/quest_editor/rendering/conversion/areas.ts (91%) rename src/{ => old}/quest_editor/rendering/conversion/entities.ts (89%) rename src/{ => old}/quest_editor/scripting/AssemblyAnalyser.ts (100%) rename src/{ => old}/quest_editor/scripting/AssemblyLexer.test.ts (100%) rename src/{ => old}/quest_editor/scripting/AssemblyLexer.ts (100%) rename src/{ => old}/quest_editor/scripting/assembly.test.ts (100%) rename src/{ => old}/quest_editor/scripting/assembly.ts (100%) rename src/{ => old}/quest_editor/scripting/assembly_worker.ts (100%) rename src/{ => old}/quest_editor/scripting/assembly_worker_messages.ts (100%) rename src/{ => old}/quest_editor/scripting/data_flow_analysis/ControlFlowGraph.test.ts (100%) rename src/{ => old}/quest_editor/scripting/data_flow_analysis/ControlFlowGraph.ts (100%) rename src/{ => old}/quest_editor/scripting/data_flow_analysis/ValueSet.test.ts (100%) rename src/{ => old}/quest_editor/scripting/data_flow_analysis/ValueSet.ts (100%) rename src/{ => old}/quest_editor/scripting/data_flow_analysis/register_value.test.ts (100%) rename src/{ => old}/quest_editor/scripting/data_flow_analysis/register_value.ts (100%) rename src/{ => old}/quest_editor/scripting/data_flow_analysis/stack_value.ts (100%) rename src/{ => old}/quest_editor/scripting/disassembly.test.ts (83%) rename src/{ => old}/quest_editor/scripting/disassembly.ts (100%) rename src/{ => old}/quest_editor/scripting/instructions.ts (100%) rename src/{ => old}/quest_editor/scripting/opcodes.ts (100%) rename src/{ => old}/quest_editor/scripting/vm/index.ts (100%) rename src/{ => old}/quest_editor/stores/AreaStore.ts (91%) rename src/{ => old}/quest_editor/stores/QuestEditorStore.ts (90%) rename src/{ => old}/quest_editor/stores/quest_creation.ts (98%) rename src/{ => old}/quest_editor/ui/AddObjectComponent.tsx (94%) rename src/{ => old}/quest_editor/ui/AssemblyEditorComponent.css (100%) rename src/{ => old}/quest_editor/ui/AssemblyEditorComponent.tsx (100%) rename src/{ => old}/quest_editor/ui/EntityInfoComponent.css (100%) rename src/{ => old}/quest_editor/ui/EntityInfoComponent.tsx (96%) rename src/{ => old}/quest_editor/ui/NpcCountsComponent.css (100%) rename src/{ => old}/quest_editor/ui/NpcCountsComponent.tsx (93%) rename src/{ => old}/quest_editor/ui/QuestEditorComponent.css (100%) rename src/{ => old}/quest_editor/ui/QuestEditorComponent.tsx (100%) rename src/{ => old}/quest_editor/ui/QuestInfoComponent.css (100%) rename src/{ => old}/quest_editor/ui/QuestInfoComponent.tsx (98%) rename src/{ => old}/quest_editor/ui/QuestRendererComponent.tsx (100%) rename src/{ => old}/quest_editor/ui/Toolbar.css (100%) rename src/{ => old}/quest_editor/ui/Toolbar.tsx (98%) rename src/{new => }/viewer/domain/CharacterClassAnimation.ts (100%) rename src/{new => }/viewer/domain/CharacterClassModel.ts (100%) delete mode 100644 src/viewer/domain/index.ts rename src/{new => }/viewer/gui/ModelView.css (100%) rename src/{new => }/viewer/gui/ModelView.ts (93%) rename src/{new => }/viewer/gui/TextureView.ts (100%) rename src/{new => }/viewer/gui/ViewerView.ts (100%) delete mode 100644 src/viewer/rendering/TextureRenderer.ts rename src/{new => }/viewer/stores/ModelStore.ts (88%) delete mode 100644 src/viewer/stores/ModelViewerStore.ts delete mode 100644 src/viewer/stores/TextureViewerStore.ts delete mode 100644 src/viewer/ui/ViewerComponent.css delete mode 100644 src/viewer/ui/ViewerComponent.tsx delete mode 100644 src/viewer/ui/models/AnimationSelectionComponent.css delete mode 100644 src/viewer/ui/models/AnimationSelectionComponent.tsx delete mode 100644 src/viewer/ui/models/ModelSelectionComponent.css delete mode 100644 src/viewer/ui/models/ModelSelectionComponent.tsx delete mode 100644 src/viewer/ui/models/ModelViewerComponent.css delete mode 100644 src/viewer/ui/models/ModelViewerComponent.tsx delete mode 100644 src/viewer/ui/textures/TextureViewerComponent.css delete mode 100644 src/viewer/ui/textures/TextureViewerComponent.tsx diff --git a/assets_generation/update_drops_ephinea.ts b/assets_generation/update_drops_ephinea.ts index a093bf5c..c2cc003e 100644 --- a/assets_generation/update_drops_ephinea.ts +++ b/assets_generation/update_drops_ephinea.ts @@ -3,8 +3,8 @@ import { writeFileSync } from "fs"; import "isomorphic-fetch"; import Logger from "js-logger"; import { ASSETS_DIR } from "."; -import { Difficulty, SectionId, SectionIds } from "../src/core/domain"; -import { BoxDropDto, EnemyDropDto, ItemTypeDto } from "../src/core/dto"; +import { Difficulty, SectionId, SectionIds } from "../src/old/core/domain"; +import { BoxDropDto, EnemyDropDto, ItemTypeDto } from "../src/old/core/dto"; import { name_and_episode_to_npc_type, NpcType, diff --git a/assets_generation/update_ephinea_data.ts b/assets_generation/update_ephinea_data.ts index 5c11aee5..a3021317 100644 --- a/assets_generation/update_ephinea_data.ts +++ b/assets_generation/update_ephinea_data.ts @@ -5,8 +5,8 @@ import { BufferCursor } from "../src/core/data_formats/cursor/BufferCursor"; import { ItemPmt, parse_item_pmt } from "../src/core/data_formats/parsing/itempmt"; import { parse_quest } from "../src/core/data_formats/parsing/quest"; import { parse_unitxt, Unitxt } from "../src/core/data_formats/parsing/unitxt"; -import { Difficulties, Difficulty, SectionId, SectionIds } from "../src/core/domain"; -import { BoxDropDto, EnemyDropDto, ItemTypeDto, QuestDto } from "../src/core/dto"; +import { Difficulties, Difficulty, SectionId, SectionIds } from "../src/old/core/domain"; +import { BoxDropDto, EnemyDropDto, ItemTypeDto, QuestDto } from "../src/old/core/dto"; import { update_drops_from_website } from "./update_drops_ephinea"; import { Episode, EPISODES } from "../src/core/data_formats/parsing/quest/Episode"; import { npc_data, NPC_TYPES, NpcType } from "../src/core/data_formats/parsing/quest/npc_types"; diff --git a/src/new/application/gui/ApplicationView.ts b/src/application/gui/ApplicationView.ts similarity index 100% rename from src/new/application/gui/ApplicationView.ts rename to src/application/gui/ApplicationView.ts diff --git a/src/new/application/gui/MainContentView.ts b/src/application/gui/MainContentView.ts similarity index 100% rename from src/new/application/gui/MainContentView.ts rename to src/application/gui/MainContentView.ts diff --git a/src/new/application/gui/NavigationView.css b/src/application/gui/NavigationView.css similarity index 100% rename from src/new/application/gui/NavigationView.css rename to src/application/gui/NavigationView.css diff --git a/src/new/application/gui/NavigationView.ts b/src/application/gui/NavigationView.ts similarity index 100% rename from src/new/application/gui/NavigationView.ts rename to src/application/gui/NavigationView.ts diff --git a/src/application/stores/ApplicationStore.ts b/src/application/stores/ApplicationStore.ts deleted file mode 100644 index 7b2e7b78..00000000 --- a/src/application/stores/ApplicationStore.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { autorun, observable } from "mobx"; -import { Server } from "../../core/domain"; - -class ApplicationStore { - @observable current_server: Server = Server.Ephinea; - @observable current_tool: string = this.init_tool(); - - private global_keyup_handlers = new Map void>(); - - constructor() { - autorun(() => { - window.location.hash = `#/${this.current_tool}`; - }); - } - - on_global_keyup(tool: string, binding: string, handler: () => void): void { - this.global_keyup_handlers.set(`${tool} -> ${binding}`, handler); - } - - dispatch_global_keyup = (e: KeyboardEvent) => { - const binding_parts: string[] = []; - if (e.ctrlKey) binding_parts.push("Ctrl"); - if (e.shiftKey) binding_parts.push("Shift"); - if (e.altKey) binding_parts.push("Alt"); - binding_parts.push(e.key.toUpperCase()); - - const binding = binding_parts.join("-"); - - const handler = this.global_keyup_handlers.get(`${this.current_tool} -> ${binding}`); - if (handler) handler(); - }; - - private init_tool(): string { - const tool = window.location.hash.slice(2); - return tool.length ? tool : "viewer"; - } -} - -export const application_store = new ApplicationStore(); diff --git a/src/application/ui/ApplicationComponent.css b/src/application/ui/ApplicationComponent.css deleted file mode 100644 index c8f835f4..00000000 --- a/src/application/ui/ApplicationComponent.css +++ /dev/null @@ -1,48 +0,0 @@ -.main { - display: flex; - flex-direction: column; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; -} - -.navbar { - display: flex; - border-bottom: solid 1px var(--border-color-split); -} - -.heading_menu { - flex: 1; - margin-bottom: -1px !important; -} - -.server_select { - display: flex; - align-items: center; - margin: 0 6px; -} - -.server_select > span { - display: inline-block; - margin-right: 10px; -} - -.beta { - color: #f55656; - font-weight: bold; -} - -.content { - flex: 1; - display: flex; - flex-direction: column; - align-items: stretch; - overflow: hidden; -} - -.content > * { - flex: 1; - overflow: hidden; -} diff --git a/src/application/ui/ApplicationComponent.tsx b/src/application/ui/ApplicationComponent.tsx deleted file mode 100644 index df858c2f..00000000 --- a/src/application/ui/ApplicationComponent.tsx +++ /dev/null @@ -1,86 +0,0 @@ -import { Menu, Select } from "antd"; -import { ClickParam } from "antd/lib/menu"; -import { observer } from "mobx-react"; -import React, { ReactNode, Component } from "react"; -import { Server } from "../../core/domain"; -import styles from "./ApplicationComponent.css"; -import { DpsCalcComponent } from "../../dps_calc/ui/DpsCalcComponent"; -import { with_error_boundary } from "../../core/ui/ErrorBoundary"; -import { HuntOptimizerComponent } from "../../hunt_optimizer/ui/HuntOptimizerComponent"; -import { QuestEditorComponent } from "../../quest_editor/ui/QuestEditorComponent"; -import { ViewerComponent } from "../../viewer/ui/ViewerComponent"; -import { application_store } from "../stores/ApplicationStore"; - -const Viewer = with_error_boundary(ViewerComponent); -const QuestEditor = with_error_boundary(QuestEditorComponent); -const HuntOptimizer = with_error_boundary(HuntOptimizerComponent); -const DpsCalc = with_error_boundary(DpsCalcComponent); - -@observer -export class ApplicationComponent extends Component { - componentDidMount(): void { - window.addEventListener("keyup", this.keyup); - } - - componentWillUnmount(): void { - window.removeEventListener("keyup", this.keyup); - } - - render(): ReactNode { - let tool_component; - - switch (application_store.current_tool) { - case "viewer": - tool_component = ; - break; - case "quest_editor": - tool_component = ; - break; - case "hunt_optimizer": - tool_component = ; - break; - case "dps_calc": - tool_component = ; - break; - } - - return ( -
-
- - - Viewer(Beta) - - - Quest Editor(Beta) - - Hunt Optimizer - {/* - DPS Calculator - */} - -
- Server: - -
-
-
{tool_component}
-
- ); - } - - private menu_clicked = (e: ClickParam) => { - application_store.current_tool = e.key; - }; - - private keyup = (e: KeyboardEvent) => { - application_store.dispatch_global_keyup(e); - }; -} diff --git a/src/core/data_formats/parsing/quest/bin.ts b/src/core/data_formats/parsing/quest/bin.ts index 50950a7a..117f4ff3 100644 --- a/src/core/data_formats/parsing/quest/bin.ts +++ b/src/core/data_formats/parsing/quest/bin.ts @@ -1,8 +1,8 @@ import Logger from "js-logger"; import { Endianness } from "../../Endianness"; -import { ControlFlowGraph } from "../../../../quest_editor/scripting/data_flow_analysis/ControlFlowGraph"; -import { register_value } from "../../../../quest_editor/scripting/data_flow_analysis/register_value"; -import { stack_value } from "../../../../quest_editor/scripting/data_flow_analysis/stack_value"; +import { ControlFlowGraph } from "../../../../old/quest_editor/scripting/data_flow_analysis/ControlFlowGraph"; +import { register_value } from "../../../../old/quest_editor/scripting/data_flow_analysis/register_value"; +import { stack_value } from "../../../../old/quest_editor/scripting/data_flow_analysis/stack_value"; import { Arg, DataSegment, @@ -11,13 +11,13 @@ import { Segment, SegmentType, StringSegment, -} from "../../../../quest_editor/scripting/instructions"; +} from "../../../../old/quest_editor/scripting/instructions"; import { Kind, Opcode, OPCODES, StackInteraction, -} from "../../../../quest_editor/scripting/opcodes"; +} from "../../../../old/quest_editor/scripting/opcodes"; import { ArrayBufferCursor } from "../../cursor/ArrayBufferCursor"; import { Cursor } from "../../cursor/Cursor"; import { ResizableBufferCursor } from "../../cursor/ResizableBufferCursor"; diff --git a/src/core/data_formats/parsing/quest/index.ts b/src/core/data_formats/parsing/quest/index.ts index 6591f7ab..49f20ffa 100644 --- a/src/core/data_formats/parsing/quest/index.ts +++ b/src/core/data_formats/parsing/quest/index.ts @@ -4,8 +4,8 @@ import { InstructionSegment, Segment, SegmentType, -} from "../../../../quest_editor/scripting/instructions"; -import { Opcode } from "../../../../quest_editor/scripting/opcodes"; +} from "../../../../old/quest_editor/scripting/instructions"; +import { Opcode } from "../../../../old/quest_editor/scripting/opcodes"; import { prs_compress } from "../../compression/prs/compress"; import { prs_decompress } from "../../compression/prs/decompress"; import { ArrayBufferCursor } from "../../cursor/ArrayBufferCursor"; diff --git a/src/new/core/gui/Button.css b/src/core/gui/Button.css similarity index 100% rename from src/new/core/gui/Button.css rename to src/core/gui/Button.css diff --git a/src/new/core/gui/Button.ts b/src/core/gui/Button.ts similarity index 100% rename from src/new/core/gui/Button.ts rename to src/core/gui/Button.ts diff --git a/src/new/core/gui/CheckBox.ts b/src/core/gui/CheckBox.ts similarity index 100% rename from src/new/core/gui/CheckBox.ts rename to src/core/gui/CheckBox.ts diff --git a/src/new/core/gui/Control.ts b/src/core/gui/Control.ts similarity index 100% rename from src/new/core/gui/Control.ts rename to src/core/gui/Control.ts diff --git a/src/new/core/gui/FileButton.css b/src/core/gui/FileButton.css similarity index 100% rename from src/new/core/gui/FileButton.css rename to src/core/gui/FileButton.css diff --git a/src/new/core/gui/FileButton.ts b/src/core/gui/FileButton.ts similarity index 100% rename from src/new/core/gui/FileButton.ts rename to src/core/gui/FileButton.ts diff --git a/src/new/core/gui/Input.css b/src/core/gui/Input.css similarity index 100% rename from src/new/core/gui/Input.css rename to src/core/gui/Input.css diff --git a/src/new/core/gui/Label.css b/src/core/gui/Label.css similarity index 100% rename from src/new/core/gui/Label.css rename to src/core/gui/Label.css diff --git a/src/new/core/gui/Label.ts b/src/core/gui/Label.ts similarity index 100% rename from src/new/core/gui/Label.ts rename to src/core/gui/Label.ts diff --git a/src/new/core/gui/LabelledControl.ts b/src/core/gui/LabelledControl.ts similarity index 100% rename from src/new/core/gui/LabelledControl.ts rename to src/core/gui/LabelledControl.ts diff --git a/src/new/core/gui/LazyView.ts b/src/core/gui/LazyView.ts similarity index 100% rename from src/new/core/gui/LazyView.ts rename to src/core/gui/LazyView.ts diff --git a/src/new/core/gui/NumberInput.css b/src/core/gui/NumberInput.css similarity index 100% rename from src/new/core/gui/NumberInput.css rename to src/core/gui/NumberInput.css diff --git a/src/new/core/gui/NumberInput.ts b/src/core/gui/NumberInput.ts similarity index 93% rename from src/new/core/gui/NumberInput.ts rename to src/core/gui/NumberInput.ts index deb9c2a0..347232ea 100644 --- a/src/new/core/gui/NumberInput.ts +++ b/src/core/gui/NumberInput.ts @@ -4,7 +4,7 @@ import { create_el } from "./dom"; import { WritableProperty } from "../observable/WritableProperty"; import { property } from "../observable"; import { LabelledControl } from "./LabelledControl"; -import { is_property, Property } from "../observable/Property"; +import { is_any_property, Property } from "../observable/Property"; export class NumberInput extends LabelledControl { readonly element: HTMLInputElement = create_el("input", "core_NumberInput core_Input"); @@ -40,7 +40,7 @@ export class NumberInput extends LabelledControl { } private set_prop(prop: "min" | "max" | "step", value: T | Property): void { - if (is_property(value)) { + if (is_any_property(value)) { this.element[prop] = String(value.get()); this.disposable(value.observe(v => (this.element[prop] = String(v)))); } else { diff --git a/src/new/core/gui/RendererView.ts b/src/core/gui/RendererView.ts similarity index 71% rename from src/new/core/gui/RendererView.ts rename to src/core/gui/RendererView.ts index 2f685279..2756fb00 100644 --- a/src/new/core/gui/RendererView.ts +++ b/src/core/gui/RendererView.ts @@ -1,6 +1,6 @@ import { ResizableView } from "./ResizableView"; import { create_el } from "./dom"; -import { Renderer } from "../../../core/rendering/Renderer"; +import { Renderer } from "../rendering/Renderer"; export class RendererView extends ResizableView { readonly element = create_el("div"); @@ -11,9 +11,14 @@ export class RendererView extends ResizableView { this.element.append(renderer.dom_element); this.disposable(renderer); + } - // TODO: stop on hidden - renderer.start_rendering(); + start_rendering(): void { + this.renderer.start_rendering(); + } + + stop_rendering(): void { + this.renderer.stop_rendering(); } resize(width: number, height: number): this { diff --git a/src/new/core/gui/Resizable.ts b/src/core/gui/Resizable.ts similarity index 100% rename from src/new/core/gui/Resizable.ts rename to src/core/gui/Resizable.ts diff --git a/src/new/core/gui/ResizableView.ts b/src/core/gui/ResizableView.ts similarity index 100% rename from src/new/core/gui/ResizableView.ts rename to src/core/gui/ResizableView.ts diff --git a/src/new/core/gui/TabContainer.css b/src/core/gui/TabContainer.css similarity index 100% rename from src/new/core/gui/TabContainer.css rename to src/core/gui/TabContainer.css diff --git a/src/new/core/gui/TabContainer.ts b/src/core/gui/TabContainer.ts similarity index 100% rename from src/new/core/gui/TabContainer.ts rename to src/core/gui/TabContainer.ts diff --git a/src/new/core/gui/ToolBar.css b/src/core/gui/ToolBar.css similarity index 100% rename from src/new/core/gui/ToolBar.css rename to src/core/gui/ToolBar.css diff --git a/src/new/core/gui/ToolBar.ts b/src/core/gui/ToolBar.ts similarity index 100% rename from src/new/core/gui/ToolBar.ts rename to src/core/gui/ToolBar.ts diff --git a/src/new/core/gui/View.ts b/src/core/gui/View.ts similarity index 100% rename from src/new/core/gui/View.ts rename to src/core/gui/View.ts diff --git a/src/new/core/gui/dom.ts b/src/core/gui/dom.ts similarity index 100% rename from src/new/core/gui/dom.ts rename to src/core/gui/dom.ts diff --git a/src/new/core/observable/Disposable.ts b/src/core/observable/Disposable.ts similarity index 100% rename from src/new/core/observable/Disposable.ts rename to src/core/observable/Disposable.ts diff --git a/src/new/core/observable/Emitter.ts b/src/core/observable/Emitter.ts similarity index 100% rename from src/new/core/observable/Emitter.ts rename to src/core/observable/Emitter.ts diff --git a/src/new/core/observable/MappedProperty.ts b/src/core/observable/MappedProperty.ts similarity index 100% rename from src/new/core/observable/MappedProperty.ts rename to src/core/observable/MappedProperty.ts diff --git a/src/new/core/observable/Observable.ts b/src/core/observable/Observable.ts similarity index 100% rename from src/new/core/observable/Observable.ts rename to src/core/observable/Observable.ts diff --git a/src/new/core/observable/Property.ts b/src/core/observable/Property.ts similarity index 58% rename from src/new/core/observable/Property.ts rename to src/core/observable/Property.ts index 093be6dc..70ef2889 100644 --- a/src/new/core/observable/Property.ts +++ b/src/core/observable/Property.ts @@ -10,6 +10,10 @@ export interface Property extends Observable> { export type PropertyMeta = { old_value: T }; -export function is_property(observable: any): observable is Property { +export function is_property(observable: Observable): observable is Property { + return (observable as any).is_property; +} + +export function is_any_property(observable: any): observable is Property { return (observable as any).is_property; } diff --git a/src/new/core/observable/SimpleEmitter.ts b/src/core/observable/SimpleEmitter.ts similarity index 100% rename from src/new/core/observable/SimpleEmitter.ts rename to src/core/observable/SimpleEmitter.ts diff --git a/src/new/core/observable/SimpleProperty.ts b/src/core/observable/SimpleProperty.ts similarity index 100% rename from src/new/core/observable/SimpleProperty.ts rename to src/core/observable/SimpleProperty.ts diff --git a/src/new/core/observable/WritableProperty.ts b/src/core/observable/WritableProperty.ts similarity index 100% rename from src/new/core/observable/WritableProperty.ts rename to src/core/observable/WritableProperty.ts diff --git a/src/new/core/observable/index.ts b/src/core/observable/index.ts similarity index 100% rename from src/new/core/observable/index.ts rename to src/core/observable/index.ts diff --git a/src/core/rendering/Renderer.ts b/src/core/rendering/Renderer.ts index 20700723..f0964b03 100644 --- a/src/core/rendering/Renderer.ts +++ b/src/core/rendering/Renderer.ts @@ -79,6 +79,7 @@ export abstract class Renderer { } start_rendering(): void { + this.schedule_render(); requestAnimationFrame(this.call_render); } diff --git a/src/new/core/stores/GuiStore.ts b/src/core/stores/GuiStore.ts similarity index 100% rename from src/new/core/stores/GuiStore.ts rename to src/core/stores/GuiStore.ts diff --git a/src/new/index.css b/src/index.css similarity index 100% rename from src/new/index.css rename to src/index.css diff --git a/src/new/index.ts b/src/index.ts similarity index 53% rename from src/new/index.ts rename to src/index.ts index 31788a71..1bd1e9b8 100644 --- a/src/new/index.ts +++ b/src/index.ts @@ -2,8 +2,30 @@ import { ApplicationView } from "./application/gui/ApplicationView"; import { Disposable } from "./core/observable/Disposable"; import "./index.css"; import { throttle } from "lodash"; +import Logger from "js-logger"; -export function initialize(): Disposable { +Logger.useDefaults({ + defaultLevel: (Logger as any)[process.env["LOG_LEVEL"] || "OFF"], +}); + +// Disable native undo/redo. +document.addEventListener("keydown", e => { + const kbe = e as KeyboardEvent; + + if (kbe.ctrlKey && !kbe.altKey && kbe.key.toUpperCase() === "Z") { + kbe.preventDefault(); + } +}); +// This doesn't work in FireFox: +document.addEventListener("beforeinput", e => { + const ie = e as any; + + if (ie.inputType === "historyUndo" || ie.inputType === "historyRedo") { + e.preventDefault(); + } +}); + +function initialize(): Disposable { const application_view = new ApplicationView(); const resize = throttle( @@ -25,3 +47,5 @@ export function initialize(): Disposable { }, }; } + +initialize(); diff --git a/src/index.tsx b/src/index.tsx deleted file mode 100644 index 2fa9c9e7..00000000 --- a/src/index.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import React from "react"; -import ReactDOM from "react-dom"; -import Logger from "js-logger"; -import styles from "./core/ui/index.css"; -import { ApplicationComponent } from "./application/ui/ApplicationComponent"; -// import "react-virtualized/styles.css"; -// import "react-select/dist/react-select.css"; -// import "react-virtualized-select/styles.css"; -import "golden-layout/src/css/goldenlayout-base.css"; -import "golden-layout/src/css/goldenlayout-dark-theme.css"; -// import "antd/dist/antd.less"; -import { initialize } from "./new"; - -Logger.useDefaults({ - defaultLevel: (Logger as any)[process.env["LOG_LEVEL"] || "OFF"], -}); - -// Disable native undo/redo. -document.addEventListener("keydown", e => { - const kbe = e as KeyboardEvent; - - if (kbe.ctrlKey && !kbe.altKey && kbe.key.toUpperCase() === "Z") { - kbe.preventDefault(); - } -}); -// This doesn't work in FireFox: -document.addEventListener("beforeinput", e => { - const ie = e as any; - - if (ie.inputType === "historyUndo" || ie.inputType === "historyRedo") { - e.preventDefault(); - } -}); - -// const root_element = document.createElement("div"); -// root_element.id = styles.phantasmal_world_root; -// document.body.append(root_element); -// -// ReactDOM.render(, root_element); - -initialize(); diff --git a/src/new/viewer/rendering/ModelRenderer.ts b/src/new/viewer/rendering/ModelRenderer.ts deleted file mode 100644 index 10c428ad..00000000 --- a/src/new/viewer/rendering/ModelRenderer.ts +++ /dev/null @@ -1,216 +0,0 @@ -import { - AnimationAction, - AnimationClip, - AnimationMixer, - Clock, - DoubleSide, - Mesh, - MeshLambertMaterial, - Object3D, - PerspectiveCamera, - SkeletonHelper, - SkinnedMesh, - Texture, - Vector3, -} from "three"; -import { Renderer } from "../../../core/rendering/Renderer"; -import { model_store } from "../stores/ModelStore"; -import { Disposable } from "../../core/observable/Disposable"; -import { create_mesh, create_skinned_mesh } from "../../../core/rendering/conversion/create_mesh"; -import { ninja_object_to_buffer_geometry } from "../../../core/rendering/conversion/ninja_geometry"; -import { NjObject } from "../../../core/data_formats/parsing/ninja"; -import { - create_animation_clip, - PSO_FRAME_RATE, -} from "../../../core/rendering/conversion/ninja_animation"; -import { NjMotion } from "../../../core/data_formats/parsing/ninja/motion"; -import { xvm_to_textures } from "../../../core/rendering/conversion/ninja_textures"; - -export class ModelRenderer extends Renderer implements Disposable { - private readonly perspective_camera: PerspectiveCamera; - private readonly disposables: Disposable[] = []; - private readonly clock = new Clock(); - private mesh?: Object3D; - private skeleton_helper?: SkeletonHelper; - private animation?: { - mixer: AnimationMixer; - clip: AnimationClip; - action: AnimationAction; - }; - - constructor() { - super(new PerspectiveCamera(75, 1, 1, 200)); - - this.perspective_camera = this.camera as PerspectiveCamera; - - this.disposables.push( - model_store.current_nj_data.observe(this.nj_data_or_xvm_changed), - model_store.current_xvm.observe(this.nj_data_or_xvm_changed), - model_store.current_nj_motion.observe(this.nj_motion_changed), - model_store.show_skeleton.observe(this.show_skeleton_changed), - model_store.animation_playing.observe(this.animation_playing_changed), - model_store.animation_frame_rate.observe(this.animation_frame_rate_changed), - model_store.animation_frame.observe(this.animation_frame_changed), - ); - } - - set_size(width: number, height: number): void { - this.perspective_camera.aspect = width / height; - this.perspective_camera.updateProjectionMatrix(); - super.set_size(width, height); - } - - dispose(): void { - super.dispose(); - this.disposables.forEach(d => d.dispose()); - } - - protected render(): void { - if (this.animation) { - this.animation.mixer.update(this.clock.getDelta()); - } - - this.light_holder.quaternion.copy(this.perspective_camera.quaternion); - super.render(); - - if (this.animation && !this.animation.action.paused) { - this.update_animation_frame(); - this.schedule_render(); - } - } - - private nj_data_or_xvm_changed = () => { - if (this.mesh) { - this.scene.remove(this.mesh); - this.mesh = undefined; - this.scene.remove(this.skeleton_helper!); - this.skeleton_helper = undefined; - } - - if (this.animation) { - this.animation.mixer.stopAllAction(); - if (this.mesh) this.animation.mixer.uncacheRoot(this.mesh); - this.animation = undefined; - } - - const nj_data = model_store.current_nj_data.get(); - - if (nj_data) { - const { nj_object, has_skeleton } = nj_data; - - let mesh: Mesh; - - const xvm = model_store.current_xvm.get(); - const textures = xvm ? xvm_to_textures(xvm) : undefined; - - const materials = - textures && - textures.map( - tex => - new MeshLambertMaterial({ - skinning: has_skeleton, - map: tex, - side: DoubleSide, - alphaTest: 0.5, - }), - ); - - if (has_skeleton) { - mesh = create_skinned_mesh(ninja_object_to_buffer_geometry(nj_object), materials); - } else { - mesh = create_mesh(ninja_object_to_buffer_geometry(nj_object), materials); - } - - // Make sure we rotate around the center of the model instead of its origin. - const bb = mesh.geometry.boundingBox; - const height = bb.max.y - bb.min.y; - mesh.translateY(-height / 2 - bb.min.y); - - this.mesh = mesh; - this.scene.add(mesh); - - this.skeleton_helper = new SkeletonHelper(mesh); - this.skeleton_helper.visible = model_store.show_skeleton.get(); - (this.skeleton_helper.material as any).linewidth = 3; - this.scene.add(this.skeleton_helper); - - this.reset_camera(new Vector3(0, 10, 20), new Vector3(0, 0, 0)); - } - - this.schedule_render(); - }; - - private nj_motion_changed = (nj_motion?: NjMotion) => { - let mixer!: AnimationMixer; - - if (this.animation) { - this.animation.mixer.stopAllAction(); - mixer = this.animation.mixer; - } - - const nj_data = model_store.current_nj_data.get(); - - if (!this.mesh || !(this.mesh instanceof SkinnedMesh) || !nj_motion || !nj_data) return; - - if (!this.animation) { - mixer = new AnimationMixer(this.mesh); - } - - const clip = create_animation_clip(nj_data.nj_object, nj_motion); - - this.animation = { - mixer, - clip, - action: mixer.clipAction(clip), - }; - - this.clock.start(); - this.animation.action.play(); - this.schedule_render(); - }; - - private show_skeleton_changed = (show_skeleton: boolean) => { - if (this.skeleton_helper) { - this.skeleton_helper.visible = show_skeleton; - this.schedule_render(); - } - }; - - private animation_playing_changed = (playing: boolean) => { - if (this.animation) { - this.animation.action.paused = !playing; - - if (playing) { - this.clock.start(); - this.schedule_render(); - } else { - this.clock.stop(); - } - } - }; - - private animation_frame_rate_changed = (frame_rate: number) => { - if (this.animation) { - this.animation.mixer.timeScale = frame_rate / PSO_FRAME_RATE; - } - }; - - private animation_frame_changed = (frame: number) => { - const nj_motion = model_store.current_nj_motion.get(); - - if (this.animation && nj_motion) { - const frame_count = nj_motion.frame_count; - if (frame > frame_count) frame = 1; - if (frame < 1) frame = frame_count; - this.animation.action.time = (frame - 1) / PSO_FRAME_RATE; - this.schedule_render(); - } - }; - - private update_animation_frame(): void { - if (this.animation && !this.animation.action.paused) { - const time = this.animation.action.time; - model_store.animation_frame.set(time * PSO_FRAME_RATE + 1); - } - } -} diff --git a/src/core/Loadable.ts b/src/old/core/Loadable.ts similarity index 100% rename from src/core/Loadable.ts rename to src/old/core/Loadable.ts diff --git a/src/core/domain/index.ts b/src/old/core/domain/index.ts similarity index 91% rename from src/core/domain/index.ts rename to src/old/core/domain/index.ts index 804a058c..517ae122 100644 --- a/src/core/domain/index.ts +++ b/src/old/core/domain/index.ts @@ -1,4 +1,4 @@ -import { enum_values } from "../enums"; +import { enum_values } from "../../../core/enums"; export const RARE_ENEMY_PROB = 1 / 512; export const KONDRIEU_PROB = 1 / 10; diff --git a/src/core/domain/items.ts b/src/old/core/domain/items.ts similarity index 100% rename from src/core/domain/items.ts rename to src/old/core/domain/items.ts diff --git a/src/core/dto.ts b/src/old/core/dto.ts similarity index 100% rename from src/core/dto.ts rename to src/old/core/dto.ts diff --git a/src/core/persistence.ts b/src/old/core/persistence.ts similarity index 100% rename from src/core/persistence.ts rename to src/old/core/persistence.ts diff --git a/src/core/primitive_conversion.ts b/src/old/core/primitive_conversion.ts similarity index 100% rename from src/core/primitive_conversion.ts rename to src/old/core/primitive_conversion.ts diff --git a/src/core/stores/ItemTypeStore.ts b/src/old/core/stores/ItemTypeStore.ts similarity index 100% rename from src/core/stores/ItemTypeStore.ts rename to src/old/core/stores/ItemTypeStore.ts diff --git a/src/core/stores/ServerMap.ts b/src/old/core/stores/ServerMap.ts similarity index 70% rename from src/core/stores/ServerMap.ts rename to src/old/core/stores/ServerMap.ts index a10a0220..4eb17802 100644 --- a/src/core/stores/ServerMap.ts +++ b/src/old/core/stores/ServerMap.ts @@ -1,7 +1,6 @@ import { computed } from "mobx"; import { Server } from "../domain"; -import { application_store } from "../../application/stores/ApplicationStore"; -import { EnumMap } from "../enums"; +import { EnumMap } from "../../../core/enums"; /** * Map with a guaranteed value per server. @@ -15,6 +14,6 @@ export class ServerMap extends EnumMap { * @returns the value for the current server as set in {@link application_store}. */ @computed get current(): V { - return this.get(application_store.current_server); + return this.get(Server.Ephinea); } } diff --git a/src/core/ui/BigSelect.css b/src/old/core/ui/BigSelect.css similarity index 100% rename from src/core/ui/BigSelect.css rename to src/old/core/ui/BigSelect.css diff --git a/src/core/ui/BigSelect.tsx b/src/old/core/ui/BigSelect.tsx similarity index 100% rename from src/core/ui/BigSelect.tsx rename to src/old/core/ui/BigSelect.tsx diff --git a/src/core/ui/BigTable.css b/src/old/core/ui/BigTable.css similarity index 100% rename from src/core/ui/BigTable.css rename to src/old/core/ui/BigTable.css diff --git a/src/core/ui/BigTable.tsx b/src/old/core/ui/BigTable.tsx similarity index 100% rename from src/core/ui/BigTable.tsx rename to src/old/core/ui/BigTable.tsx diff --git a/src/core/ui/DisabledTextComponent.css b/src/old/core/ui/DisabledTextComponent.css similarity index 100% rename from src/core/ui/DisabledTextComponent.css rename to src/old/core/ui/DisabledTextComponent.css diff --git a/src/core/ui/DisabledTextComponent.tsx b/src/old/core/ui/DisabledTextComponent.tsx similarity index 100% rename from src/core/ui/DisabledTextComponent.tsx rename to src/old/core/ui/DisabledTextComponent.tsx diff --git a/src/core/ui/ErrorBoundary.css b/src/old/core/ui/ErrorBoundary.css similarity index 100% rename from src/core/ui/ErrorBoundary.css rename to src/old/core/ui/ErrorBoundary.css diff --git a/src/core/ui/ErrorBoundary.tsx b/src/old/core/ui/ErrorBoundary.tsx similarity index 100% rename from src/core/ui/ErrorBoundary.tsx rename to src/old/core/ui/ErrorBoundary.tsx diff --git a/src/core/ui/NumberInput.tsx b/src/old/core/ui/NumberInput.tsx similarity index 100% rename from src/core/ui/NumberInput.tsx rename to src/old/core/ui/NumberInput.tsx diff --git a/src/core/ui/RendererComponent.tsx b/src/old/core/ui/RendererComponent.tsx similarity index 95% rename from src/core/ui/RendererComponent.tsx rename to src/old/core/ui/RendererComponent.tsx index b26e897b..2da20538 100644 --- a/src/core/ui/RendererComponent.tsx +++ b/src/old/core/ui/RendererComponent.tsx @@ -1,5 +1,5 @@ import React, { Component, ReactNode } from "react"; -import { Renderer } from "../rendering/Renderer"; +import { Renderer } from "../../../core/rendering/Renderer"; type Props = { renderer: Renderer; diff --git a/src/core/ui/SectionIdIcon.tsx b/src/old/core/ui/SectionIdIcon.tsx similarity index 100% rename from src/core/ui/SectionIdIcon.tsx rename to src/old/core/ui/SectionIdIcon.tsx diff --git a/src/core/ui/TextArea.tsx b/src/old/core/ui/TextArea.tsx similarity index 100% rename from src/core/ui/TextArea.tsx rename to src/old/core/ui/TextArea.tsx diff --git a/src/core/ui/TextInput.tsx b/src/old/core/ui/TextInput.tsx similarity index 100% rename from src/core/ui/TextInput.tsx rename to src/old/core/ui/TextInput.tsx diff --git a/src/core/ui/index.css b/src/old/core/ui/index.css similarity index 100% rename from src/core/ui/index.css rename to src/old/core/ui/index.css diff --git a/src/core/ui/time.ts b/src/old/core/ui/time.ts similarity index 100% rename from src/core/ui/time.ts rename to src/old/core/ui/time.ts diff --git a/src/core/undo.test.ts b/src/old/core/undo.test.ts similarity index 100% rename from src/core/undo.test.ts rename to src/old/core/undo.test.ts diff --git a/src/core/undo.ts b/src/old/core/undo.ts similarity index 100% rename from src/core/undo.ts rename to src/old/core/undo.ts diff --git a/src/dps_calc/stores/DpsCalcStore.ts b/src/old/dps_calc/stores/DpsCalcStore.ts similarity index 100% rename from src/dps_calc/stores/DpsCalcStore.ts rename to src/old/dps_calc/stores/DpsCalcStore.ts diff --git a/src/dps_calc/ui/DpsCalcComponent.tsx b/src/old/dps_calc/ui/DpsCalcComponent.tsx similarity index 100% rename from src/dps_calc/ui/DpsCalcComponent.tsx rename to src/old/dps_calc/ui/DpsCalcComponent.tsx diff --git a/src/hunt_optimizer/domain/index.ts b/src/old/hunt_optimizer/domain/index.ts similarity index 93% rename from src/hunt_optimizer/domain/index.ts rename to src/old/hunt_optimizer/domain/index.ts index 39539f9d..c5c22f9e 100644 --- a/src/hunt_optimizer/domain/index.ts +++ b/src/old/hunt_optimizer/domain/index.ts @@ -1,5 +1,5 @@ -import { Episode } from "../../core/data_formats/parsing/quest/Episode"; -import { NpcType } from "../../core/data_formats/parsing/quest/npc_types"; +import { Episode } from "../../../core/data_formats/parsing/quest/Episode"; +import { NpcType } from "../../../core/data_formats/parsing/quest/npc_types"; import { computed, observable } from "mobx"; import { ItemType } from "../../core/domain/items"; import { Difficulty, SectionId } from "../../core/domain"; diff --git a/src/hunt_optimizer/persistence/HuntMethodPersister.ts b/src/old/hunt_optimizer/persistence/HuntMethodPersister.ts similarity index 100% rename from src/hunt_optimizer/persistence/HuntMethodPersister.ts rename to src/old/hunt_optimizer/persistence/HuntMethodPersister.ts diff --git a/src/hunt_optimizer/persistence/HuntOptimizerPersister.ts b/src/old/hunt_optimizer/persistence/HuntOptimizerPersister.ts similarity index 100% rename from src/hunt_optimizer/persistence/HuntOptimizerPersister.ts rename to src/old/hunt_optimizer/persistence/HuntOptimizerPersister.ts diff --git a/src/hunt_optimizer/stores/HuntMethodStore.ts b/src/old/hunt_optimizer/stores/HuntMethodStore.ts similarity index 97% rename from src/hunt_optimizer/stores/HuntMethodStore.ts rename to src/old/hunt_optimizer/stores/HuntMethodStore.ts index 75930ede..be4874b5 100644 --- a/src/hunt_optimizer/stores/HuntMethodStore.ts +++ b/src/old/hunt_optimizer/stores/HuntMethodStore.ts @@ -5,7 +5,7 @@ import { QuestDto } from "../../core/dto"; import { Loadable } from "../../core/Loadable"; import { hunt_method_persister } from "../persistence/HuntMethodPersister"; import { ServerMap } from "../../core/stores/ServerMap"; -import { NpcType } from "../../core/data_formats/parsing/quest/npc_types"; +import { NpcType } from "../../../core/data_formats/parsing/quest/npc_types"; import { HuntMethod, SimpleQuest } from "../domain"; const logger = Logger.get("stores/HuntMethodStore"); diff --git a/src/hunt_optimizer/stores/HuntOptimizerStore.ts b/src/old/hunt_optimizer/stores/HuntOptimizerStore.ts similarity index 95% rename from src/hunt_optimizer/stores/HuntOptimizerStore.ts rename to src/old/hunt_optimizer/stores/HuntOptimizerStore.ts index 3da0ea9e..c22e3b49 100644 --- a/src/hunt_optimizer/stores/HuntOptimizerStore.ts +++ b/src/old/hunt_optimizer/stores/HuntOptimizerStore.ts @@ -7,14 +7,14 @@ import { RARE_ENEMY_PROB, SectionId, SectionIds, + Server, } from "../../core/domain"; import { hunt_optimizer_persister } from "../persistence/HuntOptimizerPersister"; -import { application_store } from "../../application/stores/ApplicationStore"; import { hunt_method_store } from "./HuntMethodStore"; import { item_drop_stores } from "./ItemDropStore"; import { item_type_stores } from "../../core/stores/ItemTypeStore"; -import { Episode } from "../../core/data_formats/parsing/quest/Episode"; -import { npc_data, NpcType } from "../../core/data_formats/parsing/quest/npc_types"; +import { Episode } from "../../../core/data_formats/parsing/quest/Episode"; +import { npc_data, NpcType } from "../../../core/data_formats/parsing/quest/npc_types"; import { HuntMethod } from "../domain"; import { ItemType } from "../../core/domain/items"; @@ -334,15 +334,10 @@ class HuntOptimizerStore { } private initialize_persistence = async () => { - this.wanted_items.replace( - await hunt_optimizer_persister.load_wanted_items(application_store.current_server), - ); + this.wanted_items.replace(await hunt_optimizer_persister.load_wanted_items(Server.Ephinea)); autorun(() => { - hunt_optimizer_persister.persist_wanted_items( - application_store.current_server, - this.wanted_items, - ); + hunt_optimizer_persister.persist_wanted_items(Server.Ephinea, this.wanted_items); }); }; } diff --git a/src/hunt_optimizer/stores/ItemDropStore.ts b/src/old/hunt_optimizer/stores/ItemDropStore.ts similarity index 97% rename from src/hunt_optimizer/stores/ItemDropStore.ts rename to src/old/hunt_optimizer/stores/ItemDropStore.ts index 6b79594e..45cae96a 100644 --- a/src/hunt_optimizer/stores/ItemDropStore.ts +++ b/src/old/hunt_optimizer/stores/ItemDropStore.ts @@ -5,7 +5,7 @@ import { Loadable } from "../../core/Loadable"; import { item_type_stores } from "../../core/stores/ItemTypeStore"; import { ServerMap } from "../../core/stores/ServerMap"; import Logger from "js-logger"; -import { NpcType } from "../../core/data_formats/parsing/quest/npc_types"; +import { NpcType } from "../../../core/data_formats/parsing/quest/npc_types"; import { EnemyDrop } from "../domain"; const logger = Logger.get("stores/ItemDropStore"); diff --git a/src/hunt_optimizer/ui/HuntOptimizerComponent.css b/src/old/hunt_optimizer/ui/HuntOptimizerComponent.css similarity index 100% rename from src/hunt_optimizer/ui/HuntOptimizerComponent.css rename to src/old/hunt_optimizer/ui/HuntOptimizerComponent.css diff --git a/src/hunt_optimizer/ui/HuntOptimizerComponent.tsx b/src/old/hunt_optimizer/ui/HuntOptimizerComponent.tsx similarity index 100% rename from src/hunt_optimizer/ui/HuntOptimizerComponent.tsx rename to src/old/hunt_optimizer/ui/HuntOptimizerComponent.tsx diff --git a/src/hunt_optimizer/ui/MethodsComponent.css b/src/old/hunt_optimizer/ui/MethodsComponent.css similarity index 100% rename from src/hunt_optimizer/ui/MethodsComponent.css rename to src/old/hunt_optimizer/ui/MethodsComponent.css diff --git a/src/hunt_optimizer/ui/MethodsComponent.tsx b/src/old/hunt_optimizer/ui/MethodsComponent.tsx similarity index 97% rename from src/hunt_optimizer/ui/MethodsComponent.tsx rename to src/old/hunt_optimizer/ui/MethodsComponent.tsx index 2c8efe0c..063dba4e 100644 --- a/src/hunt_optimizer/ui/MethodsComponent.tsx +++ b/src/old/hunt_optimizer/ui/MethodsComponent.tsx @@ -6,12 +6,12 @@ import { AutoSizer, Index, SortDirection } from "react-virtualized"; import { hunt_method_store } from "../stores/HuntMethodStore"; import { BigTable, Column, ColumnSort } from "../../core/ui/BigTable"; import styles from "./MethodsComponent.css"; -import { Episode } from "../../core/data_formats/parsing/quest/Episode"; +import { Episode } from "../../../core/data_formats/parsing/quest/Episode"; import { ENEMY_NPC_TYPES, npc_data, NpcType, -} from "../../core/data_formats/parsing/quest/npc_types"; +} from "../../../core/data_formats/parsing/quest/npc_types"; import { HuntMethod } from "../domain"; @observer diff --git a/src/hunt_optimizer/ui/OptimizationResultComponent.css b/src/old/hunt_optimizer/ui/OptimizationResultComponent.css similarity index 100% rename from src/hunt_optimizer/ui/OptimizationResultComponent.css rename to src/old/hunt_optimizer/ui/OptimizationResultComponent.css diff --git a/src/hunt_optimizer/ui/OptimizationResultComponent.tsx b/src/old/hunt_optimizer/ui/OptimizationResultComponent.tsx similarity index 98% rename from src/hunt_optimizer/ui/OptimizationResultComponent.tsx rename to src/old/hunt_optimizer/ui/OptimizationResultComponent.tsx index e4977804..217d1ea1 100644 --- a/src/hunt_optimizer/ui/OptimizationResultComponent.tsx +++ b/src/old/hunt_optimizer/ui/OptimizationResultComponent.tsx @@ -8,7 +8,7 @@ import { BigTable, Column } from "../../core/ui/BigTable"; import { SectionIdIcon } from "../../core/ui/SectionIdIcon"; import { hours_to_string } from "../../core/ui/time"; import styles from "./OptimizationResultComponent.css"; -import { Episode } from "../../core/data_formats/parsing/quest/Episode"; +import { Episode } from "../../../core/data_formats/parsing/quest/Episode"; @observer export class OptimizationResultComponent extends Component { diff --git a/src/hunt_optimizer/ui/OptimizerComponent.css b/src/old/hunt_optimizer/ui/OptimizerComponent.css similarity index 100% rename from src/hunt_optimizer/ui/OptimizerComponent.css rename to src/old/hunt_optimizer/ui/OptimizerComponent.css diff --git a/src/hunt_optimizer/ui/OptimizerComponent.tsx b/src/old/hunt_optimizer/ui/OptimizerComponent.tsx similarity index 100% rename from src/hunt_optimizer/ui/OptimizerComponent.tsx rename to src/old/hunt_optimizer/ui/OptimizerComponent.tsx diff --git a/src/hunt_optimizer/ui/WantedItemsComponent.css b/src/old/hunt_optimizer/ui/WantedItemsComponent.css similarity index 100% rename from src/hunt_optimizer/ui/WantedItemsComponent.css rename to src/old/hunt_optimizer/ui/WantedItemsComponent.css diff --git a/src/hunt_optimizer/ui/WantedItemsComponent.tsx b/src/old/hunt_optimizer/ui/WantedItemsComponent.tsx similarity index 100% rename from src/hunt_optimizer/ui/WantedItemsComponent.tsx rename to src/old/hunt_optimizer/ui/WantedItemsComponent.tsx diff --git a/src/quest_editor/domain/ObservableArea.ts b/src/old/quest_editor/domain/ObservableArea.ts similarity index 100% rename from src/quest_editor/domain/ObservableArea.ts rename to src/old/quest_editor/domain/ObservableArea.ts diff --git a/src/quest_editor/domain/ObservableAreaVariant.ts b/src/old/quest_editor/domain/ObservableAreaVariant.ts similarity index 100% rename from src/quest_editor/domain/ObservableAreaVariant.ts rename to src/old/quest_editor/domain/ObservableAreaVariant.ts diff --git a/src/quest_editor/domain/ObservableQuest.ts b/src/old/quest_editor/domain/ObservableQuest.ts similarity index 97% rename from src/quest_editor/domain/ObservableQuest.ts rename to src/old/quest_editor/domain/ObservableQuest.ts index d830888c..6b896c73 100644 --- a/src/quest_editor/domain/ObservableQuest.ts +++ b/src/old/quest_editor/domain/ObservableQuest.ts @@ -1,8 +1,8 @@ import { action, computed, observable } from "mobx"; -import { check_episode, Episode } from "../../core/data_formats/parsing/quest/Episode"; +import { check_episode, Episode } from "../../../core/data_formats/parsing/quest/Episode"; import { ObservableAreaVariant } from "./ObservableAreaVariant"; import { area_store } from "../stores/AreaStore"; -import { DatUnknown } from "../../core/data_formats/parsing/quest/dat"; +import { DatUnknown } from "../../../core/data_formats/parsing/quest/dat"; import { Segment } from "../scripting/instructions"; import Logger from "js-logger"; import { ObservableQuestNpc, ObservableQuestObject } from "./observable_quest_entities"; diff --git a/src/quest_editor/domain/Section.ts b/src/old/quest_editor/domain/Section.ts similarity index 93% rename from src/quest_editor/domain/Section.ts rename to src/old/quest_editor/domain/Section.ts index d6ef5308..c5f38592 100644 --- a/src/quest_editor/domain/Section.ts +++ b/src/old/quest_editor/domain/Section.ts @@ -1,4 +1,4 @@ -import { Vec3 } from "../../core/data_formats/vector"; +import { Vec3 } from "../../../core/data_formats/vector"; export class Section { readonly id: number; diff --git a/src/quest_editor/domain/observable_quest_entities.ts b/src/old/quest_editor/domain/observable_quest_entities.ts similarity index 94% rename from src/quest_editor/domain/observable_quest_entities.ts rename to src/old/quest_editor/domain/observable_quest_entities.ts index 7cc1f488..c2cd789b 100644 --- a/src/quest_editor/domain/observable_quest_entities.ts +++ b/src/old/quest_editor/domain/observable_quest_entities.ts @@ -1,9 +1,9 @@ -import { ObjectType } from "../../core/data_formats/parsing/quest/object_types"; +import { ObjectType } from "../../../core/data_formats/parsing/quest/object_types"; import { action, computed, observable } from "mobx"; -import { Vec3 } from "../../core/data_formats/vector"; -import { EntityType } from "../../core/data_formats/parsing/quest/entities"; +import { Vec3 } from "../../../core/data_formats/vector"; +import { EntityType } from "../../../core/data_formats/parsing/quest/entities"; import { Section } from "./Section"; -import { NpcType } from "../../core/data_formats/parsing/quest/npc_types"; +import { NpcType } from "../../../core/data_formats/parsing/quest/npc_types"; /** * Abstract class from which ObservableQuestNpc and ObservableQuestObject derive. diff --git a/src/quest_editor/loading/LoadingCache.ts b/src/old/quest_editor/loading/LoadingCache.ts similarity index 100% rename from src/quest_editor/loading/LoadingCache.ts rename to src/old/quest_editor/loading/LoadingCache.ts diff --git a/src/quest_editor/loading/areas.ts b/src/old/quest_editor/loading/areas.ts similarity index 91% rename from src/quest_editor/loading/areas.ts rename to src/old/quest_editor/loading/areas.ts index 34a20559..df387b28 100644 --- a/src/quest_editor/loading/areas.ts +++ b/src/old/quest_editor/loading/areas.ts @@ -1,16 +1,16 @@ import { Object3D } from "three"; -import { Endianness } from "../../core/data_formats/Endianness"; -import { ArrayBufferCursor } from "../../core/data_formats/cursor/ArrayBufferCursor"; -import { parse_area_collision_geometry } from "../../core/data_formats/parsing/area_collision_geometry"; -import { parse_area_geometry } from "../../core/data_formats/parsing/area_geometry"; +import { Endianness } from "../../../core/data_formats/Endianness"; +import { ArrayBufferCursor } from "../../../core/data_formats/cursor/ArrayBufferCursor"; +import { parse_area_collision_geometry } from "../../../core/data_formats/parsing/area_collision_geometry"; +import { parse_area_geometry } from "../../../core/data_formats/parsing/area_geometry"; import { area_collision_geometry_to_object_3d, area_geometry_to_sections_and_object_3d, } from "../rendering/conversion/areas"; -import { load_array_buffer } from "../../core/loading"; +import { load_array_buffer } from "../../../core/loading"; import { LoadingCache } from "./LoadingCache"; import { Section } from "../domain/Section"; -import { Episode } from "../../core/data_formats/parsing/quest/Episode"; +import { Episode } from "../../../core/data_formats/parsing/quest/Episode"; const render_geometry_cache = new LoadingCache< string, diff --git a/src/quest_editor/loading/entities.ts b/src/old/quest_editor/loading/entities.ts similarity index 92% rename from src/quest_editor/loading/entities.ts rename to src/old/quest_editor/loading/entities.ts index 780246ee..8003fea5 100644 --- a/src/quest_editor/loading/entities.ts +++ b/src/old/quest_editor/loading/entities.ts @@ -1,15 +1,15 @@ import { Texture, CylinderBufferGeometry, BufferGeometry } from "three"; import Logger from "js-logger"; import { LoadingCache } from "./LoadingCache"; -import { Endianness } from "../../core/data_formats/Endianness"; -import { ArrayBufferCursor } from "../../core/data_formats/cursor/ArrayBufferCursor"; -import { ninja_object_to_buffer_geometry } from "../../core/rendering/conversion/ninja_geometry"; -import { parse_nj, parse_xj } from "../../core/data_formats/parsing/ninja"; -import { parse_xvm } from "../../core/data_formats/parsing/ninja/texture"; -import { xvm_to_textures } from "../../core/rendering/conversion/ninja_textures"; -import { load_array_buffer } from "../../core/loading"; -import { object_data, ObjectType } from "../../core/data_formats/parsing/quest/object_types"; -import { NpcType } from "../../core/data_formats/parsing/quest/npc_types"; +import { Endianness } from "../../../core/data_formats/Endianness"; +import { ArrayBufferCursor } from "../../../core/data_formats/cursor/ArrayBufferCursor"; +import { ninja_object_to_buffer_geometry } from "../../../core/rendering/conversion/ninja_geometry"; +import { parse_nj, parse_xj } from "../../../core/data_formats/parsing/ninja"; +import { parse_xvm } from "../../../core/data_formats/parsing/ninja/texture"; +import { xvm_to_textures } from "../../../core/rendering/conversion/ninja_textures"; +import { load_array_buffer } from "../../../core/loading"; +import { object_data, ObjectType } from "../../../core/data_formats/parsing/quest/object_types"; +import { NpcType } from "../../../core/data_formats/parsing/quest/npc_types"; const logger = Logger.get("loading/entities"); diff --git a/src/quest_editor/persistence/QuestEditorUiPersister.ts b/src/old/quest_editor/persistence/QuestEditorUiPersister.ts similarity index 100% rename from src/quest_editor/persistence/QuestEditorUiPersister.ts rename to src/old/quest_editor/persistence/QuestEditorUiPersister.ts diff --git a/src/quest_editor/rendering/QuestEntityControls.ts b/src/old/quest_editor/rendering/QuestEntityControls.ts similarity index 99% rename from src/quest_editor/rendering/QuestEntityControls.ts rename to src/old/quest_editor/rendering/QuestEntityControls.ts index 4a2bb181..78adb26e 100644 --- a/src/quest_editor/rendering/QuestEntityControls.ts +++ b/src/old/quest_editor/rendering/QuestEntityControls.ts @@ -1,6 +1,6 @@ import { autorun } from "mobx"; import { Intersection, Mesh, MeshLambertMaterial, Plane, Raycaster, Vector2, Vector3 } from "three"; -import { Vec3 } from "../../core/data_formats/vector"; +import { Vec3 } from "../../../core/data_formats/vector"; import { quest_editor_store } from "../stores/QuestEditorStore"; import { AreaUserData } from "./conversion/areas"; import { ColorType, EntityUserData, NPC_COLORS, OBJECT_COLORS } from "./conversion/entities"; diff --git a/src/quest_editor/rendering/QuestModelManager.ts b/src/old/quest_editor/rendering/QuestModelManager.ts similarity index 100% rename from src/quest_editor/rendering/QuestModelManager.ts rename to src/old/quest_editor/rendering/QuestModelManager.ts diff --git a/src/quest_editor/rendering/QuestRenderer.ts b/src/old/quest_editor/rendering/QuestRenderer.ts similarity index 98% rename from src/quest_editor/rendering/QuestRenderer.ts rename to src/old/quest_editor/rendering/QuestRenderer.ts index 31bb1b34..9ba48d62 100644 --- a/src/quest_editor/rendering/QuestRenderer.ts +++ b/src/old/quest_editor/rendering/QuestRenderer.ts @@ -3,7 +3,7 @@ import { Group, Mesh, Object3D, PerspectiveCamera } from "three"; import { quest_editor_store } from "../stores/QuestEditorStore"; import { QuestEntityControls } from "./QuestEntityControls"; import { QuestModelManager } from "./QuestModelManager"; -import { Renderer } from "../../core/rendering/Renderer"; +import { Renderer } from "../../../core/rendering/Renderer"; import { EntityUserData } from "./conversion/entities"; import { ObservableQuestEntity } from "../domain/observable_quest_entities"; diff --git a/src/quest_editor/rendering/conversion/areas.ts b/src/old/quest_editor/rendering/conversion/areas.ts similarity index 91% rename from src/quest_editor/rendering/conversion/areas.ts rename to src/old/quest_editor/rendering/conversion/areas.ts index 4588d192..9456d2fc 100644 --- a/src/quest_editor/rendering/conversion/areas.ts +++ b/src/old/quest_editor/rendering/conversion/areas.ts @@ -10,10 +10,10 @@ import { Vector3, Color, } from "three"; -import { CollisionObject } from "../../../core/data_formats/parsing/area_collision_geometry"; -import { RenderObject } from "../../../core/data_formats/parsing/area_geometry"; -import { GeometryBuilder } from "../../../core/rendering/conversion/GeometryBuilder"; -import { ninja_object_to_geometry_builder } from "../../../core/rendering/conversion/ninja_geometry"; +import { CollisionObject } from "../../../../core/data_formats/parsing/area_collision_geometry"; +import { RenderObject } from "../../../../core/data_formats/parsing/area_geometry"; +import { GeometryBuilder } from "../../../../core/rendering/conversion/GeometryBuilder"; +import { ninja_object_to_geometry_builder } from "../../../../core/rendering/conversion/ninja_geometry"; import { Section } from "../../domain/Section"; const materials = [ diff --git a/src/quest_editor/rendering/conversion/entities.ts b/src/old/quest_editor/rendering/conversion/entities.ts similarity index 89% rename from src/quest_editor/rendering/conversion/entities.ts rename to src/old/quest_editor/rendering/conversion/entities.ts index eddf4256..94bc4c56 100644 --- a/src/quest_editor/rendering/conversion/entities.ts +++ b/src/old/quest_editor/rendering/conversion/entities.ts @@ -1,7 +1,7 @@ import { BufferGeometry, DoubleSide, Mesh, MeshLambertMaterial, Texture } from "three"; -import { create_mesh } from "../../../core/rendering/conversion/create_mesh"; -import { ObjectType } from "../../../core/data_formats/parsing/quest/object_types"; -import { NpcType } from "../../../core/data_formats/parsing/quest/npc_types"; +import { create_mesh } from "../../../../core/rendering/conversion/create_mesh"; +import { ObjectType } from "../../../../core/data_formats/parsing/quest/object_types"; +import { NpcType } from "../../../../core/data_formats/parsing/quest/npc_types"; import { ObservableQuestEntity, ObservableQuestNpc, diff --git a/src/quest_editor/scripting/AssemblyAnalyser.ts b/src/old/quest_editor/scripting/AssemblyAnalyser.ts similarity index 100% rename from src/quest_editor/scripting/AssemblyAnalyser.ts rename to src/old/quest_editor/scripting/AssemblyAnalyser.ts diff --git a/src/quest_editor/scripting/AssemblyLexer.test.ts b/src/old/quest_editor/scripting/AssemblyLexer.test.ts similarity index 100% rename from src/quest_editor/scripting/AssemblyLexer.test.ts rename to src/old/quest_editor/scripting/AssemblyLexer.test.ts diff --git a/src/quest_editor/scripting/AssemblyLexer.ts b/src/old/quest_editor/scripting/AssemblyLexer.ts similarity index 100% rename from src/quest_editor/scripting/AssemblyLexer.ts rename to src/old/quest_editor/scripting/AssemblyLexer.ts diff --git a/src/quest_editor/scripting/assembly.test.ts b/src/old/quest_editor/scripting/assembly.test.ts similarity index 100% rename from src/quest_editor/scripting/assembly.test.ts rename to src/old/quest_editor/scripting/assembly.test.ts diff --git a/src/quest_editor/scripting/assembly.ts b/src/old/quest_editor/scripting/assembly.ts similarity index 100% rename from src/quest_editor/scripting/assembly.ts rename to src/old/quest_editor/scripting/assembly.ts diff --git a/src/quest_editor/scripting/assembly_worker.ts b/src/old/quest_editor/scripting/assembly_worker.ts similarity index 100% rename from src/quest_editor/scripting/assembly_worker.ts rename to src/old/quest_editor/scripting/assembly_worker.ts diff --git a/src/quest_editor/scripting/assembly_worker_messages.ts b/src/old/quest_editor/scripting/assembly_worker_messages.ts similarity index 100% rename from src/quest_editor/scripting/assembly_worker_messages.ts rename to src/old/quest_editor/scripting/assembly_worker_messages.ts diff --git a/src/quest_editor/scripting/data_flow_analysis/ControlFlowGraph.test.ts b/src/old/quest_editor/scripting/data_flow_analysis/ControlFlowGraph.test.ts similarity index 100% rename from src/quest_editor/scripting/data_flow_analysis/ControlFlowGraph.test.ts rename to src/old/quest_editor/scripting/data_flow_analysis/ControlFlowGraph.test.ts diff --git a/src/quest_editor/scripting/data_flow_analysis/ControlFlowGraph.ts b/src/old/quest_editor/scripting/data_flow_analysis/ControlFlowGraph.ts similarity index 100% rename from src/quest_editor/scripting/data_flow_analysis/ControlFlowGraph.ts rename to src/old/quest_editor/scripting/data_flow_analysis/ControlFlowGraph.ts diff --git a/src/quest_editor/scripting/data_flow_analysis/ValueSet.test.ts b/src/old/quest_editor/scripting/data_flow_analysis/ValueSet.test.ts similarity index 100% rename from src/quest_editor/scripting/data_flow_analysis/ValueSet.test.ts rename to src/old/quest_editor/scripting/data_flow_analysis/ValueSet.test.ts diff --git a/src/quest_editor/scripting/data_flow_analysis/ValueSet.ts b/src/old/quest_editor/scripting/data_flow_analysis/ValueSet.ts similarity index 100% rename from src/quest_editor/scripting/data_flow_analysis/ValueSet.ts rename to src/old/quest_editor/scripting/data_flow_analysis/ValueSet.ts diff --git a/src/quest_editor/scripting/data_flow_analysis/register_value.test.ts b/src/old/quest_editor/scripting/data_flow_analysis/register_value.test.ts similarity index 100% rename from src/quest_editor/scripting/data_flow_analysis/register_value.test.ts rename to src/old/quest_editor/scripting/data_flow_analysis/register_value.test.ts diff --git a/src/quest_editor/scripting/data_flow_analysis/register_value.ts b/src/old/quest_editor/scripting/data_flow_analysis/register_value.ts similarity index 100% rename from src/quest_editor/scripting/data_flow_analysis/register_value.ts rename to src/old/quest_editor/scripting/data_flow_analysis/register_value.ts diff --git a/src/quest_editor/scripting/data_flow_analysis/stack_value.ts b/src/old/quest_editor/scripting/data_flow_analysis/stack_value.ts similarity index 100% rename from src/quest_editor/scripting/data_flow_analysis/stack_value.ts rename to src/old/quest_editor/scripting/data_flow_analysis/stack_value.ts diff --git a/src/quest_editor/scripting/disassembly.test.ts b/src/old/quest_editor/scripting/disassembly.test.ts similarity index 83% rename from src/quest_editor/scripting/disassembly.test.ts rename to src/old/quest_editor/scripting/disassembly.test.ts index b13a32bc..9c3fa6b3 100644 --- a/src/quest_editor/scripting/disassembly.test.ts +++ b/src/old/quest_editor/scripting/disassembly.test.ts @@ -1,9 +1,9 @@ import { readFileSync } from "fs"; -import { Endianness } from "../../core/data_formats/Endianness"; -import { prs_decompress } from "../../core/data_formats/compression/prs/decompress"; -import { ArrayBufferCursor } from "../../core/data_formats/cursor/ArrayBufferCursor"; -import { BufferCursor } from "../../core/data_formats/cursor/BufferCursor"; -import { parse_bin, write_bin } from "../../core/data_formats/parsing/quest/bin"; +import { Endianness } from "../../../core/data_formats/Endianness"; +import { prs_decompress } from "../../../core/data_formats/compression/prs/decompress"; +import { ArrayBufferCursor } from "../../../core/data_formats/cursor/ArrayBufferCursor"; +import { BufferCursor } from "../../../core/data_formats/cursor/BufferCursor"; +import { parse_bin, write_bin } from "../../../core/data_formats/parsing/quest/bin"; import { assemble } from "./assembly"; import { disassemble } from "./disassembly"; diff --git a/src/quest_editor/scripting/disassembly.ts b/src/old/quest_editor/scripting/disassembly.ts similarity index 100% rename from src/quest_editor/scripting/disassembly.ts rename to src/old/quest_editor/scripting/disassembly.ts diff --git a/src/quest_editor/scripting/instructions.ts b/src/old/quest_editor/scripting/instructions.ts similarity index 100% rename from src/quest_editor/scripting/instructions.ts rename to src/old/quest_editor/scripting/instructions.ts diff --git a/src/quest_editor/scripting/opcodes.ts b/src/old/quest_editor/scripting/opcodes.ts similarity index 100% rename from src/quest_editor/scripting/opcodes.ts rename to src/old/quest_editor/scripting/opcodes.ts diff --git a/src/quest_editor/scripting/vm/index.ts b/src/old/quest_editor/scripting/vm/index.ts similarity index 100% rename from src/quest_editor/scripting/vm/index.ts rename to src/old/quest_editor/scripting/vm/index.ts diff --git a/src/quest_editor/stores/AreaStore.ts b/src/old/quest_editor/stores/AreaStore.ts similarity index 91% rename from src/quest_editor/stores/AreaStore.ts rename to src/old/quest_editor/stores/AreaStore.ts index fb6e53f7..6f34f489 100644 --- a/src/quest_editor/stores/AreaStore.ts +++ b/src/old/quest_editor/stores/AreaStore.ts @@ -1,6 +1,6 @@ import { load_area_sections } from "../loading/areas"; -import { Episode, EPISODES } from "../../core/data_formats/parsing/quest/Episode"; -import { get_areas_for_episode } from "../../core/data_formats/parsing/quest/areas"; +import { Episode, EPISODES } from "../../../core/data_formats/parsing/quest/Episode"; +import { get_areas_for_episode } from "../../../core/data_formats/parsing/quest/areas"; import { ObservableAreaVariant } from "../domain/ObservableAreaVariant"; import { ObservableArea } from "../domain/ObservableArea"; import { Section } from "../domain/Section"; diff --git a/src/quest_editor/stores/QuestEditorStore.ts b/src/old/quest_editor/stores/QuestEditorStore.ts similarity index 90% rename from src/quest_editor/stores/QuestEditorStore.ts rename to src/old/quest_editor/stores/QuestEditorStore.ts index 472d1a58..a70febce 100644 --- a/src/quest_editor/stores/QuestEditorStore.ts +++ b/src/old/quest_editor/stores/QuestEditorStore.ts @@ -1,16 +1,15 @@ import Logger from "js-logger"; import { action, flow, observable } from "mobx"; -import { Endianness } from "../../core/data_formats/Endianness"; -import { ArrayBufferCursor } from "../../core/data_formats/cursor/ArrayBufferCursor"; -import { parse_quest, write_quest_qst } from "../../core/data_formats/parsing/quest"; -import { Vec3 } from "../../core/data_formats/vector"; -import { read_file } from "../../core/read_file"; -import { SimpleUndo, undo_manager, UndoStack } from "../../core/undo"; -import { application_store } from "../../application/stores/ApplicationStore"; +import { Endianness } from "../../../core/data_formats/Endianness"; +import { ArrayBufferCursor } from "../../../core/data_formats/cursor/ArrayBufferCursor"; +import { parse_quest, write_quest_qst } from "../../../core/data_formats/parsing/quest"; +import { Vec3 } from "../../../core/data_formats/vector"; +import { read_file } from "../../../core/read_file"; +import { SimpleUndo, UndoStack } from "../../core/undo"; import { area_store } from "./AreaStore"; import { create_new_quest } from "./quest_creation"; -import { Episode } from "../../core/data_formats/parsing/quest/Episode"; -import { entity_data } from "../../core/data_formats/parsing/quest/entities"; +import { Episode } from "../../../core/data_formats/parsing/quest/Episode"; +import { entity_data } from "../../../core/data_formats/parsing/quest/entities"; import { ObservableQuest } from "../domain/ObservableQuest"; import { ObservableArea } from "../domain/ObservableArea"; import { Section } from "../domain/Section"; @@ -38,19 +37,19 @@ class QuestEditorStore { @observable save_dialog_open: boolean = false; constructor() { - application_store.on_global_keyup("quest_editor", "Ctrl-Z", () => { - // Let Monaco handle its own key bindings. - if (undo_manager.current !== this.script_undo) { - undo_manager.undo(); - } - }); - application_store.on_global_keyup("quest_editor", "Ctrl-Shift-Z", () => { - // Let Monaco handle its own key bindings. - if (undo_manager.current !== this.script_undo) { - undo_manager.redo(); - } - }); - application_store.on_global_keyup("quest_editor", "Ctrl-Alt-D", this.toggle_debug); + // application_store.on_global_keyup("quest_editor", "Ctrl-Z", () => { + // // Let Monaco handle its own key bindings. + // if (undo_manager.current !== this.script_undo) { + // undo_manager.undo(); + // } + // }); + // application_store.on_global_keyup("quest_editor", "Ctrl-Shift-Z", () => { + // // Let Monaco handle its own key bindings. + // if (undo_manager.current !== this.script_undo) { + // undo_manager.redo(); + // } + // }); + // application_store.on_global_keyup("quest_editor", "Ctrl-Alt-D", this.toggle_debug); } @action diff --git a/src/quest_editor/stores/quest_creation.ts b/src/old/quest_editor/stores/quest_creation.ts similarity index 98% rename from src/quest_editor/stores/quest_creation.ts rename to src/old/quest_editor/stores/quest_creation.ts index 205e9802..a691468a 100644 --- a/src/quest_editor/stores/quest_creation.ts +++ b/src/old/quest_editor/stores/quest_creation.ts @@ -1,9 +1,9 @@ -import { Vec3 } from "../../core/data_formats/vector"; +import { Vec3 } from "../../../core/data_formats/vector"; import { Instruction, SegmentType } from "../scripting/instructions"; import { Opcode } from "../scripting/opcodes"; -import { Episode } from "../../core/data_formats/parsing/quest/Episode"; -import { ObjectType } from "../../core/data_formats/parsing/quest/object_types"; -import { NpcType } from "../../core/data_formats/parsing/quest/npc_types"; +import { Episode } from "../../../core/data_formats/parsing/quest/Episode"; +import { ObjectType } from "../../../core/data_formats/parsing/quest/object_types"; +import { NpcType } from "../../../core/data_formats/parsing/quest/npc_types"; import { ObservableQuest } from "../domain/ObservableQuest"; import { ObservableQuestNpc, ObservableQuestObject } from "../domain/observable_quest_entities"; diff --git a/src/quest_editor/ui/AddObjectComponent.tsx b/src/old/quest_editor/ui/AddObjectComponent.tsx similarity index 94% rename from src/quest_editor/ui/AddObjectComponent.tsx rename to src/old/quest_editor/ui/AddObjectComponent.tsx index dab83b54..416077a0 100644 --- a/src/quest_editor/ui/AddObjectComponent.tsx +++ b/src/old/quest_editor/ui/AddObjectComponent.tsx @@ -5,7 +5,7 @@ import { object_data, OBJECT_TYPES, ObjectType, -} from "../../core/data_formats/parsing/quest/object_types"; +} from "../../../core/data_formats/parsing/quest/object_types"; const drag_helper = document.createElement("div"); drag_helper.id = "drag_helper"; diff --git a/src/quest_editor/ui/AssemblyEditorComponent.css b/src/old/quest_editor/ui/AssemblyEditorComponent.css similarity index 100% rename from src/quest_editor/ui/AssemblyEditorComponent.css rename to src/old/quest_editor/ui/AssemblyEditorComponent.css diff --git a/src/quest_editor/ui/AssemblyEditorComponent.tsx b/src/old/quest_editor/ui/AssemblyEditorComponent.tsx similarity index 100% rename from src/quest_editor/ui/AssemblyEditorComponent.tsx rename to src/old/quest_editor/ui/AssemblyEditorComponent.tsx diff --git a/src/quest_editor/ui/EntityInfoComponent.css b/src/old/quest_editor/ui/EntityInfoComponent.css similarity index 100% rename from src/quest_editor/ui/EntityInfoComponent.css rename to src/old/quest_editor/ui/EntityInfoComponent.css diff --git a/src/quest_editor/ui/EntityInfoComponent.tsx b/src/old/quest_editor/ui/EntityInfoComponent.tsx similarity index 96% rename from src/quest_editor/ui/EntityInfoComponent.tsx rename to src/old/quest_editor/ui/EntityInfoComponent.tsx index 3e4a5acb..9733b4eb 100644 --- a/src/quest_editor/ui/EntityInfoComponent.tsx +++ b/src/old/quest_editor/ui/EntityInfoComponent.tsx @@ -2,11 +2,11 @@ import { InputNumber } from "antd"; import { autorun, IReactionDisposer } from "mobx"; import { observer } from "mobx-react"; import React, { Component, PureComponent, ReactNode } from "react"; -import { Vec3 } from "../../core/data_formats/vector"; +import { Vec3 } from "../../../core/data_formats/vector"; import { quest_editor_store } from "../stores/QuestEditorStore"; import { DisabledTextComponent } from "../../core/ui/DisabledTextComponent"; import styles from "./EntityInfoComponent.css"; -import { entity_data, entity_type_to_string } from "../../core/data_formats/parsing/quest/entities"; +import { entity_data, entity_type_to_string } from "../../../core/data_formats/parsing/quest/entities"; import { ObservableQuestEntity, ObservableQuestNpc } from "../domain/observable_quest_entities"; @observer diff --git a/src/quest_editor/ui/NpcCountsComponent.css b/src/old/quest_editor/ui/NpcCountsComponent.css similarity index 100% rename from src/quest_editor/ui/NpcCountsComponent.css rename to src/old/quest_editor/ui/NpcCountsComponent.css diff --git a/src/quest_editor/ui/NpcCountsComponent.tsx b/src/old/quest_editor/ui/NpcCountsComponent.tsx similarity index 93% rename from src/quest_editor/ui/NpcCountsComponent.tsx rename to src/old/quest_editor/ui/NpcCountsComponent.tsx index 5eb1b6a6..7473eb35 100644 --- a/src/quest_editor/ui/NpcCountsComponent.tsx +++ b/src/old/quest_editor/ui/NpcCountsComponent.tsx @@ -1,6 +1,6 @@ import React, { Component, ReactNode } from "react"; import styles from "./NpcCountsComponent.css"; -import { npc_data, NpcType } from "../../core/data_formats/parsing/quest/npc_types"; +import { npc_data, NpcType } from "../../../core/data_formats/parsing/quest/npc_types"; import { quest_editor_store } from "../stores/QuestEditorStore"; import { observer } from "mobx-react"; diff --git a/src/quest_editor/ui/QuestEditorComponent.css b/src/old/quest_editor/ui/QuestEditorComponent.css similarity index 100% rename from src/quest_editor/ui/QuestEditorComponent.css rename to src/old/quest_editor/ui/QuestEditorComponent.css diff --git a/src/quest_editor/ui/QuestEditorComponent.tsx b/src/old/quest_editor/ui/QuestEditorComponent.tsx similarity index 100% rename from src/quest_editor/ui/QuestEditorComponent.tsx rename to src/old/quest_editor/ui/QuestEditorComponent.tsx diff --git a/src/quest_editor/ui/QuestInfoComponent.css b/src/old/quest_editor/ui/QuestInfoComponent.css similarity index 100% rename from src/quest_editor/ui/QuestInfoComponent.css rename to src/old/quest_editor/ui/QuestInfoComponent.css diff --git a/src/quest_editor/ui/QuestInfoComponent.tsx b/src/old/quest_editor/ui/QuestInfoComponent.tsx similarity index 98% rename from src/quest_editor/ui/QuestInfoComponent.tsx rename to src/old/quest_editor/ui/QuestInfoComponent.tsx index 33c605e1..7fe3739b 100644 --- a/src/quest_editor/ui/QuestInfoComponent.tsx +++ b/src/old/quest_editor/ui/QuestInfoComponent.tsx @@ -3,7 +3,7 @@ import React, { ChangeEvent, Component, ReactNode } from "react"; import { quest_editor_store } from "../stores/QuestEditorStore"; import { DisabledTextComponent } from "../../core/ui/DisabledTextComponent"; import styles from "./QuestInfoComponent.css"; -import { Episode } from "../../core/data_formats/parsing/quest/Episode"; +import { Episode } from "../../../core/data_formats/parsing/quest/Episode"; import { NumberInput } from "../../core/ui/NumberInput"; import { TextInput } from "../../core/ui/TextInput"; import { TextArea } from "../../core/ui/TextArea"; diff --git a/src/quest_editor/ui/QuestRendererComponent.tsx b/src/old/quest_editor/ui/QuestRendererComponent.tsx similarity index 100% rename from src/quest_editor/ui/QuestRendererComponent.tsx rename to src/old/quest_editor/ui/QuestRendererComponent.tsx diff --git a/src/quest_editor/ui/Toolbar.css b/src/old/quest_editor/ui/Toolbar.css similarity index 100% rename from src/quest_editor/ui/Toolbar.css rename to src/old/quest_editor/ui/Toolbar.css diff --git a/src/quest_editor/ui/Toolbar.tsx b/src/old/quest_editor/ui/Toolbar.tsx similarity index 98% rename from src/quest_editor/ui/Toolbar.tsx rename to src/old/quest_editor/ui/Toolbar.tsx index cbc16713..2e5b73b6 100644 --- a/src/quest_editor/ui/Toolbar.tsx +++ b/src/old/quest_editor/ui/Toolbar.tsx @@ -7,7 +7,7 @@ import { area_store } from "../stores/AreaStore"; import { quest_editor_store } from "../stores/QuestEditorStore"; import { undo_manager } from "../../core/undo"; import styles from "./Toolbar.css"; -import { Episode } from "../../core/data_formats/parsing/quest/Episode"; +import { Episode } from "../../../core/data_formats/parsing/quest/Episode"; @observer export class Toolbar extends Component { diff --git a/src/new/viewer/domain/CharacterClassAnimation.ts b/src/viewer/domain/CharacterClassAnimation.ts similarity index 100% rename from src/new/viewer/domain/CharacterClassAnimation.ts rename to src/viewer/domain/CharacterClassAnimation.ts diff --git a/src/new/viewer/domain/CharacterClassModel.ts b/src/viewer/domain/CharacterClassModel.ts similarity index 100% rename from src/new/viewer/domain/CharacterClassModel.ts rename to src/viewer/domain/CharacterClassModel.ts diff --git a/src/viewer/domain/index.ts b/src/viewer/domain/index.ts deleted file mode 100644 index 5fbf724a..00000000 --- a/src/viewer/domain/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -export class PlayerModel { - constructor( - readonly name: string, - readonly head_style_count: number, - readonly hair_styles_count: number, - readonly hair_styles_with_accessory: Set, - ) {} -} - -export class PlayerAnimation { - constructor(readonly id: number, readonly name: string) {} -} diff --git a/src/new/viewer/gui/ModelView.css b/src/viewer/gui/ModelView.css similarity index 100% rename from src/new/viewer/gui/ModelView.css rename to src/viewer/gui/ModelView.css diff --git a/src/new/viewer/gui/ModelView.ts b/src/viewer/gui/ModelView.ts similarity index 93% rename from src/new/viewer/gui/ModelView.ts rename to src/viewer/gui/ModelView.ts index cfc5a054..d5832be8 100644 --- a/src/new/viewer/gui/ModelView.ts +++ b/src/viewer/gui/ModelView.ts @@ -10,8 +10,9 @@ import { View } from "../../core/gui/View"; import { FileButton } from "../../core/gui/FileButton"; import { CheckBox } from "../../core/gui/CheckBox"; import { NumberInput } from "../../core/gui/NumberInput"; -import { PSO_FRAME_RATE } from "../../../core/rendering/conversion/ninja_animation"; import { Label } from "../../core/gui/Label"; +import { gui_store, GuiTool } from "../../core/stores/GuiStore"; +import { PSO_FRAME_RATE } from "../../core/rendering/conversion/ninja_animation"; const MODEL_LIST_WIDTH = 100; const ANIMATION_LIST_WIDTH = 150; @@ -43,6 +44,18 @@ export class ModelView extends ResizableView { this.element.append(this.tool_bar_view.element, this.container_element); model_store.current_model.set(model_store.models[5]); + + this.renderer_view.start_rendering(); + + this.disposable( + gui_store.tool.observe(tool => { + if (tool === GuiTool.Viewer) { + this.renderer_view.start_rendering(); + } else { + this.renderer_view.stop_rendering(); + } + }), + ); } resize(width: number, height: number): this { diff --git a/src/new/viewer/gui/TextureView.ts b/src/viewer/gui/TextureView.ts similarity index 100% rename from src/new/viewer/gui/TextureView.ts rename to src/viewer/gui/TextureView.ts diff --git a/src/new/viewer/gui/ViewerView.ts b/src/viewer/gui/ViewerView.ts similarity index 100% rename from src/new/viewer/gui/ViewerView.ts rename to src/viewer/gui/ViewerView.ts diff --git a/src/viewer/loading/character_class.ts b/src/viewer/loading/character_class.ts index a0d10f74..31c2dd02 100644 --- a/src/viewer/loading/character_class.ts +++ b/src/viewer/loading/character_class.ts @@ -8,12 +8,14 @@ export async function get_character_class_data( return await load_array_buffer(character_class_to_url(player_class, body_part, no)); } -export async function get_character_class_animation_data(animation_id: number): Promise { +export async function get_character_class_animation_data( + animation_id: number, +): Promise { return await load_array_buffer( `/player/animation/animation_${animation_id.toString().padStart(3, "0")}.njm`, ); } function character_class_to_url(player_class: string, body_part: string, no?: number): string { - return `/player/${player_class}${body_part}${no == undefined ? "" : no}.nj`; + return `/player/${player_class}${body_part}${no == null ? "" : no}.nj`; } diff --git a/src/viewer/rendering/ModelRenderer.ts b/src/viewer/rendering/ModelRenderer.ts index d19f4404..100ba702 100644 --- a/src/viewer/rendering/ModelRenderer.ts +++ b/src/viewer/rendering/ModelRenderer.ts @@ -1,45 +1,55 @@ -import { autorun } from "mobx"; -import { Object3D, PerspectiveCamera, SkeletonHelper, Vector3 } from "three"; -import { model_viewer_store } from "../stores/ModelViewerStore"; +import { + AnimationAction, + AnimationClip, + AnimationMixer, + Clock, + DoubleSide, + Mesh, + MeshLambertMaterial, + Object3D, + PerspectiveCamera, + SkeletonHelper, + SkinnedMesh, + Vector3, +} from "three"; +import { model_store } from "../stores/ModelStore"; +import { Disposable } from "../../core/observable/Disposable"; +import { NjMotion } from "../../core/data_formats/parsing/ninja/motion"; +import { xvm_to_textures } from "../../core/rendering/conversion/ninja_textures"; +import { create_mesh, create_skinned_mesh } from "../../core/rendering/conversion/create_mesh"; +import { ninja_object_to_buffer_geometry } from "../../core/rendering/conversion/ninja_geometry"; +import { + create_animation_clip, + PSO_FRAME_RATE, +} from "../../core/rendering/conversion/ninja_animation"; import { Renderer } from "../../core/rendering/Renderer"; -let renderer: ModelRenderer | undefined; - -export function get_model_renderer(): ModelRenderer { - if (!renderer) renderer = new ModelRenderer(); - return renderer; -} - -export class ModelRenderer extends Renderer { - private model?: Object3D; +export class ModelRenderer extends Renderer implements Disposable { + private readonly perspective_camera: PerspectiveCamera; + private readonly disposables: Disposable[] = []; + private readonly clock = new Clock(); + private mesh?: Object3D; private skeleton_helper?: SkeletonHelper; - private perspective_camera: PerspectiveCamera; + private animation?: { + mixer: AnimationMixer; + clip: AnimationClip; + action: AnimationAction; + }; constructor() { super(new PerspectiveCamera(75, 1, 1, 200)); this.perspective_camera = this.camera as PerspectiveCamera; - autorun(() => { - this.set_model(model_viewer_store.current_obj3d); - - const show_skeleton = model_viewer_store.show_skeleton; - - if (this.skeleton_helper) { - this.skeleton_helper.visible = show_skeleton; - this.schedule_render(); - } - - if (model_viewer_store.animation) { - this.schedule_render(); - } - - if (!model_viewer_store.animation_playing) { - // Reference animation_frame here to make sure we render when the user sets the frame manually. - model_viewer_store.animation_frame; - this.schedule_render(); - } - }); + this.disposables.push( + model_store.current_nj_data.observe(this.nj_data_or_xvm_changed), + model_store.current_xvm.observe(this.nj_data_or_xvm_changed), + model_store.current_nj_motion.observe(this.nj_motion_changed), + model_store.show_skeleton.observe(this.show_skeleton_changed), + model_store.animation_playing.observe(this.animation_playing_changed), + model_store.animation_frame_rate.observe(this.animation_frame_rate_changed), + model_store.animation_frame.observe(this.animation_frame_changed), + ); } set_size(width: number, height: number): void { @@ -48,39 +58,157 @@ export class ModelRenderer extends Renderer { super.set_size(width, height); } + dispose(): void { + super.dispose(); + this.disposables.forEach(d => d.dispose()); + } + protected render(): void { - if (model_viewer_store.animation) { - model_viewer_store.animation.mixer.update(model_viewer_store.clock.getDelta()); - model_viewer_store.update_animation_frame(); + if (this.animation) { + this.animation.mixer.update(this.clock.getDelta()); } this.light_holder.quaternion.copy(this.perspective_camera.quaternion); super.render(); - if (model_viewer_store.animation && !model_viewer_store.animation.action.paused) { + if (this.animation && !this.animation.action.paused) { + this.update_animation_frame(); this.schedule_render(); } } - private set_model(model?: Object3D): void { - if (this.model !== model) { - if (this.model) { - this.scene.remove(this.model); - this.scene.remove(this.skeleton_helper!); - this.skeleton_helper = undefined; + private nj_data_or_xvm_changed = () => { + if (this.mesh) { + this.scene.remove(this.mesh); + this.mesh = undefined; + this.scene.remove(this.skeleton_helper!); + this.skeleton_helper = undefined; + } + + if (this.animation) { + this.animation.mixer.stopAllAction(); + if (this.mesh) this.animation.mixer.uncacheRoot(this.mesh); + this.animation = undefined; + } + + const nj_data = model_store.current_nj_data.get(); + + if (nj_data) { + const { nj_object, has_skeleton } = nj_data; + + let mesh: Mesh; + + const xvm = model_store.current_xvm.get(); + const textures = xvm ? xvm_to_textures(xvm) : undefined; + + const materials = + textures && + textures.map( + tex => + new MeshLambertMaterial({ + skinning: has_skeleton, + map: tex, + side: DoubleSide, + alphaTest: 0.5, + }), + ); + + if (has_skeleton) { + mesh = create_skinned_mesh(ninja_object_to_buffer_geometry(nj_object), materials); + } else { + mesh = create_mesh(ninja_object_to_buffer_geometry(nj_object), materials); } - if (model) { - this.scene.add(model); - this.skeleton_helper = new SkeletonHelper(model); - this.skeleton_helper.visible = model_viewer_store.show_skeleton; - (this.skeleton_helper.material as any).linewidth = 3; - this.scene.add(this.skeleton_helper); - this.reset_camera(new Vector3(0, 10, 20), new Vector3(0, 0, 0)); - } + // Make sure we rotate around the center of the model instead of its origin. + const bb = mesh.geometry.boundingBox; + const height = bb.max.y - bb.min.y; + mesh.translateY(-height / 2 - bb.min.y); - this.model = model; + this.mesh = mesh; + this.scene.add(mesh); + + this.skeleton_helper = new SkeletonHelper(mesh); + this.skeleton_helper.visible = model_store.show_skeleton.get(); + (this.skeleton_helper.material as any).linewidth = 3; + this.scene.add(this.skeleton_helper); + + this.reset_camera(new Vector3(0, 10, 20), new Vector3(0, 0, 0)); + } + + this.schedule_render(); + }; + + private nj_motion_changed = (nj_motion?: NjMotion) => { + let mixer!: AnimationMixer; + + if (this.animation) { + this.animation.mixer.stopAllAction(); + mixer = this.animation.mixer; + } + + const nj_data = model_store.current_nj_data.get(); + + if (!this.mesh || !(this.mesh instanceof SkinnedMesh) || !nj_motion || !nj_data) return; + + if (!this.animation) { + mixer = new AnimationMixer(this.mesh); + } + + const clip = create_animation_clip(nj_data.nj_object, nj_motion); + + this.animation = { + mixer, + clip, + action: mixer.clipAction(clip), + }; + + this.clock.start(); + this.animation.action.play(); + this.schedule_render(); + }; + + private show_skeleton_changed = (show_skeleton: boolean) => { + if (this.skeleton_helper) { + this.skeleton_helper.visible = show_skeleton; this.schedule_render(); } + }; + + private animation_playing_changed = (playing: boolean) => { + if (this.animation) { + this.animation.action.paused = !playing; + + if (playing) { + this.clock.start(); + this.schedule_render(); + } else { + this.clock.stop(); + } + } + }; + + private animation_frame_rate_changed = (frame_rate: number) => { + if (this.animation) { + this.animation.mixer.timeScale = frame_rate / PSO_FRAME_RATE; + } + }; + + private animation_frame_changed = (frame: number) => { + const nj_motion = model_store.current_nj_motion.get(); + + if (this.animation && nj_motion) { + const frame_count = nj_motion.frame_count; + if (frame > frame_count) frame = 1; + if (frame < 1) frame = frame_count; + this.animation.action.time = (frame - 1) / PSO_FRAME_RATE; + this.schedule_render(); + } + }; + + private update_animation_frame(): void { + if (this.animation && !this.animation.action.paused) { + const time = this.animation.action.time; + model_store.animation_frame.set(time * PSO_FRAME_RATE + 1); + } } } diff --git a/src/viewer/rendering/TextureRenderer.ts b/src/viewer/rendering/TextureRenderer.ts deleted file mode 100644 index 09add470..00000000 --- a/src/viewer/rendering/TextureRenderer.ts +++ /dev/null @@ -1,117 +0,0 @@ -import Logger from "js-logger"; -import { autorun } from "mobx"; -import { - Mesh, - MeshBasicMaterial, - OrthographicCamera, - PlaneGeometry, - Texture, - Vector2, - Vector3, -} from "three"; -import { Xvm } from "../../core/data_formats/parsing/ninja/texture"; -import { texture_viewer_store } from "../stores/TextureViewerStore"; -import { Renderer } from "../../core/rendering/Renderer"; -import { xvm_texture_to_texture } from "../../core/rendering/conversion/ninja_textures"; - -const logger = Logger.get("rendering/TextureRenderer"); - -let renderer: TextureRenderer | undefined; - -export function get_texture_renderer(): TextureRenderer { - if (!renderer) renderer = new TextureRenderer(); - return renderer; -} - -export class TextureRenderer extends Renderer { - private ortho_camera: OrthographicCamera; - private quad_meshes: Mesh[] = []; - - constructor() { - super(new OrthographicCamera(-400, 400, 300, -300, 1, 10)); - - this.ortho_camera = this.camera as OrthographicCamera; - - this.controls.azimuthRotateSpeed = 0; - this.controls.polarRotateSpeed = 0; - - autorun(() => { - this.scene.remove(...this.quad_meshes); - - const xvm = texture_viewer_store.current_xvm; - - if (xvm) { - this.render_textures(xvm); - } - - this.reset_camera(new Vector3(0, 0, 5), new Vector3()); - this.schedule_render(); - }); - } - - set_size(width: number, height: number): void { - this.ortho_camera.left = -Math.floor(width / 2); - this.ortho_camera.right = Math.ceil(width / 2); - this.ortho_camera.top = Math.floor(height / 2); - this.ortho_camera.bottom = -Math.ceil(height / 2); - this.ortho_camera.updateProjectionMatrix(); - super.set_size(width, height); - } - - private render_textures = (xvm: Xvm) => { - let total_width = 10 * (xvm.textures.length - 1); // 10px spacing between textures. - let total_height = 0; - - for (const tex of xvm.textures) { - total_width += tex.width; - total_height = Math.max(total_height, tex.height); - } - - let x = -Math.floor(total_width / 2); - const y = -Math.floor(total_height / 2); - - for (const tex of xvm.textures) { - let tex_3js: Texture | undefined; - - try { - tex_3js = xvm_texture_to_texture(tex); - } catch (e) { - logger.warn("Couldn't convert XVM texture.", e); - } - - const quad_mesh = new Mesh( - this.create_quad( - x, - y + Math.floor((total_height - tex.height) / 2), - tex.width, - tex.height, - ), - tex_3js - ? new MeshBasicMaterial({ - map: tex_3js, - transparent: true, - }) - : new MeshBasicMaterial({ - color: 0xff00ff, - }), - ); - - this.quad_meshes.push(quad_mesh); - this.scene.add(quad_mesh); - - x += 10 + tex.width; - } - }; - - private create_quad(x: number, y: number, width: number, height: number): PlaneGeometry { - const quad = new PlaneGeometry(width, height, 1, 1); - quad.faceVertexUvs = [ - [ - [new Vector2(0, 0), new Vector2(0, 1), new Vector2(1, 0)], - [new Vector2(0, 1), new Vector2(1, 1), new Vector2(1, 0)], - ], - ]; - quad.translate(x + width / 2, y + height / 2, -5); - return quad; - } -} diff --git a/src/new/viewer/stores/ModelStore.ts b/src/viewer/stores/ModelStore.ts similarity index 88% rename from src/new/viewer/stores/ModelStore.ts rename to src/viewer/stores/ModelStore.ts index 0b288702..d93f4eab 100644 --- a/src/new/viewer/stores/ModelStore.ts +++ b/src/viewer/stores/ModelStore.ts @@ -1,21 +1,20 @@ -import { ArrayBufferCursor } from "../../../core/data_formats/cursor/ArrayBufferCursor"; -import { Endianness } from "../../../core/data_formats/Endianness"; -import { NjMotion, parse_njm } from "../../../core/data_formats/parsing/ninja/motion"; -import { NjObject, parse_nj, parse_xj } from "../../../core/data_formats/parsing/ninja"; +import { ArrayBufferCursor } from "../../core/data_formats/cursor/ArrayBufferCursor"; +import { Endianness } from "../../core/data_formats/Endianness"; +import { NjMotion, parse_njm } from "../../core/data_formats/parsing/ninja/motion"; +import { NjObject, parse_nj, parse_xj } from "../../core/data_formats/parsing/ninja"; import { CharacterClassModel } from "../domain/CharacterClassModel"; import { CharacterClassAnimation } from "../domain/CharacterClassAnimation"; import { WritableProperty } from "../../core/observable/WritableProperty"; +import { Disposable } from "../../core/observable/Disposable"; +import { read_file } from "../../core/read_file"; +import { property } from "../../core/observable"; +import { Property } from "../../core/observable/Property"; +import { PSO_FRAME_RATE } from "../../core/rendering/conversion/ninja_animation"; +import { parse_xvm, Xvm } from "../../core/data_formats/parsing/ninja/texture"; import { get_character_class_animation_data, get_character_class_data, -} from "../../../viewer/loading/character_class"; -import { Disposable } from "../../core/observable/Disposable"; -import { read_file } from "../../../core/read_file"; -import { property } from "../../core/observable"; -import { Property } from "../../core/observable/Property"; -import { PSO_FRAME_RATE } from "../../../core/rendering/conversion/ninja_animation"; -import { parse_xvm, Xvm } from "../../../core/data_formats/parsing/ninja/texture"; -import { gui_store, GuiTool } from "../../core/stores/GuiStore"; +} from "../loading/character_class"; import Logger = require("js-logger"); const logger = Logger.get("viewer/stores/ModelStore"); @@ -79,19 +78,6 @@ export class ModelStore implements Disposable { this.current_model.observe(this.load_model), this.current_animation.observe(this.load_animation), ); - - let prev_animation_playing = this.animation_playing.get(); - - this.disposables.push( - gui_store.tool.observe(tool => { - if (tool === GuiTool.Viewer) { - this.animation_playing.set(prev_animation_playing); - } else { - prev_animation_playing = this.animation_playing.get(); - this.animation_playing.set(false); - } - }), - ); } dispose(): void { diff --git a/src/viewer/stores/ModelViewerStore.ts b/src/viewer/stores/ModelViewerStore.ts deleted file mode 100644 index 1ef2bf10..00000000 --- a/src/viewer/stores/ModelViewerStore.ts +++ /dev/null @@ -1,329 +0,0 @@ -import Logger from "js-logger"; -import { action, observable } from "mobx"; -import { - AnimationAction, - AnimationClip, - AnimationMixer, - Clock, - DoubleSide, - Mesh, - MeshLambertMaterial, - SkinnedMesh, - Texture, -} from "three"; -import { Endianness } from "../../core/data_formats/Endianness"; -import { ArrayBufferCursor } from "../../core/data_formats/cursor/ArrayBufferCursor"; -import { NjModel, NjObject, parse_nj, parse_xj } from "../../core/data_formats/parsing/ninja"; -import { NjMotion, parse_njm } from "../../core/data_formats/parsing/ninja/motion"; -import { parse_xvm } from "../../core/data_formats/parsing/ninja/texture"; -import { get_character_class_animation_data, get_character_class_data } from "../loading/character_class"; -import { read_file } from "../../core/read_file"; -import { create_skinned_mesh, create_mesh } from "../../core/rendering/conversion/create_mesh"; -import { - create_animation_clip, - PSO_FRAME_RATE, -} from "../../core/rendering/conversion/ninja_animation"; -import { ninja_object_to_buffer_geometry } from "../../core/rendering/conversion/ninja_geometry"; -import { xvm_to_textures } from "../../core/rendering/conversion/ninja_textures"; -import { PlayerAnimation, PlayerModel } from "../domain"; - -const logger = Logger.get("stores/ModelViewerStore"); -const nj_object_cache: Map>> = new Map(); -const nj_motion_cache: Map> = new Map(); - -// TODO: move all Three.js stuff into the renderer. -class ModelViewerStore { - readonly models: PlayerModel[] = [ - new PlayerModel("HUmar", 1, 10, new Set([6])), - new PlayerModel("HUnewearl", 1, 10, new Set()), - new PlayerModel("HUcast", 5, 0, new Set()), - new PlayerModel("HUcaseal", 5, 0, new Set()), - new PlayerModel("RAmar", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])), - new PlayerModel("RAmarl", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])), - new PlayerModel("RAcast", 5, 0, new Set()), - new PlayerModel("RAcaseal", 5, 0, new Set()), - new PlayerModel("FOmar", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])), - new PlayerModel("FOmarl", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])), - new PlayerModel("FOnewm", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])), - new PlayerModel("FOnewearl", 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])), - ]; - readonly animations: PlayerAnimation[] = new Array(572) - .fill(undefined) - .map((_, i) => new PlayerAnimation(i, `Animation ${i + 1}`)); - - readonly clock = new Clock(); - - @observable.ref current_player_model?: PlayerModel; - @observable.ref current_model?: NjObject; - @observable.ref current_bone_count: number = 0; - @observable.ref current_obj3d?: Mesh; - - @observable.ref animation?: { - player_animation?: PlayerAnimation; - mixer: AnimationMixer; - clip: AnimationClip; - action: AnimationAction; - }; - @observable animation_playing: boolean = false; - @observable animation_frame_rate: number = PSO_FRAME_RATE; - @observable animation_frame: number = 0; - @observable animation_frame_count: number = 0; - - private has_skeleton = false; - @observable show_skeleton: boolean = false; - - set_animation_frame_rate = action("set_animation_frame_rate", (rate: number) => { - if (this.animation) { - this.animation.mixer.timeScale = rate / PSO_FRAME_RATE; - this.animation_frame_rate = rate; - } - }); - - set_animation_frame = action("set_animation_frame", (frame: number) => { - if (this.animation) { - const frame_count = this.animation_frame_count; - if (frame > frame_count) frame = 1; - if (frame < 1) frame = frame_count; - this.animation.action.time = (frame - 1) / PSO_FRAME_RATE; - this.animation_frame = frame; - } - }); - - load_model = async (model: PlayerModel) => { - const object = await this.get_player_ninja_object(model); - this.set_model(object, true, model); - // Ignore the bones from the head parts. - this.current_bone_count = 64; - }; - - load_animation = async (animation: PlayerAnimation) => { - const nj_motion = await this.get_nj_motion(animation); - - if (this.current_model) { - this.set_animation(create_animation_clip(this.current_model, nj_motion), animation); - } - }; - - // TODO: notify user of problems. - load_file = async (file: File) => { - try { - const buffer = await read_file(file); - const cursor = new ArrayBufferCursor(buffer, Endianness.Little); - - if (file.name.endsWith(".nj")) { - const model = parse_nj(cursor)[0]; - this.set_model(model, true); - } else if (file.name.endsWith(".xj")) { - const model = parse_xj(cursor)[0]; - this.set_model(model, false); - } else if (file.name.endsWith(".njm")) { - if (this.current_model) { - const njm = parse_njm(cursor, this.current_bone_count); - this.set_animation(create_animation_clip(this.current_model, njm)); - } - } else if (file.name.endsWith(".xvm")) { - if (this.current_model) { - const xvm = parse_xvm(cursor); - this.set_textures(xvm_to_textures(xvm)); - } - } else { - logger.error(`Unknown file extension in filename "${file.name}".`); - } - } catch (e) { - logger.error("Couldn't read file.", e); - } - }; - - pause_animation = action("pause_animation", () => { - if (this.animation) { - this.animation.action.paused = true; - this.animation_playing = false; - this.clock.stop(); - } - }); - - toggle_animation_playing = action("toggle_animation_playing", () => { - if (this.animation) { - this.animation.action.paused = !this.animation.action.paused; - this.animation_playing = !this.animation.action.paused; - - if (this.animation_playing) { - this.clock.start(); - } else { - this.clock.stop(); - } - } - }); - - update_animation_frame = action("update_animation_frame", () => { - if (this.animation && this.animation_playing) { - const time = this.animation.action.time; - this.animation_frame = Math.round(time * PSO_FRAME_RATE) + 1; - } - }); - - set_animation = action("set_animation", (clip: AnimationClip, animation?: PlayerAnimation) => { - if (!this.current_obj3d || !(this.current_obj3d instanceof SkinnedMesh)) return; - - let mixer: AnimationMixer; - - if (this.animation) { - this.animation.mixer.stopAllAction(); - mixer = this.animation.mixer; - } else { - mixer = new AnimationMixer(this.current_obj3d); - } - - this.animation = { - player_animation: animation, - mixer, - clip, - action: mixer.clipAction(clip), - }; - - this.clock.start(); - this.animation.action.play(); - this.animation_playing = true; - this.animation_frame_count = Math.round(PSO_FRAME_RATE * clip.duration) + 1; - }); - - private set_model = action( - "set_model", - (model: NjObject, skeleton: boolean, player_model?: PlayerModel) => { - if (this.current_obj3d && this.animation) { - this.animation.mixer.stopAllAction(); - this.animation.mixer.uncacheRoot(this.current_obj3d); - this.animation = undefined; - } - - this.current_player_model = player_model; - this.current_model = model; - this.current_bone_count = model.bone_count(); - this.has_skeleton = skeleton; - - this.set_obj3d(); - }, - ); - - private add_to_bone( - object: NjObject, - head_part: NjObject, - bone_id: number, - ): void { - const bone = object.get_bone(bone_id); - - if (bone) { - bone.evaluation_flags.hidden = false; - bone.evaluation_flags.break_child_trace = false; - bone.children.push(head_part); - } - } - - private async get_player_ninja_object(model: PlayerModel): Promise> { - let ninja_object = nj_object_cache.get(model.name); - - if (ninja_object) { - return ninja_object; - } else { - ninja_object = this.get_all_assets(model); - nj_object_cache.set(model.name, ninja_object); - return ninja_object; - } - } - - private async get_all_assets(model: PlayerModel): Promise> { - const body_data = await get_character_class_data(model.name, "Body"); - const body = parse_nj(new ArrayBufferCursor(body_data, Endianness.Little))[0]; - - if (!body) { - throw new Error(`Couldn't parse body for player class ${model.name}.`); - } - - const head_data = await get_character_class_data(model.name, "Head", 0); - const head = parse_nj(new ArrayBufferCursor(head_data, Endianness.Little))[0]; - - if (head) { - this.add_to_bone(body, head, 59); - } - - if (model.hair_styles_count > 0) { - const hair_data = await get_character_class_data(model.name, "Hair", 0); - const hair = parse_nj(new ArrayBufferCursor(hair_data, Endianness.Little))[0]; - - if (hair) { - this.add_to_bone(body, hair, 59); - } - - if (model.hair_styles_with_accessory.has(0)) { - const accessory_data = await get_character_class_data(model.name, "Accessory", 0); - const accessory = parse_nj( - new ArrayBufferCursor(accessory_data, Endianness.Little), - )[0]; - - if (accessory) { - this.add_to_bone(body, accessory, 59); - } - } - } - - return body; - } - - private async get_nj_motion(animation: PlayerAnimation): Promise { - let nj_motion = nj_motion_cache.get(animation.id); - - if (nj_motion) { - return nj_motion; - } else { - nj_motion = get_character_class_animation_data(animation.id).then(motion_data => - parse_njm( - new ArrayBufferCursor(motion_data, Endianness.Little), - this.current_bone_count, - ), - ); - - nj_motion_cache.set(animation.id, nj_motion); - return nj_motion; - } - } - - private set_textures = action("set_textures", (textures: Texture[]) => { - this.set_obj3d(textures); - }); - - private set_obj3d = (textures?: Texture[]) => { - if (this.current_model) { - let mesh: Mesh; - - const materials = - textures && - textures.map( - tex => - new MeshLambertMaterial({ - skinning: this.has_skeleton, - map: tex, - side: DoubleSide, - alphaTest: 0.5, - }), - ); - - if (this.has_skeleton) { - mesh = create_skinned_mesh( - ninja_object_to_buffer_geometry(this.current_model), - materials, - ); - } else { - mesh = create_mesh(ninja_object_to_buffer_geometry(this.current_model), materials); - } - - // Make sure we rotate around the center of the model. - const bb = mesh.geometry.boundingBox; - const height = bb.max.y - bb.min.y; - mesh.translateY(-height / 2 - bb.min.y); - - this.current_obj3d = mesh; - } - }; -} - -export const model_viewer_store = new ModelViewerStore(); diff --git a/src/viewer/stores/TextureViewerStore.ts b/src/viewer/stores/TextureViewerStore.ts deleted file mode 100644 index 831d6677..00000000 --- a/src/viewer/stores/TextureViewerStore.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { observable } from "mobx"; -import { Xvm, parse_xvm } from "../../core/data_formats/parsing/ninja/texture"; -import { ArrayBufferCursor } from "../../core/data_formats/cursor/ArrayBufferCursor"; -import { read_file } from "../../core/read_file"; -import { Endianness } from "../../core/data_formats/Endianness"; -import Logger from "js-logger"; - -const logger = Logger.get("stores/TextureViewerStore"); - -class TextureViewStore { - @observable.ref current_xvm?: Xvm; - - // TODO: notify user of problems. - load_file = async (file: File) => { - try { - const buffer = await read_file(file); - this.current_xvm = parse_xvm(new ArrayBufferCursor(buffer, Endianness.Little)); - } catch (e) { - logger.error("Couldn't read file.", e); - } - }; -} - -export const texture_viewer_store = new TextureViewStore(); diff --git a/src/viewer/ui/ViewerComponent.css b/src/viewer/ui/ViewerComponent.css deleted file mode 100644 index c5404e12..00000000 --- a/src/viewer/ui/ViewerComponent.css +++ /dev/null @@ -1,23 +0,0 @@ -.main { - display: flex; - padding-top: 10px; - overflow: hidden; -} - -.main > :global(.ant-tabs) { - flex: 1; - display: flex; - flex-direction: column; - overflow: hidden; -} - -.main > :global(.ant-tabs > .ant-tabs-content) { - flex: 1; - overflow: hidden; -} - -.main > :global(.ant-tabs > .ant-tabs-content > .ant-tabs-tabpane-active) { - width: 100%; - height: 100%; - overflow: hidden; -} diff --git a/src/viewer/ui/ViewerComponent.tsx b/src/viewer/ui/ViewerComponent.tsx deleted file mode 100644 index 2f6cae8f..00000000 --- a/src/viewer/ui/ViewerComponent.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import { Tabs } from "antd"; -import React, { Component, ReactNode } from "react"; -import { ModelViewerComponent } from "./models/ModelViewerComponent"; -import { TextureViewerComponent } from "./textures/TextureViewerComponent"; -import styles from "./ViewerComponent.css"; - -export class ViewerComponent extends Component { - render(): ReactNode { - return ( -
- - - - - - - - -
- ); - } -} diff --git a/src/viewer/ui/models/AnimationSelectionComponent.css b/src/viewer/ui/models/AnimationSelectionComponent.css deleted file mode 100644 index 9bebb47c..00000000 --- a/src/viewer/ui/models/AnimationSelectionComponent.css +++ /dev/null @@ -1,25 +0,0 @@ -.main { - margin: 0 10px; -} - -.main > ul { - height: 100%; - padding: 0; - margin: 0; - overflow-y: scroll; - list-style-type: none; -} - -.main > ul > li { - cursor: pointer; - padding: 2px 5px; - white-space: nowrap; -} - -.main > ul > li.selected { - color: var(--hover-color); -} - -.main > ul > li:hover { - color: var(--hover-color); -} diff --git a/src/viewer/ui/models/AnimationSelectionComponent.tsx b/src/viewer/ui/models/AnimationSelectionComponent.tsx deleted file mode 100644 index 12b0dd64..00000000 --- a/src/viewer/ui/models/AnimationSelectionComponent.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import React, { Component, ReactNode } from "react"; -import { model_viewer_store } from "../../stores/ModelViewerStore"; -import styles from "./AnimationSelectionComponent.css"; -import { observer } from "mobx-react"; - -@observer -export class AnimationSelectionComponent extends Component { - render(): ReactNode { - return ( -
-
    - {model_viewer_store.animations.map(animation => { - const selected = - model_viewer_store.animation && - model_viewer_store.animation.player_animation && - model_viewer_store.animation.player_animation.id === animation.id; - - return ( -
  • model_viewer_store.load_animation(animation)} - > - {animation.name} -
    • - ); - })} -
-
- ); - } -} diff --git a/src/viewer/ui/models/ModelSelectionComponent.css b/src/viewer/ui/models/ModelSelectionComponent.css deleted file mode 100644 index faede7f0..00000000 --- a/src/viewer/ui/models/ModelSelectionComponent.css +++ /dev/null @@ -1,15 +0,0 @@ -.main { - margin: 0 10px; -} - -.model { - cursor: pointer; -} - -.model.selected { - color: var(--hover-color); -} - -.model:hover { - color: --hover-color; -} diff --git a/src/viewer/ui/models/ModelSelectionComponent.tsx b/src/viewer/ui/models/ModelSelectionComponent.tsx deleted file mode 100644 index 918cdf12..00000000 --- a/src/viewer/ui/models/ModelSelectionComponent.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import { List } from "antd"; -import { observer } from "mobx-react"; -import React, { Component, ReactNode } from "react"; -import { model_viewer_store } from "../../stores/ModelViewerStore"; -import styles from "./ModelSelectionComponent.css"; - -@observer -export class ModelSelectionComponent extends Component { - render(): ReactNode { - // Make sure we trigger mobx. - const current = model_viewer_store.current_player_model; - - return ( -
- { - const selected = current === model; - - return ( - model_viewer_store.load_model(model)}> - - {model.name} - - } - /> - - ); - }} - /> -
- ); - } -} diff --git a/src/viewer/ui/models/ModelViewerComponent.css b/src/viewer/ui/models/ModelViewerComponent.css deleted file mode 100644 index dc8dd9b7..00000000 --- a/src/viewer/ui/models/ModelViewerComponent.css +++ /dev/null @@ -1,35 +0,0 @@ -.main { - display: flex; - flex-direction: column; - width: 100%; - height: 100%; -} - -.toolbar { - display: flex; - padding: 10px 5px; - align-items: center; -} - -.toolbar > * { - margin: 0 5px; -} - -.toolbar .group { - display: flex; - align-items: center; -} - -.toolbar .group > * { - margin: 0 5px; -} - -.content { - flex: 1; - display: flex; - overflow: hidden; -} - -.renderer { - flex: 1; -} diff --git a/src/viewer/ui/models/ModelViewerComponent.tsx b/src/viewer/ui/models/ModelViewerComponent.tsx deleted file mode 100644 index 112267df..00000000 --- a/src/viewer/ui/models/ModelViewerComponent.tsx +++ /dev/null @@ -1,116 +0,0 @@ -import { Button, InputNumber, Switch, Upload } from "antd"; -import { UploadChangeParam } from "antd/lib/upload"; -import { UploadFile } from "antd/lib/upload/interface"; -import { observer } from "mobx-react"; -import React, { Component, ReactNode } from "react"; -import { AutoSizer } from "react-virtualized"; -import { get_model_renderer } from "../../rendering/ModelRenderer"; -import { model_viewer_store } from "../../stores/ModelViewerStore"; -import { RendererComponent } from "../../../core/ui/RendererComponent"; -import { AnimationSelectionComponent } from "./AnimationSelectionComponent"; -import { ModelSelectionComponent } from "./ModelSelectionComponent"; -import styles from "./ModelViewerComponent.css"; - -@observer -export class ModelViewerComponent extends Component { - componentDidMount(): void { - if (!model_viewer_store.current_model) { - model_viewer_store.load_model(model_viewer_store.models[5]); - } - } - - render(): ReactNode { - return ( -
- -
- - -
- - {({ width, height }) => ( - - )} - -
-
-
- ); - } -} - -@observer -class Toolbar extends Component { - state = { - filename: undefined, - }; - - render(): ReactNode { - return ( -
- false} - > - - - {model_viewer_store.animation && ( - <> - -
- Frame rate: - - model_viewer_store.set_animation_frame_rate(value || 0) - } - min={1} - step={1} - /> -
-
- Frame: - - model_viewer_store.set_animation_frame(value || 0) - } - step={1} - /> - / {model_viewer_store.animation_frame_count} -
- - )} -
- Show skeleton: - (model_viewer_store.show_skeleton = value)} - /> -
-
- ); - } - - private load_file = (info: UploadChangeParam) => { - if (info.file.originFileObj) { - this.setState({ filename: info.file.name }); - model_viewer_store.load_file(info.file.originFileObj as File); - } - }; -} diff --git a/src/viewer/ui/textures/TextureViewerComponent.css b/src/viewer/ui/textures/TextureViewerComponent.css deleted file mode 100644 index 603bed20..00000000 --- a/src/viewer/ui/textures/TextureViewerComponent.css +++ /dev/null @@ -1,14 +0,0 @@ -.main { - display: flex; - flex-direction: column; - width: 100%; - height: 100%; -} - -.toolbar { - margin: 10px; -} - -.renderer { - flex: 1; -} diff --git a/src/viewer/ui/textures/TextureViewerComponent.tsx b/src/viewer/ui/textures/TextureViewerComponent.tsx deleted file mode 100644 index 38171c26..00000000 --- a/src/viewer/ui/textures/TextureViewerComponent.tsx +++ /dev/null @@ -1,60 +0,0 @@ -import { Button, Upload } from "antd"; -import { UploadChangeParam, UploadFile } from "antd/lib/upload/interface"; -import { observer } from "mobx-react"; -import React, { Component, ReactNode } from "react"; -import { get_texture_renderer } from "../../rendering/TextureRenderer"; -import { texture_viewer_store } from "../../stores/TextureViewerStore"; -import { RendererComponent } from "../../../core/ui/RendererComponent"; -import styles from "./TextureViewerComponent.css"; -import { AutoSizer } from "react-virtualized"; - -export class TextureViewerComponent extends Component { - render(): ReactNode { - return ( -
- -
- - {({ width, height }) => ( - - )} - -
-
- ); - } -} - -@observer -class Toolbar extends Component { - state = { - filename: undefined, - }; - - render(): ReactNode { - return ( -
- false} - > - - -
- ); - } - - private load_file = (info: UploadChangeParam) => { - if (info.file.originFileObj) { - this.setState({ filename: info.file.name }); - texture_viewer_store.load_file(info.file.originFileObj as File); - } - }; -} diff --git a/webpack.common.js b/webpack.common.js index 8a23c494..2209700f 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -4,7 +4,7 @@ const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin"); const { ProvidePlugin } = require("webpack"); module.exports = { - entry: "./src/index.tsx", + entry: "./src/index.ts", output: { path: path.resolve(__dirname, "dist"), },