workspace reorganization

strawlab · Dec 28, 2024 · e60e41c · e60e41c
1 parent b59df73
commit e60e41c
Show file tree

Hide file tree

Showing 118 changed files with 134 additions and 197 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -35,22 +35,20 @@ test_crates:
     - cd ../..
 
     # Test fmf-cli
-    - cd fmf/fmf-cli
+    - cd $CI_PROJECT_DIR/media-utils/fmf/fmf-cli
     - cargo test --release
-    - cd ../..
 
     # Test ads-apriltag
-    - cd ads-apriltag
+    - cd $CI_PROJECT_DIR/ads-apriltag
     - cargo test --release
-    - cd ..
 
     # Test apriltag-track-movie
-    - cd ads-apriltag/apriltag-track-movie
+    - cd $CI_PROJECT_DIR/ads-apriltag/apriltag-track-movie
     - cargo test --release
     - cd ../..
 
     # Test braid-april-cal, which requires opencv
-    - cd braid-april-cal
+    - cd $CI_PROJECT_DIR/braid-april-cal
     # run test in release mode, otherwise slow
     - PKG_CONFIG_PATH=/opt/opencv-4.9.0-static/lib/pkgconfig OPENCV_STATIC=1 cargo test --release --features solve-pnp
     - cd ..
@@ -83,26 +81,21 @@ test_crates:
 
     # Test Pylon stuff
     - _packaging/install-pylon-linux.sh
-    - cd ci2-simple-demo
+    - cd $CI_PROJECT_DIR/camera/ci2-simple-demo
     - LD_LIBRARY_PATH="/opt/pylon/lib" cargo test --features backend_pyloncxx
-    - cd ..
 
-    - cd ci2-simple-async-demo
+    - cd $CI_PROJECT_DIR/camera/ci2-simple-async-demo
     - LD_LIBRARY_PATH="/opt/pylon/lib" cargo test --features backend_pyloncxx
-    - cd ..
 
-    - cd ci2-cli
+    - cd $CI_PROJECT_DIR/camera/ci2-cli
     - cargo test --features backend_pyloncxx
-    - cd ..
 
     - DEBIAN_FRONTEND=noninteractive apt-get install -y cmake pkg-config libfontconfig-dev
-    - cd fly-eye
+    - cd $CI_PROJECT_DIR/fly-eye
     - cargo build --release --features backend_pyloncxx
-    - cd ..
 
-    - cd led-box-comms
+    - cd $CI_PROJECT_DIR/led-box-comms
     - cargo test
-    - cd ..
 
 test_flydra2:
   variables:
@@ -165,27 +158,24 @@ test_crates_rust_stable:
     - cd ..
 
     # Test mvg
-    - cd mvg
+    - cd $CI_PROJECT_DIR/geometry/mvg
     - cargo test --features rerun-io
-    - cd ..
 
     # Test braid-april-cal-webapp
-    - cd braid-april-cal/braid-april-cal-webapp
+    - cd $CI_PROJECT_DIR/braid-april-cal/braid-april-cal-webapp
     - cargo test
     - cd ../..
 
     # Test datetime-conversion
     - cd datetime-conversion
     - cargo test
-    - cd ..
 
-    # Test simple-obj-parse
-    - cd simple-obj-parse
+    # Test geometry/simple-obj-parse
+    - cd $CI_PROJECT_DIR/geometry/simple-obj-parse
     - cargo test
-    - cd ..
 
     # basic-frame
-    - cd basic-frame
+    - cd $CI_PROJECT_DIR/basic-frame
     - cargo test
     - cargo test --features convert-image
     - cd ..
@@ -214,31 +204,27 @@ test_crates_rust_stable:
     - cd ..
 
     # Test ufmf
-    - cd ufmf
+    - cd $CI_PROJECT_DIR/media-utils/ufmf
     - cargo test
-    - cd ..
 
     # Test flydra-types
-    - cd flydra-types
+    - cd $CI_PROJECT_DIR/flydra-types
     - cargo test
