FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/resistence/resistance/

Browse Source
This commit is contained in:
mfranz
2007-05-13 11:53:06 +00:00
parent 834eab9457
commit 702fb014a5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/mat.cxx
+2 -2
View File
@@ -149,7 +149,7 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
friction_factor = props->getDoubleValue("friction-factor", 1.0); friction_factor = props->getDoubleValue("friction-factor", 1.0);
rolling_friction = props->getDoubleValue("rolling-friction", 0.02); rolling_friction = props->getDoubleValue("rolling-friction", 0.02);
bumpiness = props->getDoubleValue("bumpiness", 0.0); 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 // Taken from default values as used in ac3d
ambient[0] = props->getDoubleValue("ambient/r", 0.2); ambient[0] = props->getDoubleValue("ambient/r", 0.2);
@@ -212,7 +212,7 @@ SGMaterial::init ()
friction_factor = 1; friction_factor = 1;
rolling_friction = 0.02; rolling_friction = 0.02;
bumpiness = 0; bumpiness = 0;
load_resistence = 1e30; load_resistance = 1e30;
shininess = 1.0; shininess = 1.0;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
simgear/scene/material/mat.hxx
+4 -4
View File
@@ -177,9 +177,9 @@ public:
double get_bumpiness () const { return bumpiness; } 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 * Get the list of names for this material
@@ -270,8 +270,8 @@ private:
// the bumpiness of that surface material // the bumpiness of that surface material
double bumpiness; double bumpiness;
// the load resistence of that surface material // the load resistance of that surface material
double load_resistence; double load_resistance;
// material properties // material properties
SGVec4f ambient, diffuse, specular, emission; SGVec4f ambient, diffuse, specular, emission;