Skip to content
Snippets Groups Projects
Commit ada3b9bf authored by Sebastian Pape's avatar Sebastian Pape
Browse files

Adding onClick handlers back to ship model

parent 2b8c40da
No related branches found
No related tags found
1 merge request!11Reworking the mesh loading
Pipeline #297505 failed
...@@ -4,9 +4,11 @@ import MeshLoader from "../viewport/MeshLoader"; ...@@ -4,9 +4,11 @@ import MeshLoader from "../viewport/MeshLoader";
import { Frame } from "../viewport/TF2"; import { Frame } from "../viewport/TF2";
import { Object3D } from 'three'; import { Object3D } from 'three';
import { OBB } from "three-stdlib"; import { OBB } from "three-stdlib";
import { ThreeEvent } from "@react-three/fiber";
interface ShipModelProps { interface ShipModelProps {
onOBBCalculated?: (obb: OBB, parent: Object3D) => void; onOBBCalculated?: (obb: OBB, parent: Object3D) => void;
onClick?: (event: ThreeEvent<MouseEvent>) => void;
} }
export default function ShipModel(props: ShipModelProps) { export default function ShipModel(props: ShipModelProps) {
...@@ -24,6 +26,7 @@ export default function ShipModel(props: ShipModelProps) { ...@@ -24,6 +26,7 @@ export default function ShipModel(props: ShipModelProps) {
position={ship.static_mesh.transform?.translation} position={ship.static_mesh.transform?.translation}
scale={ship.static_mesh.transform?.scale} scale={ship.static_mesh.transform?.scale}
onOBBCalculated={props.onOBBCalculated} onOBBCalculated={props.onOBBCalculated}
onClick={props.onClick}
/> />
</Frame> </Frame>
: null : null
...@@ -34,6 +37,7 @@ export default function ShipModel(props: ShipModelProps) { ...@@ -34,6 +37,7 @@ export default function ShipModel(props: ShipModelProps) {
<StreamedMesh <StreamedMesh
rosbridgeURI={ship.rosbridge.uri} rosbridgeURI={ship.rosbridge.uri}
topic={ship.topics.streamed_mesh} topic={ship.topics.streamed_mesh}
onClick={props.onClick}
/> />
: null : null
} }
......
...@@ -35,7 +35,7 @@ const Viewport = (props: PropsWithChildren<{ onMeshClick?: (event: ThreeEvent<Mo ...@@ -35,7 +35,7 @@ const Viewport = (props: PropsWithChildren<{ onMeshClick?: (event: ThreeEvent<Mo
<Skybox baseURL="skyboxes/clouds/" visible={showSkybox} /> <Skybox baseURL="skyboxes/clouds/" visible={showSkybox} />
<Water waterNormalsTexture='waternormals.jpg' size={1000} heightOffset={oceanLevelOffest} visible={showOcean} /> <Water waterNormalsTexture='waternormals.jpg' size={1000} heightOffset={oceanLevelOffest} visible={showOcean} />
<ShipModel /> <ShipModel onClick={props.onMeshClick} />
<For each={Object.values(robots)}> <For each={Object.values(robots)}>
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment