Commit dda71fca authored by Kelly Guo's avatar Kelly Guo Committed by Kelly Guo

Fixes rebase errors in SimulationContext carb settings (#312)

# Description

Fixes some bugs introduced during rebase that did not pass correct
parameters to the carb setting APIs.

## Type of change

<!-- As you go through the list, delete the ones that are not
applicable. -->

- Bug fix (non-breaking change which fixes an issue)


## Screenshots

Please attach before and after screenshots of the change if applicable.

<!--
Example:

| Before | After |
| ------ | ----- |
| _gif/png before_ | _gif/png after_ |

To upload images to a PR -- simply drag and drop an image while in edit
mode and it should upload the image directly. You can then paste that
source into the above before/after sections.
-->

## Checklist

- [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with
`./isaaclab.sh --format`
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] I have updated the changelog and the corresponding version in the
extension's `config/extension.toml` file
- [ ] I have added my name to the `CONTRIBUTORS.md` or my name already
exists there

<!--
As you go through the checklist above, you can mark something as done by
putting an x character in it

For example,
- [x] I have done this task
- [ ] I have not done this task
-->
parent 580d47df
...@@ -259,14 +259,14 @@ class SimulationContext(_SimulationContext): ...@@ -259,14 +259,14 @@ class SimulationContext(_SimulationContext):
) )
# FIXME: From investigation, it seems this flag only affects CPU physics. For GPU physics, contacts # FIXME: From investigation, it seems this flag only affects CPU physics. For GPU physics, contacts
# are always processed. The issue is reported to the PhysX team by @mmittal. # are always processed. The issue is reported to the PhysX team by @mmittal.
set_carb_setting("/physics/disableContactProcessing", True) set_carb_setting(self.carb_settings, "/physics/disableContactProcessing", True)
# disable custom geometry for cylinder and cone collision shapes to allow contact reporting for them # disable custom geometry for cylinder and cone collision shapes to allow contact reporting for them
# reason: cylinders and cones aren't natively supported by PhysX so we need to use custom geometry flags # reason: cylinders and cones aren't natively supported by PhysX so we need to use custom geometry flags
# reference: https://nvidia-omniverse.github.io/PhysX/physx/5.4.1/docs/Geometry.html?highlight=capsule#geometry # reference: https://nvidia-omniverse.github.io/PhysX/physx/5.4.1/docs/Geometry.html?highlight=capsule#geometry
set_carb_setting("/physics/collisionConeCustomGeometry", False) set_carb_setting(self.carb_settings, "/physics/collisionConeCustomGeometry", False)
set_carb_setting("/physics/collisionCylinderCustomGeometry", False) set_carb_setting(self.carb_settings, "/physics/collisionCylinderCustomGeometry", False)
# hide the Simulation Settings window # hide the Simulation Settings window
set_carb_setting("/physics/autoPopupSimulationOutputWindow", False) set_carb_setting(self.carb_settings, "/physics/autoPopupSimulationOutputWindow", False)
def _apply_render_settings_from_cfg(self): def _apply_render_settings_from_cfg(self):
"""Sets rtx settings specified in the RenderCfg.""" """Sets rtx settings specified in the RenderCfg."""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment