From 5bf95fc85e5a8364380eb226a84f5e8d664cfe44 Mon Sep 17 00:00:00 2001 From: Kei18 Date: Sun, 18 Feb 2024 12:36:29 +0000 Subject: [PATCH] update oF version --- .github/workflows/{ci.yml => build_macos.yml} | 2 +- .gitignore | 3 ++- README.md | 6 +++--- third_party/openFrameworks | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) rename .github/workflows/{ci.yml => build_macos.yml} (94%) diff --git a/.github/workflows/ci.yml b/.github/workflows/build_macos.yml similarity index 94% rename from .github/workflows/ci.yml rename to .github/workflows/build_macos.yml index 6f1352d..8110337 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/build_macos.yml @@ -1,4 +1,4 @@ -name: ci +name: build_macos on: push: diff --git a/.gitignore b/.gitignore index f0a4620..defee21 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,5 @@ # End of https://www.toptal.com/developers/gitignore/api/c++ **/.DS_Store /build/ -/obj/ \ No newline at end of file +/obj/ +openFrameworks-Info.plist diff --git a/README.md b/README.md index 8193699..50d98f0 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Based on [openFrameworks](https://openframeworks.cc/), written in C++ git clone --recursive https://github.com/Kei18/mapf-visualizer.git cd mapf-visualizer bash third_party/openFrameworks/scripts/osx/download_libs.sh -make +make -j4 echo "export PATH=$(pwd)/bin/mapf-visualizer.app/Contents/MacOS:\$PATH" >> ~/.bashrc ``` @@ -44,7 +44,7 @@ wget -O third_party/openFrameworks.tar.gz https://github.com/openframeworks/open tar -xzvf third_party/openFrameworks.tar.gz -C third_party --strip-components=1 --one-top-level=openFrameworks sudo third_party/openFrameworks/scripts/linux/ubuntu/install_dependencies.sh sudo third_party/openFrameworks/scripts/linux/ubuntu/install_codecs.sh -make +make -j4 echo "export PATH=$(pwd)/bin:\$PATH" >> ~/.bashrc ``` @@ -57,7 +57,7 @@ You may need `sudo`. ## Usage ```sh -mapf-visualizer assets/random-32-32-20.map assets/demo_random-32-32-20.txt +mapf-visualizer --map assets/random-32-32-20.map --plan assets/demo_random-32-32-20.txt ``` You can manipulate it via your keyboard. See printed info. diff --git a/third_party/openFrameworks b/third_party/openFrameworks index fa662f3..229439f 160000 --- a/third_party/openFrameworks +++ b/third_party/openFrameworks @@ -1 +1 @@ -Subproject commit fa662f328c81b03beba1aa428a7158f117065984 +Subproject commit 229439fd384f38a9822577095338197d47787f23