-
Notifications
You must be signed in to change notification settings - Fork 108
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into pj/docs_ros2_configur…
…ation_policies Signed-off-by: Piotr Jaroszek <[email protected]>
- Loading branch information
Showing
4 changed files
with
40 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,6 +43,24 @@ This page is a tutorial for setting up a AWSIM Unity project. | |
2. Prepare a desktop PC with Windows 10 or 11 (64 bit) installed. | ||
3. Install [git](https://git-scm.com/). | ||
|
||
### ROS 2 | ||
|
||
AWSIM comes with a *standalone* flavor of [`Ros2ForUnity`](../../Components/ROS2/ROS2ForUnity/index.md). This means that, to avoid internal conflicts between different ROS 2 versions, you shouldn't run the Editor or AWSIM binary with ROS 2 sourced. | ||
|
||
!!! warning | ||
|
||
Do not run the AWSIM, Unity Hub, or the Editor with ROS 2 sourced. | ||
|
||
=== "Ubuntu 22" | ||
- Make sure that the terminal which you are using to run Unity Hub, Editor, or AWSIM doesn't have ROS 2 sourced. | ||
- It is common to have ROS 2 sourced automatically with `~/.bashrc` or `~/.profile`. Make sure it is not obscuring your working environment: | ||
- Running Unity Hub from the Ubuntu GUI menu takes the environment configuration from `~/.profile`. | ||
- Running Unity Hub from the terminal uses the current terminal configuration from `~/.profile` and `~/.bashrc`. | ||
- Running Unity Editor from the UnityHub inherits the environment setup from the Unity Hub. | ||
|
||
=== "Windows" | ||
- Make sure your Windows environment variables are ROS 2 free. | ||
|
||
### Unity installation | ||
|
||
!!! info | ||
|
@@ -78,7 +96,7 @@ Follow the steps below to install Unity on your machine: | |
To open the Unity AWSIM project in Unity Editor: | ||
|
||
=== "Using Unity Hub" | ||
1. Make sure you have the AWSIM repository cloned | ||
1. Make sure you have the AWSIM repository cloned and ROS 2 is not sourced. | ||
``` | ||
git clone [email protected]:tier4/AWSIM.git | ||
``` | ||
|
@@ -93,21 +111,21 @@ To open the Unity AWSIM project in Unity Editor: | |
If you are launching the Unity Hub from the Ubuntu applications menu (without the terminal), make sure that system optimizations are set. To be sure, run the terminal at least once before running the Unity Hub. This will apply the OS settings. | ||
|
||
3. Open the project in UnityHub | ||
- Click the `Open` button | ||
![](image_6.png) | ||
- Click the `Open` button | ||
![](image_6.png) | ||
|
||
- Navigate the directory where the AWSIM repository was cloned to | ||
![](image_7.png) | ||
- Navigate the directory where the AWSIM repository was cloned to | ||
![](image_7.png) | ||
|
||
- The project should be added to `Projects` tab in Unity Hub. To launch the project in Unity Editor simply click the `AWSIM` item | ||
![](image_8.png) | ||
- The project should be added to `Projects` tab in Unity Hub. To launch the project in Unity Editor simply click the `AWSIM` item | ||
![](image_8.png) | ||
|
||
- The project is now ready to use | ||
![](image_9.png) | ||
- The project is now ready to use | ||
![](image_9.png) | ||
|
||
=== "Using Terminal" | ||
|
||
1. Enter the AWSIM directory | ||
1. Enter the AWSIM directory (make sure ROS 2 is not sourced). | ||
``` | ||
cd AWSIM | ||
``` | ||
|