Skip to content

Commit

Permalink
Merge branch 'dynamics2' into public-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
dfremont committed Oct 22, 2020
2 parents c7f808f + 6edf8df commit 53f59b9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 6 additions & 0 deletions docs/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ Installing via either :command:`pip` or Poetry will install all of the dependenc
In the past, the ``shapely`` package did not install properly on Windows.
If you encounter this issue, try installing it manually following the instructions `here <https://github.com/Toblerity/Shapely#built-distributions>`__.

.. note::

On some platforms, in particular OS X, you may get an error during the installation of `pygame <https://www.pygame.org/>`_ due to missing SDL files.
Try installing `SDL <https://www.libsdl.org/>`_: on OS X, if you use `Homebrew <https://brew.sh/>`_ you can simply run :command:`brew install sdl`.


Trying Some Examples
--------------------

Expand Down
8 changes: 5 additions & 3 deletions src/scenic/domains/driving/behaviors.scenic
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ behavior FollowLaneBehavior(target_speed = 10, laneToFollow=None, is_oppositeTra
This behavior does not terminate. A recommended use of the behavior is to accompany it with condition,
e.g. do FollowLaneBehavior() until ...
:param target_speed: Its unit is in m/s. By default, it is set to 10 m/s
:param laneToFollow: If the lane to follow is different from the lane that the vehicle is on, this parameter can be used to specify that lane.
By default, this variable will be set to None, which means that the vehicle will follow the lane that it is currently on.
Arguments:
target_speed: Its unit is in m/s. By default, it is set to 10 m/s
laneToFollow: If the lane to follow is different from the lane that the vehicle is on,
this parameter can be used to specify that lane. By default, this variable will be
set to None, which means that the vehicle will follow the lane that it is currently on.
"""

past_steer_angle = 0
Expand Down

0 comments on commit 53f59b9

Please sign in to comment.