diff --git a/client/ui/src/App.tsx b/client/ui/src/App.tsx index a050a89..966c374 100644 --- a/client/ui/src/App.tsx +++ b/client/ui/src/App.tsx @@ -9,6 +9,7 @@ function App({ engine }: { engine: Engine }) { const initialEngineMode = EngineMode.Edit; const [currentMode, setModeState] = useState(initialEngineMode); const [blockRegistry, setBlockRegistry] = useState(); + const [selectedEntity, setSelectedEntity] = useState(false); const [entityTypeRegistry, setEntityTypeRegistry] = useState(); useEffect(() => { @@ -36,9 +37,10 @@ function App({ engine }: { engine: Engine }) { currentMode={currentMode} blockRegistry={blockRegistry} entityTypeRegistry={entityTypeRegistry} + setSelectedEntity={setSelectedEntity} /> )} - + ); } diff --git a/client/ui/src/LeftBar.tsx b/client/ui/src/LeftBar.tsx index 0244d70..1221544 100644 --- a/client/ui/src/LeftBar.tsx +++ b/client/ui/src/LeftBar.tsx @@ -13,11 +13,13 @@ export default function LeftBar({ engine, blockRegistry, entityTypeRegistry, + setSelectedEntity, }: { engine: Engine; currentMode: EngineMode; blockRegistry: BlockRegistry; entityTypeRegistry: EntityTypeRegistry; + setSelectedEntity: (bool) => void; }) { const [currentTab, setCurrentTab] = useState(LeftBarTab.Blocks); let theContent; diff --git a/client/ui/src/RightBar.tsx b/client/ui/src/RightBar.tsx index f1deddc..2c16222 100644 --- a/client/ui/src/RightBar.tsx +++ b/client/ui/src/RightBar.tsx @@ -1,9 +1,11 @@ // The "right bar": invisible unless an entity is selected, and in that latter // case, the properties panel +import { SelectedEntity } from "../../pkg/client.js"; + // TODO: implement entities and thus this -export default function RightBar({ selectedEntity }: { selectedEntity: boolean } ) { +export default function RightBar({ selectedEntity }: { selectedEntity: SelectedEntity|undefined } ) { if(selectedEntity) { return

Siege chopper, checking in 🚁

diff --git a/entities/Cargo.toml b/entities/Cargo.toml index c8b2237..b09f0c4 100644 --- a/entities/Cargo.toml +++ b/entities/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" glam.workspace = true serde.workspace = true wasm-bindgen.workspace = true -tsify.workspace = true \ No newline at end of file +tsify.workspace = true diff --git a/entities/src/lib.rs b/entities/src/lib.rs index 450ee57..5f5d2a1 100644 --- a/entities/src/lib.rs +++ b/entities/src/lib.rs @@ -1,3 +1,6 @@ +/// This crate contains data types relevant to entities +/// +/// It is designed to be used on both the server and the client use { serde::{Deserialize, Serialize}, tsify::Tsify,