diff --git a/Assets/RGLUnityPlugin/Scripts/SceneManager.cs b/Assets/RGLUnityPlugin/Scripts/SceneManager.cs index d151a1a64..c39bcb786 100644 --- a/Assets/RGLUnityPlugin/Scripts/SceneManager.cs +++ b/Assets/RGLUnityPlugin/Scripts/SceneManager.cs @@ -66,9 +66,6 @@ public enum MeshSource // Since categoryId can be changed in the runtime, this is filled only on object removal / simulation end. private readonly Dictionary semanticDict = new Dictionary(); - // Using the same TimeSource as AWSIM does - public static ITimeSource TimeSource { get; } = AWSIM.SimulatorROS2Node.TimeSource; - private int lastUpdateFrame = -1; private int lastFixedUpdateFrame = -1; @@ -197,7 +194,7 @@ private void SynchronizeSceneTime() { int seconds; uint nanoseconds; - TimeSource.GetTime(out seconds, out nanoseconds); + AWSIM.SimulatorROS2Node.TimeSource.GetTime(out seconds, out nanoseconds); UInt64 timeNs = (UInt64)(seconds * 1e9) + nanoseconds; RGLNativeAPI.CheckErr(RGLNativeAPI.rgl_scene_set_time(IntPtr.Zero, timeNs)); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 023195cf8..f7f190957 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -129,7 +129,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.1.0 + bundleVersion: 1.2.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/docs/GettingStarted/QuickStartDemo/index.md b/docs/GettingStarted/QuickStartDemo/index.md index 5ab17bab6..f1e378d2c 100644 --- a/docs/GettingStarted/QuickStartDemo/index.md +++ b/docs/GettingStarted/QuickStartDemo/index.md @@ -111,27 +111,27 @@ To run the simulator, please follow the steps below. 3. Download and Run AWSIM Demo binary. - 1. Download `AWSIM_v1.1.0.zip`. + 1. Download `AWSIM_v1.2.0.zip`. - [Download AWSIM Demo for ubuntu](https://github.com/tier4/AWSIM/releases/download/v1.1.0/AWSIM_v1.1.0.zip){.md-button .md-button--primary} + [Download AWSIM Demo for ubuntu](https://github.com/tier4/AWSIM/releases/download/v1.2.0/AWSIM_v1.2.0.zip){.md-button .md-button--primary} 2. Unzip the downloaded file. - 3. Make the `AWSIM_demo.x86_64` file executable. + 3. Make the `AWSIM_v1.2.0.x86_64` file executable. - Rightclick the `AWSIM_demo.x86_64` file and check the `Execute` checkbox + Rightclick the `AWSIM_v1.2.0.x86_64` file and check the `Execute` checkbox ![](Image_1.png) or execute the command below. ``` - chmod +x /AWSIM_demo.x86_64 + chmod +x /AWSIM_v1.2.0.x86_64 ``` - 4. Launch `AWSIM_demo.x86_64`. + 4. Launch `AWSIM_v1.2.0.x86_64`. ``` - .//AWSIM_demo.x86_64 + .//AWSIM_v1.2.0.x86_64 ``` !!! warning diff --git a/docs/GettingStarted/UsingOpenSCENARIO/index.md b/docs/GettingStarted/UsingOpenSCENARIO/index.md index b57df461e..3b4d53002 100644 --- a/docs/GettingStarted/UsingOpenSCENARIO/index.md +++ b/docs/GettingStarted/UsingOpenSCENARIO/index.md @@ -6,7 +6,7 @@ Running AWSIM with scenario_simulator_v2 is still a prototype, so stable running is not guaranteed. -Below you can find instructions on how to setup the scenario execution using `scenario_simulator_v2` with AWSIM as a simulator +Below you can find instructions on how to setup the OpenSCENARIO execution using `scenario_simulator_v2` with AWSIM as a simulator The instruction assumes using the Ubuntu OS. ## Prerequisites @@ -18,7 +18,7 @@ In order to configure the Autoware software with the AWSIM demo, please: 1. Clone RobotecAI's [Autoware](https://github.com/RobotecAI/autoware-1/tree/awsim-ss2-stable) and move to the directory. ``` - git clone https://github.com/autowarefoundation/autoware.git + git clone git@github.com:RobotecAI/autoware-1.git cd autoware ``` 2. Check out to the `awsim-ss2-stable` branch @@ -36,7 +36,7 @@ In order to configure the Autoware software with the AWSIM demo, please: vcs import src < simulator.repos ``` 5. Download `shinjuku_map.zip` - [archive](https://drive.google.com/file/d/15aoZDEMnKL3cw8Zt_jh3zyiy_o35W0pr/view?usp=drive_link){.md-button .md-button--primary} + [archive](https://github.com/tier4/AWSIM/releases/download/v1.2.0/shinjuku_map.zip){.md-button .md-button--primary} 6. Unzip it to `src/simulator` directory ``` @@ -55,9 +55,10 @@ In order to configure the Autoware software with the AWSIM demo, please: ## Running the demo -1. Open AutowareSimulationScenarioSimulator.unity scene placed under `Assets/AWSIM/Scenes/Main` directory -2. Run the simulation by clicking `Play` button placed at the top section of Editor. -3. Launch `scenario_test_runner`. +1. Download `AWSIM_v1.2.0_ss2.zip` & Run + [archive](https://github.com/tier4/AWSIM/releases/download/v1.2.0/AWSIM_v1.2.0_ss2.zip){.md-button .md-button--primary} + +2. Launch `scenario_test_runner`. ``` source install/setup.bash ros2 launch scenario_test_runner scenario_test_runner.launch.py \ diff --git a/docs/index.md b/docs/index.md index a53fb953c..3a460cc2c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -14,7 +14,7 @@ AWSIM is the best scene for [Autoware](https://github.com/autowarefoundation/aut ## Try the simulation demo yourself! -[Download AWSIM Demo for Ubuntu](https://github.com/tier4/AWSIM/releases/download/v1.1.0/AWSIM_v1.1.0.zip){.md-button .md-button--primary} +[Download AWSIM Demo for Ubuntu](https://github.com/tier4/AWSIM/releases/download/v1.2.0/AWSIM_v1.2.0.zip){.md-button .md-button--primary} To test the AWSIM demo with Autoware please refer to the [Quick start demo](./GettingStarted/QuickStartDemo/index.md) section. diff --git a/mkdocs.yml b/mkdocs.yml index ef819cb5d..e228440a3 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -38,8 +38,7 @@ nav: - Getting started: - Quick Start Demo: GettingStarted/QuickStartDemo/index.md - Setup Unity Project: GettingStarted/SetupUnityProject/index.md - # TODO: Will publish when more stable. - #- Using OpenSCENARIO: GettingStarted/UsingOpenSCENARIO/index.md + - Using OpenSCENARIO: GettingStarted/UsingOpenSCENARIO/index.md - Introduction: