From 44b0c0538dc24e662efbbe8837cf08874172b5a6 Mon Sep 17 00:00:00 2001
From: SP Mohanty <spmohanty91@gmail.com>
Date: Wed, 3 Jul 2019 08:14:11 +0200
Subject: [PATCH] Remove explicit references to render mode PILSVG, etc
---
README.rst | 2 +-
examples/demo.py | 2 +-
examples/play_model.py | 4 ++--
examples/simple_example_1.py | 2 +-
examples/simple_example_3.py | 2 +-
examples/tkplay.py | 6 +++++-
6 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/README.rst b/README.rst
index ad9eb84f..2b6b3102 100644
--- a/README.rst
+++ b/README.rst
@@ -147,7 +147,7 @@ Basic usage of the RailEnv environment used by the Flatland Challenge
seed=0),
number_of_agents=2)
- env_renderer = RenderTool(env, gl="PILSVG")
+ env_renderer = RenderTool(env)
for step in range(100):
obs, all_rewards, done, _ = env.step(
diff --git a/examples/demo.py b/examples/demo.py
index 7dd358a8..768f44d3 100644
--- a/examples/demo.py
+++ b/examples/demo.py
@@ -75,7 +75,7 @@ class Demo:
self.record_frames = record_frames
def create_renderer(self):
- self.renderer = RenderTool(self.env, gl="PILSVG")
+ self.renderer = RenderTool(self.env)
handle = self.env.get_agent_handles()
return handle
diff --git a/examples/play_model.py b/examples/play_model.py
index 6997b2c0..c44118c2 100644
--- a/examples/play_model.py
+++ b/examples/play_model.py
@@ -93,7 +93,7 @@ def max_lt(seq, val):
return None
-def main(render=True, delay=0.0, n_trials=3, n_steps=50, sGL="PILSVG"):
+def main(render=True, delay=0.0, n_trials=3, n_steps=50):
random.seed(1)
np.random.seed(1)
@@ -103,7 +103,7 @@ def main(render=True, delay=0.0, n_trials=3, n_steps=50, sGL="PILSVG"):
number_of_agents=5)
if render:
- env_renderer = RenderTool(env, gl=sGL)
+ env_renderer = RenderTool(env)
oPlayer = Player(env)
diff --git a/examples/simple_example_1.py b/examples/simple_example_1.py
index 89536edd..633c87b5 100644
--- a/examples/simple_example_1.py
+++ b/examples/simple_example_1.py
@@ -18,7 +18,7 @@ env = RailEnv(width=6,
env.reset()
-env_renderer = RenderTool(env, gl="PILSVG")
+env_renderer = RenderTool(env)
env_renderer.renderEnv(show=True)
env_renderer.renderEnv(show=True)
diff --git a/examples/simple_example_3.py b/examples/simple_example_3.py
index ddb98e99..9055dd4c 100644
--- a/examples/simple_example_3.py
+++ b/examples/simple_example_3.py
@@ -21,7 +21,7 @@ obs, all_rewards, done, _ = env.step({0: 0})
for i in range(env.get_num_agents()):
env.obs_builder.util_print_obs_subtree(tree=obs[i], num_features_per_node=7)
-env_renderer = RenderTool(env, gl="PILSVG")
+env_renderer = RenderTool(env)
env_renderer.renderEnv(show=True, frames=True)
env_renderer.renderEnv(show=True, frames=True)
diff --git a/examples/tkplay.py b/examples/tkplay.py
index 7ab1c323..00a4fc70 100644
--- a/examples/tkplay.py
+++ b/examples/tkplay.py
@@ -1,4 +1,8 @@
-from examples.play_model import Player
+try:
+ from examples.play_model import Player
+except ImportError:
+ from play_model import Player
+
from flatland.envs.generators import complex_rail_generator
from flatland.envs.rail_env import RailEnv
from flatland.utils.rendertools import RenderTool
--
GitLab