From: mfranz Date: Sun, 13 May 2007 11:53:06 +0000 (+0000) Subject: s/resistence/resistance/ X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=702fb014a5ba8f83ec8c5f342bd69586cdefdc9e;p=simgear.git s/resistence/resistance/ --- diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx index d9f5c82f..59577190 100644 --- a/simgear/scene/material/mat.cxx +++ b/simgear/scene/material/mat.cxx @@ -149,7 +149,7 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props friction_factor = props->getDoubleValue("friction-factor", 1.0); rolling_friction = props->getDoubleValue("rolling-friction", 0.02); bumpiness = props->getDoubleValue("bumpiness", 0.0); - load_resistence = props->getDoubleValue("load-resistence", 1e30); + load_resistance = props->getDoubleValue("load-resistance", 1e30); // Taken from default values as used in ac3d ambient[0] = props->getDoubleValue("ambient/r", 0.2); @@ -212,7 +212,7 @@ SGMaterial::init () friction_factor = 1; rolling_friction = 0.02; bumpiness = 0; - load_resistence = 1e30; + load_resistance = 1e30; shininess = 1.0; for (int i = 0; i < 4; i++) { diff --git a/simgear/scene/material/mat.hxx b/simgear/scene/material/mat.hxx index 3ede53fd..ea96abab 100644 --- a/simgear/scene/material/mat.hxx +++ b/simgear/scene/material/mat.hxx @@ -177,9 +177,9 @@ public: double get_bumpiness () const { return bumpiness; } /** - * Get the load resistence + * Get the load resistance */ - double get_load_resistence () const { return load_resistence; } + double get_load_resistance () const { return load_resistance; } /** * Get the list of names for this material @@ -270,8 +270,8 @@ private: // the bumpiness of that surface material double bumpiness; - // the load resistence of that surface material - double load_resistence; + // the load resistance of that surface material + double load_resistance; // material properties SGVec4f ambient, diffuse, specular, emission;