move clampheading to common and fix simulator bot rotation

Comet-Robotics · Nov 19, 2024 · 8592552 · 8592552
1 parent 99b40af
commit 8592552
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/client/debug/simulator.tsx b/src/client/debug/simulator.tsx
@@ -9,6 +9,7 @@ import {
 } from "../../common/message/simulator-message";
 import { Tag, CompoundTag } from "@blueprintjs/core";
 import "./simulator.scss";
+import { clampHeading } from "../../common/units";
 
 const tileSize = 60;
 const robotSize = tileSize / 2;
@@ -298,7 +299,7 @@ function Robot(props: {
             <Tooltip content={`${props.robotId}: ${JSON.stringify(props.pos)}`}>
                 <div
                     style={{
-                        transform: `rotate(-${props.pos.headingRadians}rad)`,
+                        transform: `rotate(-${clampHeading(props.pos.headingRadians)}rad)`,
                         backgroundColor: "white",
                         borderRadius: "50%",
                         border: `4px solid ${props.onTopOfRobots.length > 0 ? "red" : "black"}`,

diff --git a/src/common/game-types.ts b/src/common/game-types.ts
@@ -1,6 +1,6 @@
 import { Square } from "chess.js";
 import type { Robot } from "../server/robot/robot";
-import { DEGREE } from "../server/utils/units";
+import { DEGREE } from "./units";
 
 /**
  * Defines a specific piece.

diff --git a/src/server/utils/units.ts → src/common/units.ts b/src/server/utils/units.ts → src/common/units.ts
diff --git a/src/server/api/api.ts b/src/server/api/api.ts
@@ -29,7 +29,7 @@ import { SaveManager } from "./save-manager";
 import { CommandExecutor } from "../command/executor";
 import { VirtualBotTunnel, virtualRobots } from "../simulator";
 import { Position } from "../robot/position";
-import { DEGREE } from "../utils/units";
+import { DEGREE } from "../../common/units";
 
 export const tcpServer: TCPServer | null =
     USE_VIRTUAL_ROBOTS ? null : new TCPServer();

diff --git a/src/server/robot/robot.ts b/src/server/robot/robot.ts
@@ -1,10 +1,9 @@
-import { FULL_ROTATION, RADIAN, clampHeading } from "../utils/units";
+import { FULL_ROTATION, RADIAN, clampHeading } from "../../common/units";
 import { Position, ZERO_POSITION } from "./position";
 import { GridIndices } from "./grid-indices";
 import { tcpServer } from "../api/api";
 import type { BotTunnel } from "../api/tcp-interface";
 
-
 /**
  * Represents a robot.
  * Includes information about the current location as well as tooling for communication.