Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dashboard CI for react-three-fiber migration #795

Merged
merged 9 commits into from
Oct 11, 2023
Merged

Fix dashboard CI for react-three-fiber migration #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
95bd9db
Set max heap size
aaronchongth Oct 10, 2023
f982458
Stop producing sourcemap for CI
aaronchongth Oct 10, 2023
e991558
max space to ci
Angatupyry Oct 10, 2023
d256489
Try build without sourcemap for CI, alongside heap size increment
aaronchongth Oct 11, 2023
37e69b9
Increasing heapsize on bootstrap step
aaronchongth Oct 11, 2023
c4a77f1
Use experimental support for ECMAScript modules
aaronchongth Oct 11, 2023
90d5149
Use react-components as a module instead
aaronchongth Oct 11, 2023
f61c69d
Remove use of meshes for robot icons
aaronchongth Oct 11, 2023
7a07282
Revert module call
aaronchongth Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/dashboard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ jobs:
- name: setup python
run: apt update && apt install -y python3-venv python-is-python3
- name: bootstrap
env:
NODE_OPTIONS: '--max_old_space_size=4096'
uses: ./.github/actions/bootstrap
with:
package: rmf-dashboard
Expand Down
9 changes: 1 addition & 8 deletions packages/dashboard/src/components/three-fiber/robot-three.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,9 @@ interface RobotThreeProps {
robots: RobotData[];
robotLocations: Record<string, [number, number, number]>;
onRobotClick?: (ev: ThreeEvent<MouseEvent>, robot: RobotData) => void;
objectModel?: string;
}

export const RobotThree = ({
robots,
robotLocations,
onRobotClick,
objectModel, //Object model should be some path of the object to be rendered.
}: RobotThreeProps) => {
export const RobotThree = ({ robots, robotLocations, onRobotClick }: RobotThreeProps) => {
const STANDAR_Z_POSITION = 4;
const CIRCLE_SEGMENT = 64;

Expand All @@ -34,7 +28,6 @@ export const RobotThree = ({
robot={robot}
position={position}
onRobotClick={onRobotClick}
objectModel={objectModel}
rotation={new Euler(0, 0, rotationZ)}
circleSegment={CIRCLE_SEGMENT}
/>
Expand Down
61 changes: 8 additions & 53 deletions packages/react-components/lib/map/three-fiber/robot-three-maker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { Circle, Line, Text } from '@react-three/drei';
import { ThreeEvent, useLoader } from '@react-three/fiber';
import { ThreeEvent } from '@react-three/fiber';
import React from 'react';
import { Euler, Vector3 } from 'three';
import { MTLLoader } from 'three/examples/jsm/loaders/MTLLoader';
import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader';

export interface RobotData {
fleet: string;
Expand All @@ -23,18 +21,10 @@ interface CircleShapeProps {
segment: number;
}

interface ObjectLoaderProps {
position: Vector3;
rotation: THREE.Euler;
onRobotClick?: (ev: ThreeEvent<MouseEvent>) => void;
robot: RobotData;
}

interface RobotThreeMakerProps {
robot: RobotData;
position: Vector3;
onRobotClick?: (ev: ThreeEvent<MouseEvent>, robot: RobotData) => void;
objectModel?: string;
rotation: Euler;
circleSegment: number;
}
Expand Down Expand Up @@ -70,35 +60,10 @@ const CircleShape = ({
);
};

const ObjectLoader = ({
position,
rotation,
onRobotClick,
robot,
}: ObjectLoaderProps): JSX.Element => {
const objPath = '/Hatchback/meshes/hatchback.obj';
const mtlPath = '/Hatchback/meshes/hatchback.mtl';
const objectRef = React.useRef<THREE.Object3D>(null);
const scale = new Vector3(0.007, 0.007, 0.007);

const materials = useLoader(MTLLoader, mtlPath);
const object = useLoader(OBJLoader, objPath, (loader) => {
materials.preload();
loader.setMaterials(materials);
});
return (
<group position={position} rotation={rotation} scale={scale} onClick={onRobotClick}>
<primitive object={object} ref={objectRef} color={robot.color} opacity={1} />
<primitive object={object.clone()} ref={objectRef} />
</group>
);
};

export const RobotThreeMaker = ({
robot,
position,
onRobotClick,
objectModel, //Object model should be some path of the object to be rendered.
rotation,
circleSegment,
}: RobotThreeMakerProps): JSX.Element => {
Expand All @@ -107,23 +72,13 @@ export const RobotThreeMaker = ({
<Text color="black" fontSize={0.5} position={[position.x, position.y, position.z + 1]}>
{robot.name}
</Text>

{objectModel ? (
<ObjectLoader
position={position}
rotation={rotation}
onRobotClick={(ev: ThreeEvent<MouseEvent>) => onRobotClick && onRobotClick(ev, robot)}
robot={robot}
/>
) : (
<CircleShape
position={position}
rotation={rotation}
onRobotClick={(ev: ThreeEvent<MouseEvent>) => onRobotClick && onRobotClick(ev, robot)}
robot={robot}
segment={circleSegment}
/>
)}
<CircleShape
position={position}
rotation={rotation}
onRobotClick={(ev: ThreeEvent<MouseEvent>) => onRobotClick && onRobotClick(ev, robot)}
robot={robot}
segment={circleSegment}
/>
</>
);
};
Loading