-    - cd ..
 
-    - cd mvg/mvg-util
+    # Test mvg/mvg-util
+    - cd $CI_PROJECT_DIR/geometry/mvg/mvg-util
     - cargo test
-    - cd ../..
 
     # Test flydra-mvg
-    - cd flydra-mvg
+    - cd $CI_PROJECT_DIR/geometry/flydra-mvg
     - cargo test
-    - cd ..
 
     # Test fmf
-    - cd fmf
+    - cd $CI_PROJECT_DIR/media-utils/fmf
     - cargo test
-    - cd ..
 
     # Test media-utils/tiff-decoder
-    - cd media-utils/tiff-decoder
+    - cd $CI_PROJECT_DIR/media-utils/tiff-decoder
     - cargo test
     - cd ../..
 
@@ -710,7 +696,7 @@ extra-programs:
 
     - mkdir -p $CI_PROJECT_DIR/build
 
-    - cd $CI_PROJECT_DIR/mvg/mvg-util
+    - cd $CI_PROJECT_DIR/geometry/mvg/mvg-util
     - cargo build --release
     - cp $CI_PROJECT_DIR/target/release/cal-to-xml $CI_PROJECT_DIR/build
     - cp $CI_PROJECT_DIR/target/release/align-calibration $CI_PROJECT_DIR/build
@@ -752,7 +738,7 @@ fmf-cli:
     - source $CARGO_HOME/env
     - export RUSTFLAGS="-D warnings"
 
-    - cd $CI_PROJECT_DIR/fmf/fmf-cli
+    - cd $CI_PROJECT_DIR/media-utils/fmf/fmf-cli
     - cargo build --release
     - mkdir -p $CI_PROJECT_DIR/build
     - ldd -v $CI_PROJECT_DIR/target/release/fmf

