Fix Octree circular dep

Move Octree Enums to OctreeBase
RobotWebTools · Mar 9, 2022 · f7a01ab · f7a01ab
1 parent 3156bd6
commit f7a01ab
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/src/navigation/OcTree.js b/src/navigation/OcTree.js
@@ -2,34 +2,6 @@
  * @author Peter Sari - sari@photoneo.com
  */
 
-/**
- * Toggles voxel visibility
- *
- *    * `occupied` - only voxels that are above or equal to the occupation threshold are shown
- *    * `free` - only voxels that are below the occupation threshold are shown
- *    * `all` - all allocated voxels are shown
- */
-ROS3D.OcTreeVoxelRenderMode = {
-  OCCUPIED: 'occupied',
-  FREE: 'free',
-  ALL: 'all',
-};
-
-/**
- * Coloring modes for each voxel
- *
- *     * 'solid' - voxels will have a single solid color set by the tree globally
- *     * 'occupancy' - voxels are false colored by their occupancy value. Fall back for `solid` if not available.
- *     * 'color' - voxels will colorized by their
- */
-ROS3D.OcTreeColorMode = {
-  SOLID: 'solid',
-  OCCUPANCY: 'occupancy',
-  COLOR: 'color'
-};
-
-// ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
-
 /**
  * Specilaization of BaseOcTree
  *

diff --git a/src/navigation/OcTreeBase.js b/src/navigation/OcTreeBase.js
@@ -2,6 +2,34 @@
  * @author Peter Sari - sari@photoneo.com
  */
 
+/**
+ * Toggles voxel visibility
+ *
+ *    * `occupied` - only voxels that are above or equal to the occupation threshold are shown
+ *    * `free` - only voxels that are below the occupation threshold are shown
+ *    * `all` - all allocated voxels are shown
+ */
+ROS3D.OcTreeVoxelRenderMode = {
+  OCCUPIED: 'occupied',
+  FREE: 'free',
+  ALL: 'all',
+};
+
+/**
+ * Coloring modes for each voxel
+ *
+ *     * 'solid' - voxels will have a single solid color set by the tree globally
+ *     * 'occupancy' - voxels are false colored by their occupancy value. Fall back for `solid` if not available.
+ *     * 'color' - voxels will colorized by their
+ */
+ROS3D.OcTreeColorMode = {
+  SOLID: 'solid',
+  OCCUPANCY: 'occupancy',
+  COLOR: 'color'
+};
+
+// ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
+
 /**
  Quick and dirty helper class
  to read ArrayBuffer in a streamed data-like fashion with mixed types in it