Merge branch 'guidedTour' of github.com:kipr/Simulator into guidedTour

Author: erinharrington-12

src/components/Info/SensorWidget.tsx

@@ -129,7 +129,7 @@ class SensorWidget extends React.PureComponent<Props, State> {
         if (mesh) {
           // Both wheels have the mesh ID 'Wheel_primitive0_merged', so use idx
           // to distinguish between them.
-          const idx = props.name === 'motor 0' ? 0 : 1;
+          const idx = props.name === 'motor 3' ? 1 : 0;
           ACTIVE_SPACE.highlight(mesh, idx);
         }
       }, 1000),
@@ -147,7 +147,7 @@ class SensorWidget extends React.PureComponent<Props, State> {
     const mesh = portMeshMap[props.name];
     if (mesh) {
       window.setTimeout(() => {
-        const idx = props.name === 'motor 0' ? 0 : 1;
+        const idx = props.name === 'motor 3' ? 1 : 0;
         ACTIVE_SPACE.unhighlight(mesh, idx);
       }, 1000);
     }

src/components/Layout/OverlayLayout.tsx

@@ -358,7 +358,8 @@ export class OverlayLayout extends React.PureComponent<Props & ReduxOverlayLayou
     const robotId = Object.keys(robots)[0];
     this.props.onNodeChange(robotId, {
       ...robots[robotId],
-      origin
+      origin,
+      startingOrigin: origin
     });
   };
 

src/components/Layout/SideLayout.tsx

@@ -205,6 +205,7 @@ State
     this.props.onNodeChange(robotId, {
       ...robots[robotId],
       origin,
+      startingOrigin: origin
     });
   };