diff --git a/Cargo.toml b/Cargo.toml
@@ -6,8 +6,6 @@ members = [
     "ads-webasm",
     "ads-webasm/example",
     "basic-frame",
-    "bg-movie-writer",
-    "bisection-search",
     "braid",
     "braid/braid-run",
     "braid/braid-run/braid_frontend",
@@ -30,18 +28,16 @@ members = [
     "bui-backend-session",
     "bui-backend-session/types",
     "build-util",
-    "camcal",
-    "led-box",
-    "led-box-comms",
-    "ci2",
-    "ci2/ci2-types",
-    "ci2-async",
-    "ci2-cli",
-    "ci2-pyloncxx",
-    "ci2-vimba",
-    "ci2-remote-control",
-    "ci2-simple-async-demo",
-    "ci2-simple-demo",
+    "camera/ci2",
+    "camera/ci2-async",
+    "camera/ci2-cli",
+    "camera/ci2-pyloncxx",
+    "camera/ci2-remote-control",
+    "camera/ci2-simple-async-demo",
+    "camera/ci2-simple-demo",
+    "camera/ci2-types",
+    "camera/ci2-vimba",
+    "camera/vimba",
     "csv-eof",
     "datetime-conversion",
     "download-verify",
@@ -51,28 +47,41 @@ members = [
     "event-stream-types",
     "fastfreeimage",
     "fly-eye",
-    "fmf",
-    "fmf/fmf-cli",
     "flydra-feature-detector",
     "flydra-feature-detector/flydra-feature-detector-types",
     "flydra-feature-detector/flydra-pt-detect-cfg",
-    "flydra-mvg",
     "flydra-types",
     "flydra2",
     "flytrax-csv-to-braidz",
     "freemovr-calibration",
     "freemovr-calibration/freemovr-calibration-cli",
     "freemovr-calibration/freemovr-calibration-webapp",
     "freemovr-calibration/ncollide-geom",
+    "geometry/camcal",
+    "geometry/flydra-mvg",
+    "geometry/mvg",
+    "geometry/mvg/mvg-util",
+    "geometry/opencv-calibrate",
+    "geometry/opencv-calibrate/find-chessboard",
+    "geometry/parry-geom",
+    "geometry/refraction",
+    "geometry/refraction/bisection-search",
+    "geometry/simple-obj-parse",
+    "geometry/textured-tri-mesh",
     "groupby",
     "http-video-streaming",
     "http-video-streaming/http-video-streaming-types",
     "imops",
+    "led-box",
+    "led-box-comms",
     "led-box-standalone",
     "machine-vision-shaders",
+    "media-utils/bg-movie-writer",
     "media-utils/dump-frame",
     "media-utils/ffmpeg-writer",
     "media-utils/ffmpeg-rewriter",
+    "media-utils/fmf",
+    "media-utils/fmf/fmf-cli",
     "media-utils/font-drawing",
     "media-utils/frame-source",
     "media-utils/less-avc-wrapper",
@@ -83,20 +92,14 @@ members = [
     "media-utils/srt-writer",
     "media-utils/strand-convert",
     "media-utils/tiff-decoder",
+    "media-utils/ufmf",
     "media-utils/video2rrd",
     "media-utils/video2srt",
     "media-utils/y4m-writer",
-    "mvg",
-    "mvg/mvg-util",
     "nvenc",
     "nvenc/dynlink-cuda",
     "nvenc/dynlink-nvidia-encode",
     "nvenc/dynlink-nvidia-encode/gen-nvenc-bindings",
-    "opencv-calibrate",
-    "opencv-calibrate/find-chessboard",
-    "parry-geom",
-    "refraction",
-    "simple-obj-parse",
     "strand-cam",
     "strand-cam/flytrax-io",
     "strand-cam/strand-cam-offline-checkerboards",
@@ -107,11 +110,8 @@ members = [
     "strand-cam-csv-config-types",
     "strand-cam-pseudo-cal",
     "strand-cam-storetype",
-    "textured-tri-mesh",
     "timestamped-frame",
     "tracking",
-    "ufmf",
-    "vimba",
     "withkey",
     "write-debian-changelog",
     "zip-or-dir",
@@ -200,6 +200,7 @@ ncollide2d = { package = "ncollide2d-updated", version = "0.36.3" }
 ncollide3d = { package = "ncollide3d-updated", version = "0.36.3" }
 num-iter = "0.1"
 num-traits = "0.2"
+obj = { version = "0.10", features = ["genmesh"] }
 opencv-ros-camera = { version = "0.15.1", features = ["serde-serialize"] }
 openh264 = "0.6.0"
 ordered-float = { version = "3.4", features = ["serde"] }
@@ -263,7 +264,8 @@ zip = { version = "0.6.6", default-features = false, features = [
 ads-apriltag = { path = "ads-apriltag" }
 ads-webasm = { path = "ads-webasm" }
 basic-frame = { path = "basic-frame" }
-bg-movie-writer = { path = "bg-movie-writer" }
+bisection-search = { path = "geometry/refraction/bisection-search" }
+bg-movie-writer = { path = "media-utils/bg-movie-writer" }
 braid = { path = "braid" }
 braid-april-cal = { path = "braid-april-cal" }
 braid-config-data = { path = "braid-config-data" }
@@ -275,13 +277,13 @@ braidz-writer = { path = "braid/braidz-writer" }
 bui-backend-session = { path = "bui-backend-session" }
 bui-backend-session-types = { path = "bui-backend-session/types" }
 build-util = { path = "build-util" }
-camcal = { path = "camcal" }
-ci2 = { path = "ci2" }
-ci2-async = { path = "ci2-async" }
-ci2-pyloncxx = { path = "ci2-pyloncxx" }
-ci2-remote-control = { path = "ci2-remote-control" }
-ci2-types = { path = "ci2/ci2-types" }
-ci2-vimba = { path = "ci2-vimba" }
+camcal = { path = "geometry/camcal" }
+ci2 = { path = "camera/ci2" }
+ci2-async = { path = "camera/ci2-async" }
+ci2-pyloncxx = { path = "camera/ci2-pyloncxx" }
+ci2-remote-control = { path = "camera/ci2-remote-control" }
+ci2-types = { path = "camera/ci2-types" }
+ci2-vimba = { path = "camera/ci2-vimba" }
 csv-eof = { path = "csv-eof" }
 datetime-conversion = { path = "datetime-conversion" }
 download-verify = { path = "download-verify" }
@@ -297,11 +299,11 @@ flydra-feature-detector = { path = "flydra-feature-detector" }
 flydra-feature-detector-types = { path = "flydra-feature-detector/flydra-feature-detector-types" }
 flydra-pt-detect-cfg = { path = "flydra-feature-detector/flydra-pt-detect-cfg" }
 flydra-types = { path = "flydra-types", default-features = false }
-flydra-mvg = { path = "flydra-mvg" }
+flydra-mvg = { path = "geometry/flydra-mvg" }
 flydra2 = { path = "flydra2", default-features = false }
 flytrax-apriltags-calibration = { path = "braid-april-cal/flytrax-apriltags-calibration" }
 flytrax-io = { path = "strand-cam/flytrax-io" }
-fmf = { path = "fmf" }
+fmf = { path = "media-utils/fmf" }
 font-drawing = { path = "media-utils/font-drawing" }
 frame-source = { path = "media-utils/frame-source" }
 groupby = { path = "groupby" }
@@ -313,22 +315,25 @@ less-avc-wrapper = { path = "media-utils/less-avc-wrapper" }
 machine-vision-shaders = { path = "machine-vision-shaders" }
 mkv-strand-reader = { path = "media-utils/mkv-strand-reader" }
 mp4-writer = { path = "media-utils/mp4-writer" }
-mvg = { path = "mvg", features = ["serde-serialize"] }
+mvg = { path = "geometry/mvg", features = ["serde-serialize"] }
 ncollide-geom = { path = "freemovr-calibration/ncollide-geom" }
 nvenc = { path = "nvenc" }
-opencv-calibrate = { path = "opencv-calibrate" }
-parry-geom = { path = "parry-geom" }
-refraction = { path = "refraction" }
+opencv-calibrate = { path = "geometry/opencv-calibrate" }
+parry-geom = { path = "geometry/parry-geom" }
+refraction = { path = "geometry/refraction" }
 rust-cam-bui-types = { path = "rust-cam-bui-types" }
+simple-obj-parse = { path = "geometry/simple-obj-parse" }
 srt-writer = { path = "media-utils/srt-writer" }
 strand-cam = { path = "strand-cam", default-features = false }
 strand-cam-csv-config-types = { path = "strand-cam-csv-config-types" }
 strand-cam-pseudo-cal = { path = "strand-cam-pseudo-cal" }
 strand-cam-storetype = { path = "strand-cam-storetype" }
+textured-tri-mesh = { path = "geometry/textured-tri-mesh" }
 tiff-decoder = { path = "media-utils/tiff-decoder" }
 timestamped-frame = { path = "timestamped-frame" }
 tracking = { path = "tracking" }
-ufmf = { path = "ufmf" }
+ufmf = { path = "media-utils/ufmf" }
+vimba = { path = "camera/vimba" }
 withkey = { path = "withkey" }
 y4m-writer = { path = "media-utils/y4m-writer" }
 zip-or-dir = { path = "zip-or-dir" }

diff --git a/ads-webasm/Cargo.toml b/ads-webasm/Cargo.toml
@@ -17,8 +17,8 @@ gloo-file = { workspace = true }
 
 yew-tincture.workspace = true
 
-simple-obj-parse = { path = "../simple-obj-parse", optional = true }
-textured-tri-mesh = { path = "../textured-tri-mesh", optional = true }
+simple-obj-parse = { workspace = true, optional = true }
+textured-tri-mesh = { workspace = true, optional = true }
 enum-iter.workspace = true
 rust-cam-bui-types.workspace = true