From 9a9b1a8db429dbdd4fe0cb888a760d4b7b12268b Mon Sep 17 00:00:00 2001 From: Erik Hofman Date: Wed, 22 Dec 2021 08:24:51 +0100 Subject: [PATCH] Revert 1269a8d27cbce802fb99632deaa1250fac7a4c6f, the friction factor on ice relies on too many parameters to calculate here. --- simgear/bvh/BVHMaterial.hxx | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/simgear/bvh/BVHMaterial.hxx b/simgear/bvh/BVHMaterial.hxx index 1e105b26..995970c5 100644 --- a/simgear/bvh/BVHMaterial.hxx +++ b/simgear/bvh/BVHMaterial.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2008 - 2012 Mathias Froehlich - Mathias.Froehlich@web.de +// Copyright (C) 2008 - 2021 Mathias Froehlich - Mathias.Froehlich@web.de // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -39,18 +39,14 @@ public: } /** - * Return the solid factor for when the lakes are frozen over or not. + * Return whether the solid factor is a propery. */ - double get_frozen_fact () const { - return _solid_is_prop ? (_solid_property->getBoolValue() ? 0.1 : 1.) : 1.; - } + bool solid_is_prop () const { return _solid_is_prop; } /** * Get the friction factor for that material */ - double get_friction_factor () const { - return _friction_factor * get_frozen_fact(); - } + double get_friction_factor () const { return _friction_factor; } /** * Get the rolling friction for that material @@ -60,16 +56,12 @@ public: /** * Get the bumpines for that material */ - double get_bumpiness () const { - return _bumpiness * get_frozen_fact(); - } + double get_bumpiness () const { return _bumpiness; } /** * Get the load resistance */ - double get_load_resistance () const { - return _load_resistance / get_frozen_fact(); - } + double get_load_resistance () const { return _load_resistance; } protected: // True if the material is solid, false if it is a fluid