Merge pull request #67 from jerryz123/decouple_rendering

Decouple rendering
BerkeleyAutomation · Jul 10, 2018 · 5ec659c · 5ec659c
2 parents b21d3b5 + c14e145
commit 5ec659c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/.coverage b/.coverage
diff --git a/examples/fluids_test.py b/examples/fluids_test.py
@@ -24,3 +24,4 @@
 #    actions = {k:fluids.KeyboardAction() for k in controlled_keys}
     rew = simulator.step(actions)
     obs = simulator.get_observations(controlled_keys)
+    simulator.render()
diff --git a/fluids/__main__.py b/fluids/__main__.py
@@ -56,5 +56,6 @@
     actions = {k: fluids.KeyboardAction() for k in simulator.get_control_keys()}
     rew = simulator.step(actions)
     obs = simulator.get_observations(simulator.get_control_keys())
+    simulator.render()
     t = t + 1
 
diff --git a/fluids/sim.py b/fluids/sim.py
@@ -47,7 +47,6 @@ class FluidSim(object):
     def __init__(self,
                  state               =STATE_CITY,
                  visualization_level =1,
-                 render_on           =True,
                  controlled_cars     =1,
                  background_cars     =0,
                  background_peds     =0,
@@ -82,7 +81,6 @@ def __init__(self,
                                       REWARD_NONE    : lambda s : 0}[reward_fn]
         self.background_control    = background_control
         self.vis_level             = visualization_level
-        self.render_on             = render_on
         self.fps                   = fps
         self.last_keys_pressed     = None
         self.render()
@@ -178,8 +176,6 @@ def step(self, actions={}):
 
         reward_step = self.reward_fn(self.state)
         #print(reward_step)
-        if self.render_on:
-            self.render()
         return reward_step
     def get_observations(self, keys={}):
         """