Skip to content

Commit 8bf0ed6

Browse files
committed
Import only modules within dm_control/viewer/
PiperOrigin-RevId: 218249222
1 parent 64e594f commit 8bf0ed6

4 files changed

Lines changed: 17 additions & 10 deletions

File tree

dm_control/viewer/renderer.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@
2222
import contextlib
2323

2424
from dm_control.mujoco import wrapper
25-
from dm_control.mujoco.wrapper.mjbindings import enums
26-
from dm_control.mujoco.wrapper.mjbindings import mjlib
27-
from dm_control.mujoco.wrapper.mjbindings import types
25+
from dm_control.mujoco.wrapper import mjbindings
2826
from dm_control.viewer import util
2927
import numpy as np
3028
import six
3129
from six.moves import range
3230

31+
enums = mjbindings.enums
32+
mjlib = mjbindings.mjlib
33+
types = mjbindings.types
3334

3435
# Fixed camera -1 is the free (unfixed) camera, and each fixed camera has
3536
# a positive index in range (0, self._model.ncam).

dm_control/viewer/runtime.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818
from __future__ import division
1919
from __future__ import print_function
2020

21-
from dm_control.mujoco.wrapper.mjbindings import mjlib
21+
from dm_control.mujoco.wrapper import mjbindings
2222
from dm_control.viewer import util
2323
import enum
2424
import numpy as np
2525

26+
mjlib = mjbindings.mjlib
27+
2628

2729
# Pause interval between simulation steps.
2830
_SIMULATION_STEP_INTERVAL = 0.001

dm_control/viewer/viewer.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@
1818
from __future__ import division
1919
from __future__ import print_function
2020

21-
from dm_control.mujoco.wrapper.mjbindings import constants
22-
from dm_control.mujoco.wrapper.mjbindings import enums
23-
from dm_control.mujoco.wrapper.mjbindings import functions
21+
from dm_control.mujoco.wrapper import mjbindings
2422
from dm_control.viewer import renderer
2523
from dm_control.viewer import user_input
2624
from dm_control.viewer import util
2725
from six.moves import range
2826

27+
constants = mjbindings.constants
28+
enums = mjbindings.enums
29+
functions = mjbindings.functions
30+
2931
_NUM_GROUP_KEYS = 10
3032

3133
_PAN_CAMERA_VERTICAL_MOUSE = user_input.Exclusive(

dm_control/viewer/views.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@
2020

2121
import abc
2222

23+
from dm_control.mujoco.wrapper import mjbindings
2324
from dm_control.mujoco.wrapper import util
24-
from dm_control.mujoco.wrapper.mjbindings import enums
25-
from dm_control.mujoco.wrapper.mjbindings import mjlib
26-
from dm_control.mujoco.wrapper.mjbindings import types
2725
from dm_control.viewer import renderer
2826
import enum
2927
import numpy as np
3028
import six
3129

30+
enums = mjbindings.enums
31+
mjlib = mjbindings.mjlib
32+
types = mjbindings.types
33+
3234

3335
class PanelLocation(enum.Enum):
3436
TOP_LEFT = enums.mjtGridPos.mjGRID_TOPLEFT

0 commit comments

Comments
 (0)