Merge remote-tracking branch 'origin/main' into luca/door_preview

Signed-off-by: Luca Della Vedova <[email protected]>

.github/workflows/ci_linux.yaml

@@ -20,7 +20,11 @@ jobs:
         sudo apt-get update
         sudo apt-get install libasound2-dev libudev-dev libgtk-3-dev
     - uses: actions/checkout@v3
-    - name: Build
+    - name: Build rmf_site_format
+      run: |
+        cd rmf_site_format
+        cargo build
+    - name: Build rmf_site_editor
       run: cargo build
     - name: Run tests
       run: cargo test

.github/workflows/ci_web.yaml

@@ -31,5 +31,10 @@ jobs:
 
     - uses: actions/checkout@v3
 
-    - name: build
+    - name: build rmf_site_format
+      run: |
+        cd rmf_site_format
+        cargo build
+
+    - name: build rmf_site_editor
       run: scripts/build-web.sh

.github/workflows/ci_windows.yaml

@@ -24,7 +24,12 @@ jobs:
         rustup target add x86_64-pc-windows-msvc
       shell: powershell
 
-    - name: build
+    - name: build rmf_site_format
+      run: |
+        cd rmf_site_format
+        cargo build
+
+    - name: build rmf_site_editor
       run: |
         rustc -Vv
         cargo -V

.github/workflows/style.yaml

@@ -24,3 +24,6 @@ jobs:
 
     - name: style
       run: rustfmt --check --edition 2021 rmf_site_format/src/lib.rs rmf_site_editor/src/lib.rs rmf_site_editor/src/main.rs
+
+    - name: minimal feature build
+      run: cd rmf_site_format && cargo check --no-default-features

.pre-commit-config.yaml

@@ -0,0 +1,22 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+    -   id: check-added-large-files
+        args: ['--maxkb=500']
+    -   id: check-executables-have-shebangs
+    -   id: check-json
+    -   id: check-merge-conflict
+    -   id: check-shebang-scripts-are-executable
+    -   id: check-symlinks
+    -   id: check-toml
+    -   id: check-xml
+    -   id: check-yaml
+    -   id: destroyed-symlinks
+    -   id: end-of-file-fixer
+    -   id: mixed-line-ending
+-   repo: https://github.com/doublify/pre-commit-rust
+    rev: master
+    hooks:
+    -   id: fmt
+    -   id: cargo-check

assets/textures/attribution.md

@@ -1,4 +1,12 @@
 * [`select.png`](https://thenounproject.com/icon/select-3324735/)
 * [`edit.png`](https://thenounproject.com/icon/edit-2162449/)
+* [`exit.png`](https://thenounproject.com/icon/exit-1826632/)
+* [`confirm.png`](https://thenounproject.com/icon/confirm-2261637/)
+* [`reject.png`](https://thenounproject.com/icon/x-2289933/)
+* [`empty.png`](https://thenounproject.com/icon/empty-194055/)
+* [`add.png`](https://thenounproject.com/icon/plus-1809810/)
+* [`search.png`](https://thenounproject.com/icon/search-3743008/)
+* [`merge.png`](https://thenounproject.com/icon/merge-3402180/)
 * `trash.png`: @mxgrey
-
+* `selected.png`: @mxgrey
+* `alignment.png`: @mxgrey

rmf_site_editor/Cargo.toml

@@ -11,6 +11,10 @@ name = "librmf_site_editor"
 path = "src/main.rs"
 name = "rmf_site_editor"
 
+[[example]]
+name = "extending_site_editor"
+path = "examples/extending_menu.rs"
+
 [dependencies]
 bevy_egui = "0.19"
 bevy_mod_picking = "0.11"
@@ -43,8 +47,10 @@ tracing = "0.1.37"
 tracing-subscriber = "0.3.1"
 rfd = "0.11"
 urdf-rs = "0.7"
-# sdformat_rs = { path = "../../sdf_rust_experimental/sdformat_rs"}
+utm = "0.1.6"
 sdformat_rs = { git = "https://github.com/open-rmf/sdf_rust_experimental", rev = "f86344f"}
+gz-fuel = { git = "https://github.com/open-rmf/gz-fuel-rs", branch = "first_implementation" }
+pathdiff = "*"
 
 # only enable the 'dynamic' feature if we're not building for web or windows
 [target.'cfg(all(not(target_arch = "wasm32"), not(target_os = "windows")))'.dependencies]
@@ -61,3 +67,4 @@ surf = { version = "2.3" }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 surf = { version = "2.3", default-features = false, features = ["wasm-client", "encoding"] }
+console_error_panic_hook = "0.1.7"