Merge remote-tracking branch 'origin/v1.0.0' into dev_docs

f1tenth · Apr 19, 2024 · 185b32c · 185b32c
2 parents 2995d84 + 5dbba85
commit 185b32c
Show file tree

Hide file tree

Showing 39 changed files with 442 additions and 496 deletions.
diff --git a/examples/run_in_empty_track.py b/examples/run_in_empty_track.py
@@ -1,7 +1,7 @@
 import numpy as np
 
 from waypoint_follow import PurePursuitPlanner
-from f110_gym.envs.track import Track
+from f1tenth_gym.envs.track import Track
 import gymnasium as gym
 
 
@@ -20,7 +20,7 @@ def main():
 
     # env and planner
     env = gym.make(
-        "f110_gym:f110-v0",
+        "f1tenth_gym:f1tenth-v0",
         config={
             "map": track,
             "num_agents": 1,

diff --git a/examples/video_recording.py b/examples/video_recording.py
@@ -15,7 +15,7 @@ def main():
     }
 
     env = gym.make(
-        "f110_gym:f110-v0",
+        "f1tenth_gym:f1tenth-v0,
         config={
             "map": "Spielberg",
             "num_agents": 1,

diff --git a/examples/waypoint_follow.py b/examples/waypoint_follow.py
@@ -293,7 +293,7 @@ def main():
 
     num_agents = 3
     env = gym.make(
-        "f110_gym:f110-v0",
+        "f1tenth_gym:f1tenth-v0",
         config={
             "map": "Spielberg",
             "num_agents": num_agents,

diff --git a/f1tenth_gym/__init__.py b/f1tenth_gym/__init__.py
@@ -0,0 +1,6 @@
+import gymnasium as gym
+
+gym.register(
+    id="f1tenth-v0",
+    entry_point="f1tenth_gym.envs:F110Env",
+)
diff --git a/gym/f110_gym/envs/__init__.py → f1tenth_gym/envs/__init__.py b/gym/f110_gym/envs/__init__.py → f1tenth_gym/envs/__init__.py
diff --git a/gym/f110_gym/envs/action.py → f1tenth_gym/envs/action.py b/gym/f110_gym/envs/action.py → f1tenth_gym/envs/action.py
@@ -5,7 +5,7 @@
 import warnings
 import gymnasium as gym
 import numpy as np
-from f110_gym.envs.dynamic_models import pid_steer, pid_accl
+from .dynamic_models import pid_steer, pid_accl
 
 
 class LongitudinalActionEnum(Enum):

diff --git a/gym/f110_gym/envs/base_classes.py → f1tenth_gym/envs/base_classes.py b/gym/f110_gym/envs/base_classes.py → f1tenth_gym/envs/base_classes.py
@@ -1,11 +1,11 @@
 from __future__ import annotations
 import numpy as np
-from f110_gym.envs.dynamic_models import DynamicModel
-from f110_gym.envs.action import CarAction
-from f110_gym.envs.collision_models import collision_multiple, get_vertices
-from f110_gym.envs.integrator import EulerIntegrator, IntegratorType
-from f110_gym.envs.laser_models import ScanSimulator2D, check_ttc_jit, ray_cast
-from f110_gym.envs.track import Track
+from .dynamic_models import DynamicModel
+from .action import CarAction
+from .collision_models import collision_multiple, get_vertices
+from .integrator import EulerIntegrator, IntegratorType
+from .laser_models import ScanSimulator2D, check_ttc_jit, ray_cast
+from .track import Track
 
 
 class RaceCar(object):

diff --git a/gym/f110_gym/envs/collision_models.py → f1tenth_gym/envs/collision_models.py b/gym/f110_gym/envs/collision_models.py → f1tenth_gym/envs/collision_models.py
diff --git a/gym/f110_gym/envs/dynamic_models.py → f1tenth_gym/envs/dynamic_models.py b/gym/f110_gym/envs/dynamic_models.py → f1tenth_gym/envs/dynamic_models.py