From 2ef656f6f8411109dedee9e70c4b51f1af3f4e1d Mon Sep 17 00:00:00 2001 From: donghaiwang Date: Fri, 3 Apr 2026 15:06:45 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=92=8Cdoc=E9=85=8D=E7=BD=AE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/dev/Carla_Air.md | 15 +++-------- mkdocs.yml | 59 ++++++++++++++++++++++++++----------------- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/docs/dev/Carla_Air.md b/docs/dev/Carla_Air.md index 04dbdcd..7353d2e 100644 --- a/docs/dev/Carla_Air.md +++ b/docs/dev/Carla_Air.md @@ -161,26 +161,19 @@ CARLA-Air 与 14 个现有仿真平台的全面对比(基于[技术报告](htt ### 选项 A:使用预编译版本(推荐) -```shell -# 1. 下载并解压 CarlaAir-v0.1.7 +```sh tar xzf CarlaAir-v0.1.7.tar.gz cd CarlaAir-v0.1.7 -``` # 2. 一键环境配置(仅首次需要) -```shell bash env_setup/setup_env.sh # 创建 conda 环境,安装依赖,部署 carla 模块 conda activate carlaAir bash env_setup/test_env.sh # 验证环境:应全部显示 PASS -``` # 3. 启动仿真器(自动生成交通流) -```shell ./CarlaAir.sh Town10HD -``` # 4. 运行展示脚本!(另开一个终端) -```shell conda activate carlaAir python3 examples/quick_start_showcase.py ``` @@ -197,7 +190,7 @@ python3 examples/quick_start_showcase.py 两套 API 共享**同一个仿真世界** — 无桥接、无同步烦恼。 -```py +```python import carla, airsim carla_client = carla.Client("localhost", 2000) @@ -215,7 +208,7 @@ air_client.moveToPositionAsync(80, 30, -25, 5) **6 个演示脚本** — 逐个试试: -```shell +```sh python3 examples/quick_start_showcase.py # 🎬 4分屏传感器 + 无人机追踪 + 天气轮换 python3 examples/drive_vehicle.py # 🚗 WASD 驾驶特斯拉 python3 examples/walk_pedestrian.py # 🚶 鼠标+键盘 城市漫步 @@ -226,7 +219,7 @@ python3 examples/air_ground_sync.py # 🔄 车+无人机分屏:同一 **录制工具** — 录制车辆、无人机、行人轨迹,然后用导演相机回放: -```shell +```sh python3 examples/recording/record_vehicle.py # 🚗 键盘驾驶并录制车辆轨迹 python3 examples/recording/record_drone.py # 🚁 飞行并录制无人机轨迹(零侵入) python3 examples/recording/record_walker.py # 🚶 行走并录制行人轨迹 diff --git a/mkdocs.yml b/mkdocs.yml index c1523c6..18e28aa 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,39 +1,52 @@ site_name: 低空模拟器 # site_dir: build_docs -# repo_url: https://github.com/microsoft/airsim -site_description: 'Open source simulator based on Unreal Engine for autonomous vehicles from Microsoft AI & Research' +repo_url: https://github.com/OpenHUTB/air_doc + markdown_extensions: - - toc: - permalink: "#" - - pymdownx.arithmatex: - generic: true - - pymdownx.extra: - - admonition + - pymdownx.blocks.html + - admonition + - mdx_math + - pymdownx.superfences: + custom_fences: [ + { name: flow, class: uml-flowchart } + ,{ name: sequence, class: uml-sequence-diagram } + ,{ name: mermaid, class: mermaid } + ] -remote_branch: gh-pages theme: - name: 'readthedocs' - logo: '' + name: readthedocs + sticky_navigation: True + navigation_depth: 3 + features: + - search.suggest # 在目录栏中的搜索框中输入一些字母时推荐补全整个单词 +extra_css: [extra.css] -extra: - highlightjs: true - feature: - tabs: true - palette: - social: - - type: facebook - link: https://www.facebook.com/groups/1225832467530667/ - - type: github-alt - link: https://github.com/Microsoft/AirSim +# mathjax用于单独公式展示 extra_javascript: - - https://polyfill.io/v3/polyfill.min.js?features=es6 - - https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js + # - extra.js + - https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-AMS-MML_HTMLorMML + - https://cdn.rawgit.com/knsv/mermaid/6.0.0/dist/mermaid.min.js + - https://cdnjs.cloudflare.com/ajax/libs/raphael/2.2.7/raphael.min.js + - https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js + - https://cdnjs.cloudflare.com/ajax/libs/js-sequence-diagrams/1.0.6/sequence-diagram-min.js + - https://cdnjs.cloudflare.com/ajax/libs/flowchart/1.6.5/flowchart.min.js + - js/umlconvert.js + +plugins: + - search: + lang: ja + separator: '[\s\-\.]+' + min_search_length: 1 + +extra: + generator: false copyright: OpenHUTB 版权所有 © 2026 + nav: - "主页": - "主页": 'README.md' From c6a1e79fd9712fe5a69e49cb2224f9c75280817a Mon Sep 17 00:00:00 2001 From: donghaiwang Date: Fri, 3 Apr 2026 15:21:13 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=90=8C=E6=AD=A5doc=E7=9A=84python?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push_check.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push_check.yml b/.github/workflows/push_check.yml index 8f24518..3fddc48 100644 --- a/.github/workflows/push_check.yml +++ b/.github/workflows/push_check.yml @@ -6,14 +6,14 @@ on: [push] jobs: build: name: Deploy docs to GitHub Pages - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2 - uses: actions/setup-python@v6 with: - python-version: '3.8' + python-version: '3.11' - name: Build API doc run: | @@ -36,7 +36,6 @@ jobs: uses: OpenHUTB/actions-mkdocs@main with: mkdocs_version: 'latest' # option - #mkdocs_version: '1.1' # option requirements: 'requirements.txt' # option configfile: 'mkdocs.yml' # option From b0416349c5e6ef6e384a2c71e85591385b9a0e0c Mon Sep 17 00:00:00 2001 From: donghaiwang Date: Fri, 3 Apr 2026 15:27:15 +0800 Subject: [PATCH 3/7] fix --- .github/workflows/push_check.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/push_check.yml b/.github/workflows/push_check.yml index 3fddc48..ebadf9c 100644 --- a/.github/workflows/push_check.yml +++ b/.github/workflows/push_check.yml @@ -10,7 +10,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - + + - name: Build + uses: OpenHUTB/actions-mkdocs@main + with: + mkdocs_version: 'latest' # option + requirements: 'requirements.txt' # option + configfile: 'mkdocs.yml' # option + - uses: actions/setup-python@v6 with: python-version: '3.11' @@ -31,14 +38,7 @@ jobs: echo current directory file: ls cp -r _build/html ../../site - - - name: Build - uses: OpenHUTB/actions-mkdocs@main - with: - mkdocs_version: 'latest' # option - requirements: 'requirements.txt' # option - configfile: 'mkdocs.yml' # option - + - name: Deploy uses: peaceiris/actions-gh-pages@v3 with: From 9e65ec8a8ae66d59eb2613ad3d4ded9aa4fa18f9 Mon Sep 17 00:00:00 2001 From: donghaiwang Date: Tue, 7 Apr 2026 08:44:15 +0800 Subject: [PATCH 4/7] fix_shell --- docs/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index ea9a54a..af02cb1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -147,8 +147,7 @@ AirSim 的另一种使用方式是所谓的“计算机视觉”模式。在此 ### 论文 更多技术细节请参阅 [AirSim 论文(FSR 2017 会议))](https://arxiv.org/abs/1705.05065) 。请引用: - -``` +```shell @inproceedings{airsim2017fsr, author = {Shital Shah and Debadeepta Dey and Chris Lovett and Ashish Kapoor}, title = {AirSim: High-Fidelity Visual and Physical Simulation for Autonomous Vehicles}, From 3b0b5d120d2f83f93cdb4c72d3d0e7ea2a11aee6 Mon Sep 17 00:00:00 2001 From: donghaiwang Date: Tue, 7 Apr 2026 08:48:44 +0800 Subject: [PATCH 5/7] f --- .github/workflows/{push_check.yml => deploy.yml} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename .github/workflows/{push_check.yml => deploy.yml} (98%) diff --git a/.github/workflows/push_check.yml b/.github/workflows/deploy.yml similarity index 98% rename from .github/workflows/push_check.yml rename to .github/workflows/deploy.yml index ebadf9c..ec4a556 100644 --- a/.github/workflows/push_check.yml +++ b/.github/workflows/deploy.yml @@ -10,14 +10,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - - name: Build - uses: OpenHUTB/actions-mkdocs@main - with: - mkdocs_version: 'latest' # option - requirements: 'requirements.txt' # option - configfile: 'mkdocs.yml' # option - + - uses: actions/setup-python@v6 with: python-version: '3.11' @@ -39,6 +32,13 @@ jobs: ls cp -r _build/html ../../site + - name: Build + uses: OpenHUTB/actions-mkdocs@main + with: + mkdocs_version: 'latest' # option + requirements: 'requirements.txt' # option + configfile: 'mkdocs.yml' # option + - name: Deploy uses: peaceiris/actions-gh-pages@v3 with: From 4aef60b8d6d7be9d691ea51911ea48e904b8674b Mon Sep 17 00:00:00 2001 From: donghaiwang Date: Tue, 7 Apr 2026 08:53:04 +0800 Subject: [PATCH 6/7] f --- docs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/README.md b/docs/README.md index af02cb1..3253467 100644 --- a/docs/README.md +++ b/docs/README.md @@ -147,6 +147,7 @@ AirSim 的另一种使用方式是所谓的“计算机视觉”模式。在此 ### 论文 更多技术细节请参阅 [AirSim 论文(FSR 2017 会议))](https://arxiv.org/abs/1705.05065) 。请引用: + ```shell @inproceedings{airsim2017fsr, author = {Shital Shah and Debadeepta Dey and Chris Lovett and Ashish Kapoor}, From e84d738e6c6e628405e92300e5a98fda55df41e3 Mon Sep 17 00:00:00 2001 From: donghaiwang Date: Tue, 7 Apr 2026 09:01:51 +0800 Subject: [PATCH 7/7] f --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 20439f0..2bf4001 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ python-markdown-math imageio pymdown-extensions -sphinx_rtd_theme