Commit 0dcda207 authored by bernie wang's avatar bernie wang
Browse files

fixed merge conflict in README

parent b55f6486
# LiDAR-annotator # LiDAR-annotator
<<<<<<< HEAD
Lidar annotation tool using ray tracing and bounding boxes.
=======
LiDAR annotation tool using ray tracing and bounding boxes. LiDAR annotation tool using ray tracing and bounding boxes.
>>>>>>> d5ba815b28ad4a51efecaa4d604d81489822f71b
# For people using the annotator for the efficiency test # For people using the annotator for the efficiency test
1. There are 10 frames (.bin files) in /test/velodyne_points/data. 1. There are 10 frames (.bin files) in /test/velodyne_points/data.
...@@ -25,13 +21,8 @@ LiDAR annotation tool using ray tracing and bounding boxes. ...@@ -25,13 +21,8 @@ LiDAR annotation tool using ray tracing and bounding boxes.
# Usage # Usage
1. Clone the repository 1. Clone the repository
2. To launch the app, just open index.html on your browser. 2. To launch the app, just open index.html on your browser.
<<<<<<< HEAD
3. Load lidar data (see lidar format).
4. To draw a bounding box, simply hold the "control" key down and click and drag. See "Controls" section to learn more about user interface.
=======
3. Load LiDAR data (see LiDAR format). 3. Load LiDAR data (see LiDAR format).
4. To draw a bounding box, simply hold your mouse down and drag across the screen. See "Controls" section to learn more about user interface. 4. To draw a bounding box, simply hold your mouse down and drag across the screen. See "Controls" section to learn more about user interface.
>>>>>>> d5ba815b28ad4a51efecaa4d604d81489822f71b
5. To *export* your bounding boxes, click on the "save" button to the top-left. 5. To *export* your bounding boxes, click on the "save" button to the top-left.
# Controls # Controls
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment