Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: RobotLocomotion/drake
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 276ca362bbd67808fddf7b805ce6bd40ba836705
Choose a base ref
..
head repository: RobotLocomotion/drake
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 98cb81bf4718e5803b879c3e97f9129828db02a0
Choose a head ref
Showing with 15 additions and 12 deletions.
  1. +12 −12 geometry/proximity_properties.h
  2. +3 −0 tools/macos.bazelrc
24 changes: 12 additions & 12 deletions geometry/proximity_properties.h
Original file line number Diff line number Diff line change
@@ -135,18 +135,18 @@ void AddRigidHydroelasticProperties(ProximityProperties* properties);
The geometry's pressure field will be the function p(e) = Ee, where E is the
hydroelastic modulus stored in the given `properties`.
@param resolution_hint If the geometry is to be tessellated, it is the
parameter that guides the level of mesh
refinement. It has length units (in meters) and
roughly corresponds to a typical edge length in
the resulting mesh. See @ref hug_properties.
This will be ignored for geometry types that don't
require tessellation.
@param hydroelastic_modulus A multiplier that maps penetration to pressure. See
@ref hug_properties.
@param[in,out] properties The properties will be added to this property set.
@throws std::exception If `properties` already has properties with the
names that this function would need to add.
@param resolution_hint If the geometry is to be tessellated, it is the
parameter that guides the level of mesh
refinement. It has length units (in meters) and
roughly corresponds to a typical edge length in
the resulting mesh. See @ref hug_properties.
This will be ignored for geometry types that don't
require tessellation.
@param hydroelastic_modulus A multiplier that maps penetration to pressure. See
@ref hug_properties.
@param[in,out] properties The properties will be added to this property set.
@throws std::exception If `properties` already has properties with the
names that this function would need to add.
@pre 0 < `resolution_hint` < ∞, 0 < `hydroelastic_modulus`, and `properties`
is not nullptr. */
void AddCompliantHydroelasticProperties(double resolution_hint,
3 changes: 3 additions & 0 deletions tools/macos.bazelrc
Original file line number Diff line number Diff line change
@@ -8,3 +8,6 @@ build:tsan --copt=-Wno-macro-redefined
build:tsan_everything --copt=-Wno-macro-redefined
build:ubsan --copt=-Wno-macro-redefined
build:ubsan_everything --copt=-Wno-macro-redefined

# https://github.com/bazelbuild/bazel/issues/14294
build --notrim_test_configuration