begin working on robot customizability; now color of Hedgehog can be …

…specified
PRIArobotics · Oct 15, 2020 · 79d195b · 79d195b
1 parent 83e12d8
commit 79d195b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/components/ide/Simulator/simulation/Robot.js b/src/components/ide/Simulator/simulation/Robot.js
@@ -6,6 +6,7 @@ import { Pose, Hedgehog } from '.';
 import { DifferentialDrive } from './drives';
 import { CollisionSensor, TouchSensor, LineSensor, DistanceSensor } from './sensors';
 import { ServoArm } from './servo';
+import * as SimulationSchema from '../../SimulatorEditor/SimulationSchema';
 
 function createArray<T>(length: number, cb: (index: number) => T): T[] {
   // Array.from({ length: n }, (v, i) => ...):
@@ -28,11 +29,13 @@ export default class Robot {
 
   robot: Matter.Composite;
 
-  constructor() {
-    this.initBody();
+  constructor(options: SimulationSchema.RobotProps) {
+    this.initBody(options);
   }
 
-  initBody() {
+  initBody({
+    render: renderBody,
+  }: SimulationSchema.RobotProps) {
     const material = {
       density: 1,
       frictionAir: 0.4,
@@ -49,9 +52,7 @@ export default class Robot {
     const styleBody = {
       render: {
         fillStyle: '#38b449',
-        // sprite: {
-        //   texture: '/icon.png',
-        // },
+        ...renderBody,
       },
     };
     const styleLineSensor = {

diff --git a/src/components/ide/Simulator/simulation/Simulation.js b/src/components/ide/Simulator/simulation/Simulation.js
@@ -222,9 +222,9 @@ export default class Simulation {
             name,
             position: { x, y },
             angle,
-            // color,
+            ...options
           } = object;
-          const robot = new Robot();
+          const robot = new Robot(options);
           const pose = { x, y, angle };
           robot.setPose(pose);
           setInitialPose(robot.body);

diff --git a/src/components/ide/SimulatorEditor/SimulationSchema.js b/src/components/ide/SimulatorEditor/SimulationSchema.js
@@ -53,7 +53,7 @@ type Label = {|
   label?: string,
 |};
 
-type RobotProps = {|
+export type RobotProps = {|
   ...Translation,
   ...Rotation,
   render?: {