43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
diff -up ./src/MaterialType.hh.gcc12 ./src/MaterialType.hh
|
|
--- ./src/MaterialType.hh.gcc12 2022-01-24 21:27:24.132627129 -0500
|
|
+++ ./src/MaterialType.hh 2022-01-24 21:28:18.264899715 -0500
|
|
@@ -37,20 +37,22 @@ struct MaterialData
|
|
// The mapping of material type to name and density values.
|
|
// If you modify this map, make sure to also modify the MaterialType enum in
|
|
// include/ignition/math/MaterialTypes.hh
|
|
-static std::map<MaterialType, MaterialData> kMaterialData =
|
|
-{{
|
|
- {MaterialType::STYROFOAM, {"styrofoam", 75.0}},
|
|
- {MaterialType::PINE, {"pine", 373.0}},
|
|
- {MaterialType::WOOD, {"wood", 700.0}},
|
|
- {MaterialType::OAK, {"oak", 710.0}},
|
|
- {MaterialType::PLASTIC, {"plastic", 1175.0}},
|
|
- {MaterialType::CONCRETE, {"concrete", 2000.0}},
|
|
- {MaterialType::ALUMINUM, {"aluminum", 2700.0}},
|
|
- {MaterialType::STEEL_ALLOY, {"steel_alloy", 7600.0}},
|
|
- {MaterialType::STEEL_STAINLESS, {"steel_stainless", 7800.0}},
|
|
- {MaterialType::IRON, {"iron", 7870.0}},
|
|
- {MaterialType::BRASS, {"brass", 8600.0}},
|
|
- {MaterialType::COPPER, {"copper", 8940.0}},
|
|
- {MaterialType::TUNGSTEN, {"tungsten", 19300.0}}
|
|
-}};
|
|
+static std::map<MaterialType, MaterialData> kMaterialData = []()
|
|
+{
|
|
+ std::map<MaterialType, MaterialData> ret;
|
|
+ ret[MaterialType::STYROFOAM] = {"styrofoam", 75.0};
|
|
+ ret[MaterialType::PINE] = {"pine", 373.0};
|
|
+ ret[MaterialType::WOOD] = {"wood", 700.0};
|
|
+ ret[MaterialType::OAK] = {"oak", 710.0};
|
|
+ ret[MaterialType::PLASTIC] = {"plastic", 1175.0};
|
|
+ ret[MaterialType::CONCRETE] = {"concrete", 2000.0};
|
|
+ ret[MaterialType::ALUMINUM] = {"aluminum", 2700.0};
|
|
+ ret[MaterialType::STEEL_ALLOY] = {"steel_alloy", 7600.0};
|
|
+ ret[MaterialType::STEEL_STAINLESS] = {"steel_stainless", 7800.0};
|
|
+ ret[MaterialType::IRON] = {"iron", 7870.0};
|
|
+ ret[MaterialType::BRASS] = {"brass", 8600.0};
|
|
+ ret[MaterialType::COPPER] = {"copper", 8940.0};
|
|
+ ret[MaterialType::TUNGSTEN] = {"tungsten", 19300.0};
|
|
+ return ret;
|
|
+}();
|
|
#endif
|