Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add is_paused, set_global #1626

Merged
merged 1 commit into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
from mujoco_interactive_viewer.viewer import Viewer
from __future__ import annotations

from typing import TYPE_CHECKING

if TYPE_CHECKING:
from mujoco_interactive_viewer.viewer import Viewer

_viewer: Viewer | None = None

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from mujoco._structs import MjvGeom
from numpy.typing import ArrayLike, NDArray

from mujoco_interactive_viewer.context import set_global_viewer
from mujoco_interactive_viewer.figure import Figure
from mujoco_interactive_viewer.interaction import InteractionState
from mujoco_interactive_viewer.marker import Marker
Expand Down Expand Up @@ -52,11 +53,13 @@ def __init__(
width: int | None = None,
height: int | None = None,
font_scale: mujoco.mjtFontScale = mujoco.mjtFontScale.mjFONTSCALE_100,
is_paused: bool = False,
set_global: bool = True,
) -> None:
self._gui_lock = Lock()
self._interaction_state = InteractionState()
self._visualization_state = VisualizationState()
self._render_state = RenderState()
self._render_state = RenderState(is_paused=is_paused)
self.is_alive = True

self.model = model
Expand Down Expand Up @@ -105,6 +108,9 @@ def __init__(
self._figures: dict[str, Figure] = {}
self._overlay: dict[mujoco.mjtGridPos, Overlay] = {}

if set_global:
set_global_viewer(self)

def add_marker(
self,
kind: mujoco.mjtGeom,
Expand Down
3 changes: 1 addition & 2 deletions tools/machine-learning/mujoco/scripts/mujoco-walking.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import click
import numpy as np
from mujoco_interactive_viewer import Viewer, set_global_viewer
from mujoco_interactive_viewer import Viewer
from nao_env import NaoWalking
from stable_baselines3 import PPO

Expand Down Expand Up @@ -31,7 +31,6 @@ def main(*, throw_tomatoes: bool, load_policy: str | None) -> None:
env.initialize_terrain(max_height=0.1, step_height=0.01)

viewer = Viewer(env.model, env.data)
set_global_viewer(viewer)
rewards_figure = viewer.figure("rewards")
rewards_figure.set_title("Rewards")
rewards_figure.set_x_label("Step")
Expand Down