Skip to content

Commit 0ca6864

Browse files
committed
complete renaming
1 parent b4996c2 commit 0ca6864

6 files changed

Lines changed: 94 additions & 94 deletions

File tree

docs/source/how-to/configure_rendering.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Selecting a Rendering Mode Profile
1919

2020
Rendering mode can be selected in two ways:
2121

22-
1. Set ``rendering_quality`` in a visualizer config, which selects an entry from
23-
:attr:`~sim.SimulationCfg.rendering_quality_cfgs`.
22+
1. Set the visualizer profile selector field ``rendering_mode``, which selects an entry from
23+
:attr:`~sim.SimulationCfg.rendering_mode_cfgs`.
2424

2525
.. code-block:: python
2626
@@ -30,21 +30,21 @@ Rendering mode can be selected in two ways:
3030
sim_cfg = sim_utils.SimulationCfg(
3131
visualizer_cfgs=[
3232
KitVisualizerCfg(
33-
rendering_quality="performance",
33+
rendering_mode="performance",
3434
),
3535
],
3636
)
3737
3838
2. Use the ``--rendering_mode`` CLI argument, which takes precedence over
39-
``visualizer_cfg.rendering_quality``.
39+
``visualizer_cfg.rendering_mode``.
4040

4141
.. code-block:: bash
4242
4343
./isaaclab.sh -p scripts/tutorials/00_sim/set_rendering_mode.py --rendering_mode {performance/balanced/quality}
4444
4545
Notes:
4646

47-
* If ``rendering_quality=None`` for a visualizer, Isaac Lab does not apply rendering overrides
47+
* If ``rendering_mode=None`` for a visualizer, Isaac Lab does not apply rendering overrides
4848
for that visualizer, and backend/native defaults (for Kit, USD-authored settings) are used.
4949
* ``--rendering_mode`` is the supported CLI entry point.
5050

source/isaaclab/isaaclab/rendering_mode/rendering_mode_utils.py

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55

6-
"""Utility helpers for applying rendering quality profiles."""
6+
"""Utility helpers for applying rendering mode profiles."""
77

88
from __future__ import annotations
99

@@ -20,10 +20,10 @@ def apply_kit_rendering_preset(set_setting: Any, preset_name: str) -> None:
2020
set_setting(key, value)
2121

2222

23-
def apply_kit_rendering_quality_cfg(set_setting: Any, quality_cfg: RenderingModeCfg) -> None:
24-
"""Apply kit-specific quality fields."""
25-
if quality_cfg.rendering_mode_preset:
26-
apply_kit_rendering_preset(set_setting, quality_cfg.rendering_mode_preset)
23+
def apply_kit_rendering_mode_cfg(set_setting: Any, mode_cfg: RenderingModeCfg) -> None:
24+
"""Apply kit-specific rendering mode fields."""
25+
if mode_cfg.rendering_mode_preset:
26+
apply_kit_rendering_preset(set_setting, mode_cfg.rendering_mode_preset)
2727

2828
field_to_carb = {
2929
"kit_enable_translucency": "/rtx/translucency/enabled",
@@ -39,21 +39,21 @@ def apply_kit_rendering_quality_cfg(set_setting: Any, quality_cfg: RenderingMode
3939
"kit_dome_light_upper_lower_strategy": "/rtx/domeLight/upperLowerStrategy",
4040
}
4141
for field_name, carb_key in field_to_carb.items():
42-
value = getattr(quality_cfg, field_name, None)
42+
value = getattr(mode_cfg, field_name, None)
4343
if value is not None:
4444
set_setting(carb_key, value)
4545

46-
if quality_cfg.kit_antialiasing_mode is not None:
46+
if mode_cfg.kit_antialiasing_mode is not None:
4747
try:
4848
import omni.replicator.core as rep
4949

50-
rep.settings.set_render_rtx_realtime(antialiasing=quality_cfg.kit_antialiasing_mode)
50+
rep.settings.set_render_rtx_realtime(antialiasing=mode_cfg.kit_antialiasing_mode)
5151
except Exception:
5252
pass
5353

5454

55-
def apply_newton_quality_cfg_to_visualizer_cfg(visualizer_cfg: Any, quality_cfg: RenderingModeCfg) -> None:
56-
"""Apply Newton quality values to a visualizer cfg object."""
55+
def apply_newton_mode_cfg_to_visualizer_cfg(visualizer_cfg: Any, mode_cfg: RenderingModeCfg) -> None:
56+
"""Apply Newton rendering mode values to a visualizer cfg object."""
5757
override_fields = {
5858
"newton_enable_shadows": "enable_shadows",
5959
"newton_enable_sky": "enable_sky",
@@ -62,102 +62,102 @@ def apply_newton_quality_cfg_to_visualizer_cfg(visualizer_cfg: Any, quality_cfg:
6262
"newton_sky_lower_color": "sky_lower_color",
6363
"newton_light_color": "light_color",
6464
}
65-
for quality_field, viz_field in override_fields.items():
66-
value = getattr(quality_cfg, quality_field, None)
65+
for mode_field, viz_field in override_fields.items():
66+
value = getattr(mode_cfg, mode_field, None)
6767
if value is not None and hasattr(visualizer_cfg, viz_field):
6868
setattr(visualizer_cfg, viz_field, value)
6969

7070

71-
def apply_newton_quality_cfg_to_viewer(viewer: Any, quality_cfg: RenderingModeCfg) -> None:
72-
"""Apply Newton quality values to a live Newton viewer renderer, if available."""
71+
def apply_newton_mode_cfg_to_viewer(viewer: Any, mode_cfg: RenderingModeCfg) -> None:
72+
"""Apply Newton rendering mode values to a live Newton viewer renderer, if available."""
7373
if viewer is None or not hasattr(viewer, "renderer"):
7474
return
7575

76-
if quality_cfg.newton_enable_shadows is not None:
77-
viewer.renderer.draw_shadows = quality_cfg.newton_enable_shadows
78-
if quality_cfg.newton_enable_sky is not None:
79-
viewer.renderer.draw_sky = quality_cfg.newton_enable_sky
80-
if quality_cfg.newton_enable_wireframe is not None:
81-
viewer.renderer.draw_wireframe = quality_cfg.newton_enable_wireframe
82-
if quality_cfg.newton_sky_upper_color is not None:
83-
viewer.renderer.sky_upper = quality_cfg.newton_sky_upper_color
84-
if quality_cfg.newton_sky_lower_color is not None:
85-
viewer.renderer.sky_lower = quality_cfg.newton_sky_lower_color
86-
if quality_cfg.newton_light_color is not None:
87-
viewer.renderer._light_color = quality_cfg.newton_light_color
88-
89-
90-
def resolve_rendering_quality_name_for_visualizer_cfg(get_setting: Any, visualizer_cfg: Any) -> str | None:
91-
"""Resolve effective quality profile name for a visualizer cfg."""
92-
cli_quality_explicit = bool(get_setting("/isaaclab/rendering/rendering_mode/explicit"))
93-
cli_quality = get_setting("/isaaclab/rendering/rendering_mode")
94-
if cli_quality_explicit:
95-
return cli_quality if cli_quality else None
96-
quality_name = getattr(visualizer_cfg, "rendering_quality", None)
97-
return quality_name if quality_name else None
98-
99-
100-
def resolve_rendering_quality_cfg(
101-
quality_name: str | None, quality_cfgs: dict[str, RenderingModeCfg], logger: Any
76+
if mode_cfg.newton_enable_shadows is not None:
77+
viewer.renderer.draw_shadows = mode_cfg.newton_enable_shadows
78+
if mode_cfg.newton_enable_sky is not None:
79+
viewer.renderer.draw_sky = mode_cfg.newton_enable_sky
80+
if mode_cfg.newton_enable_wireframe is not None:
81+
viewer.renderer.draw_wireframe = mode_cfg.newton_enable_wireframe
82+
if mode_cfg.newton_sky_upper_color is not None:
83+
viewer.renderer.sky_upper = mode_cfg.newton_sky_upper_color
84+
if mode_cfg.newton_sky_lower_color is not None:
85+
viewer.renderer.sky_lower = mode_cfg.newton_sky_lower_color
86+
if mode_cfg.newton_light_color is not None:
87+
viewer.renderer._light_color = mode_cfg.newton_light_color
88+
89+
90+
def resolve_rendering_mode_name_for_visualizer_cfg(get_setting: Any, visualizer_cfg: Any) -> str | None:
91+
"""Resolve effective rendering mode profile name for a visualizer cfg."""
92+
cli_mode_explicit = bool(get_setting("/isaaclab/rendering/rendering_mode/explicit"))
93+
cli_mode = get_setting("/isaaclab/rendering/rendering_mode")
94+
if cli_mode_explicit:
95+
return cli_mode if cli_mode else None
96+
mode_name = getattr(visualizer_cfg, "rendering_mode", None)
97+
return mode_name if mode_name else None
98+
99+
100+
def resolve_rendering_mode_cfg(
101+
mode_name: str | None, mode_cfgs: dict[str, RenderingModeCfg], logger: Any
102102
) -> RenderingModeCfg | None:
103-
"""Fetch quality cfg by name and log if missing."""
104-
if not quality_name:
103+
"""Fetch rendering mode cfg by name and log if missing."""
104+
if not mode_name:
105105
return None
106-
quality_cfg = quality_cfgs.get(quality_name)
107-
if quality_cfg is None:
106+
mode_cfg = mode_cfgs.get(mode_name)
107+
if mode_cfg is None:
108108
logger.warning(
109-
"[SimulationContext] Rendering quality '%s' not found in SimulationCfg.rendering_quality_cfgs.",
110-
quality_name,
109+
"[SimulationContext] Rendering mode '%s' not found in SimulationCfg.rendering_mode_cfgs.",
110+
mode_name,
111111
)
112112
return None
113-
return quality_cfg
113+
return mode_cfg
114114

115115

116-
def apply_quality_profile_to_visualizer_cfg(
116+
def apply_mode_profile_to_visualizer_cfg(
117117
get_setting: Any,
118118
set_setting: Any,
119119
visualizer_cfg: Any,
120-
quality_cfgs: dict[str, RenderingModeCfg],
120+
mode_cfgs: dict[str, RenderingModeCfg],
121121
logger: Any,
122122
) -> None:
123-
"""Resolve and apply quality profile to a visualizer config."""
124-
quality_name = resolve_rendering_quality_name_for_visualizer_cfg(get_setting, visualizer_cfg)
125-
quality_cfg = resolve_rendering_quality_cfg(quality_name, quality_cfgs, logger)
126-
if quality_cfg is None:
123+
"""Resolve and apply rendering mode profile to a visualizer config."""
124+
mode_name = resolve_rendering_mode_name_for_visualizer_cfg(get_setting, visualizer_cfg)
125+
mode_cfg = resolve_rendering_mode_cfg(mode_name, mode_cfgs, logger)
126+
if mode_cfg is None:
127127
return
128128

129129
visualizer_type = getattr(visualizer_cfg, "visualizer_type", None)
130130
if visualizer_type == "kit":
131-
apply_kit_rendering_quality_cfg(set_setting, quality_cfg)
131+
apply_kit_rendering_mode_cfg(set_setting, mode_cfg)
132132
elif visualizer_type == "newton":
133-
apply_newton_quality_cfg_to_visualizer_cfg(visualizer_cfg, quality_cfg)
133+
apply_newton_mode_cfg_to_visualizer_cfg(visualizer_cfg, mode_cfg)
134134

135135

136-
def apply_runtime_quality_profile_to_visualizer(
136+
def apply_runtime_mode_profile_to_visualizer(
137137
get_setting: Any,
138138
set_setting: Any,
139139
viz: Any,
140-
visualizer_quality_keys: dict[int, str | None],
141-
quality_cfgs: dict[str, RenderingModeCfg],
140+
visualizer_mode_keys: dict[int, str | None],
141+
mode_cfgs: dict[str, RenderingModeCfg],
142142
logger: Any,
143143
force: bool = False,
144144
) -> None:
145-
"""Resolve and apply runtime quality profile to an active visualizer."""
146-
quality_name = resolve_rendering_quality_name_for_visualizer_cfg(get_setting, viz.cfg)
145+
"""Resolve and apply runtime rendering mode profile to an active visualizer."""
146+
mode_name = resolve_rendering_mode_name_for_visualizer_cfg(get_setting, viz.cfg)
147147
viz_id = id(viz)
148-
if not force and visualizer_quality_keys.get(viz_id) == quality_name:
148+
if not force and visualizer_mode_keys.get(viz_id) == mode_name:
149149
return
150150

151-
quality_cfg = resolve_rendering_quality_cfg(quality_name, quality_cfgs, logger)
152-
if quality_cfg is None:
153-
visualizer_quality_keys[viz_id] = quality_name
151+
mode_cfg = resolve_rendering_mode_cfg(mode_name, mode_cfgs, logger)
152+
if mode_cfg is None:
153+
visualizer_mode_keys[viz_id] = mode_name
154154
return
155155

156156
viz_type = getattr(viz.cfg, "visualizer_type", None)
157157
if viz_type == "kit":
158-
apply_kit_rendering_quality_cfg(set_setting, quality_cfg)
158+
apply_kit_rendering_mode_cfg(set_setting, mode_cfg)
159159
elif viz_type == "newton":
160-
apply_newton_quality_cfg_to_visualizer_cfg(viz.cfg, quality_cfg)
161-
apply_newton_quality_cfg_to_viewer(getattr(viz, "_viewer", None), quality_cfg)
160+
apply_newton_mode_cfg_to_visualizer_cfg(viz.cfg, mode_cfg)
161+
apply_newton_mode_cfg_to_viewer(getattr(viz, "_viewer", None), mode_cfg)
162162

163-
visualizer_quality_keys[viz_id] = quality_name
163+
visualizer_mode_keys[viz_id] = mode_name

source/isaaclab/isaaclab/sim/simulation_cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ class SimulationCfg:
9393
a different config (e.g., NewtonManagerCfg) to use a different physics backend.
9494
"""
9595

96-
rendering_quality_cfgs: dict[str, RenderingModeCfg] = {
96+
rendering_mode_cfgs: dict[str, RenderingModeCfg] = {
9797
"performance": RenderingModeCfg(rendering_mode_preset="performance"),
9898
"balanced": RenderingModeCfg(rendering_mode_preset="balanced"),
9999
"quality": RenderingModeCfg(rendering_mode_preset="quality"),
100100
}
101-
"""Named rendering quality profiles available to visualizers/renderers."""
101+
"""Named rendering mode profiles available to visualizers/renderers."""
102102

103103
create_stage_in_memory: bool = False
104104
"""If stage is first created in memory. Default is False.

source/isaaclab/isaaclab/sim/simulation_context.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -296,18 +296,18 @@ def _apply_quality_profile_to_visualizer_cfg(self, visualizer_cfg: Any) -> None:
296296
self.get_setting,
297297
self.set_setting,
298298
visualizer_cfg,
299-
quality_cfgs,
299+
mode_cfgs,
300300
logger,
301301
)
302302

303-
def _apply_runtime_quality_profile_to_visualizer(self, viz: Visualizer, force: bool = False) -> None:
304-
quality_cfgs = getattr(self.cfg, "rendering_quality_cfgs", None) or {}
305-
apply_runtime_quality_profile_to_visualizer(
303+
def _apply_runtime_mode_profile_to_visualizer(self, viz: Visualizer, force: bool = False) -> None:
304+
mode_cfgs = getattr(self.cfg, "rendering_mode_cfgs", None) or {}
305+
apply_runtime_mode_profile_to_visualizer(
306306
self.get_setting,
307307
self.set_setting,
308308
viz,
309-
self._visualizer_quality_keys,
310-
quality_cfgs,
309+
self._visualizer_mode_keys,
310+
mode_cfgs,
311311
logger,
312312
force=force,
313313
)
@@ -588,10 +588,10 @@ def initialize_visualizers(self) -> None:
588588

589589
for cfg in visualizer_cfgs:
590590
try:
591-
self._apply_quality_profile_to_visualizer_cfg(cfg)
591+
self._apply_mode_profile_to_visualizer_cfg(cfg)
592592
visualizer = cfg.create_visualizer()
593593
visualizer.initialize(self._scene_data_provider)
594-
self._apply_runtime_quality_profile_to_visualizer(visualizer, force=True)
594+
self._apply_runtime_mode_profile_to_visualizer(visualizer, force=True)
595595
self._visualizers.append(visualizer)
596596
except Exception as exc:
597597
if cli_explicit:
@@ -733,7 +733,7 @@ def update_visualizers(self, dt: float) -> None:
733733

734734
for viz in visualizers_to_remove:
735735
try:
736-
self._visualizer_quality_keys.pop(id(viz), None)
736+
self._visualizer_mode_keys.pop(id(viz), None)
737737
viz.close()
738738
self._visualizers.remove(viz)
739739
logger.info("Removed visualizer: %s", type(viz).__name__)
@@ -808,7 +808,7 @@ def clear_instance(cls) -> None:
808808

809809
# Close all visualizers
810810
for viz in cls._instance._visualizers:
811-
cls._instance._visualizer_quality_keys.pop(id(viz), None)
811+
cls._instance._visualizer_mode_keys.pop(id(viz), None)
812812
viz.close()
813813
cls._instance._visualizers.clear()
814814
if cls._instance._scene_data_provider is not None:

source/isaaclab/test/sim/test_simulation_render_config.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def test_render_cfg():
8787

8888
# @pytest.mark.isaacsim_ci
8989
def test_render_cfg_presets():
90-
"""Test that quality presets are applied and can be overridden via RenderingModeCfg."""
90+
"""Test that rendering mode presets are applied and can be overridden via RenderingModeCfg."""
9191

9292
# user-friendly field override
9393
dlss_mode = ("/rtx/post/dlss/execMode", 5)
@@ -101,13 +101,13 @@ def test_render_cfg_presets():
101101
preset_dict = get_kit_rendering_preset(rendering_mode)
102102

103103
profile_name = f"profile_{rendering_mode}"
104-
quality_cfg = RenderingModeCfg(
104+
mode_cfg = RenderingModeCfg(
105105
rendering_mode_preset=rendering_mode,
106106
kit_dlss_mode=dlss_mode[1],
107107
)
108108
cfg = SimulationCfg(
109-
rendering_quality_cfgs={profile_name: quality_cfg},
110-
visualizer_cfgs=KitVisualizerCfg(rendering_quality=profile_name),
109+
rendering_mode_cfgs={profile_name: mode_cfg},
110+
visualizer_cfgs=KitVisualizerCfg(rendering_mode=profile_name),
111111
)
112112

113113
sim = SimulationContext(cfg)
@@ -137,9 +137,9 @@ def test_render_cfg_presets():
137137

138138
@pytest.mark.skip(reason="Timeline not stopped")
139139
# @pytest.mark.isaacsim_ci
140-
def test_rendering_quality_cfg_field_overrides():
140+
def test_rendering_mode_cfg_field_overrides():
141141
"""Test that explicit RenderingModeCfg fields map to carb settings."""
142-
quality_cfg = RenderingModeCfg(
142+
mode_cfg = RenderingModeCfg(
143143
kit_enable_translucency=True,
144144
kit_enable_reflections=True,
145145
kit_enable_global_illumination=True,
@@ -153,8 +153,8 @@ def test_rendering_quality_cfg_field_overrides():
153153
kit_enable_ambient_occlusion=True,
154154
)
155155
cfg = SimulationCfg(
156-
rendering_quality_cfgs={"custom": quality_cfg},
157-
visualizer_cfgs=KitVisualizerCfg(rendering_quality="custom"),
156+
rendering_mode_cfgs={"custom": mode_cfg},
157+
visualizer_cfgs=KitVisualizerCfg(rendering_mode="custom"),
158158
)
159159
sim = SimulationContext(cfg)
160160
sim.reset()

source/isaaclab_physx/isaaclab_physx/renderers/rtx_renderer_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ class RTXRendererCfg(RendererCfg):
1818
"""
1919

2020
renderer_type: str = "rtx"
21-
rendering_quality: str | None = None
21+
rendering_mode: str | None = None

0 commit comments

Comments
 (0)