FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed 69 occurance of 'Seperate' misspelling (should be 'Separate')

Browse Source
This commit is contained in:
Don BURNS
2002-08-29 03:22:27 +00:00
parent b546c63139
commit 2b10b4c3df
17 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/osg/DisplaySettings.cpp
View File

@@ -45,15 +45,15 @@ DisplaySettings::~DisplaySettings()
void DisplaySettings::copy(const DisplaySettings& vs)
{
_stereoMode = vs._stereoMode;
_eyeSeperation = vs._eyeSeperation;
_eyeSeparation = vs._eyeSeparation;
_screenDistance = vs._screenDistance;
_screenHeight = vs._screenHeight;
_splitStereoHorizontalEyeMapping = vs._splitStereoHorizontalEyeMapping;
_splitStereoHorizontalSeperation = vs._splitStereoHorizontalSeperation;
_splitStereoHorizontalSeparation = vs._splitStereoHorizontalSeparation;
_splitStereoVerticalEyeMapping = vs._splitStereoVerticalEyeMapping;
_splitStereoVerticalSeperation = vs._splitStereoVerticalSeperation;
_splitStereoVerticalSeparation = vs._splitStereoVerticalSeparation;
_doubleBuffer = vs._doubleBuffer;
_RGB = vs._RGB;
@@ -82,15 +82,15 @@ void DisplaySettings::setDefaults()
{
_stereo = false;
_stereoMode = ANAGLYPHIC;
_eyeSeperation = 0.05f;
_eyeSeparation = 0.05f;
_screenDistance = 0.5f;
_screenHeight = 0.26f;
_splitStereoHorizontalEyeMapping = LEFT_EYE_LEFT_VIEWPORT;
_splitStereoHorizontalSeperation = 42;
_splitStereoHorizontalSeparation = 42;
_splitStereoVerticalEyeMapping = LEFT_EYE_TOP_VIEWPORT;
_splitStereoVerticalSeperation = 42;
_splitStereoVerticalSeparation = 42;
_doubleBuffer = true;
_RGB = true;
@@ -144,9 +144,9 @@ void DisplaySettings::readEnvironmentalVariables()
}
}
if( (ptr = getenv("OSG_EYE_SEPERATION")) != 0)
if( (ptr = getenv("OSG_EYE_SEPARATION")) != 0)
{
_eyeSeperation = atof(ptr);
_eyeSeparation = atof(ptr);
}
if( (ptr = getenv("OSG_SCREEN_DISTANCE")) != 0)
@@ -172,9 +172,9 @@ void DisplaySettings::readEnvironmentalVariables()
}
}
if( (ptr = getenv("OSG_SPLIT_STEREO_HORIZONTAL_SEPERATION")) != 0)
if( (ptr = getenv("OSG_SPLIT_STEREO_HORIZONTAL_SEPARATION")) != 0)
{
_splitStereoHorizontalSeperation = atoi(ptr);
_splitStereoHorizontalSeparation = atoi(ptr);
}
@@ -191,9 +191,9 @@ void DisplaySettings::readEnvironmentalVariables()
}
}
if( (ptr = getenv("OSG_SPLIT_STEREO_VERTICAL_SEPERATION")) != 0)
if( (ptr = getenv("OSG_SPLIT_STEREO_VERTICAL_SEPARATION")) != 0)
{
_splitStereoVerticalSeperation = atoi(ptr);
_splitStereoVerticalSeparation = atoi(ptr);
}
if( (ptr = getenv("OSG_MAX_NUMBER_OF_GRAPHICS_CONTEXTS")) != 0)

12
src/osg/LightModel.cpp
View File

@@ -27,8 +27,8 @@ LightModel::~LightModel()
#define GL_SINGLE_COLOR 0x81F9
#endif
#ifndef GL_SEPERATE_SPECULAR_COLOR
#define GL_SEPERATE_SPECULAR_COLOR 0x81FA
#ifndef GL_SEPARATE_SPECULAR_COLOR
#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
#endif
@@ -36,12 +36,12 @@ void LightModel::apply(State&) const
{
glLightModelfv(GL_LIGHT_MODEL_AMBIENT,_ambient.ptr());
static bool s_seperateSpecularSupported = strcmp((const char *)glGetString(GL_VERSION),"1.2")>=0;
if (s_seperateSpecularSupported)
static bool s_separateSpecularSupported = strcmp((const char *)glGetString(GL_VERSION),"1.2")>=0;
if (s_separateSpecularSupported)
{
if (_colorControl==SEPERATE_SPECULAR_COLOR)
if (_colorControl==SEPARATE_SPECULAR_COLOR)
{
glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL,GL_SEPERATE_SPECULAR_COLOR);
glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL,GL_SEPARATE_SPECULAR_COLOR);
}
else
{

10
src/osg/Material.cpp
View File

@@ -72,7 +72,7 @@ const Vec4& Material::getAmbient(const Face face) const
if (!_ambientFrontAndBack)
{
notify(NOTICE)<<"Notice: Material::getAmbient(FRONT_AND_BACK) called on material "<< std::endl;
notify(NOTICE)<<" with seperate FRONT and BACK ambient colors."<< std::endl;
notify(NOTICE)<<" with separate FRONT and BACK ambient colors."<< std::endl;
}
return _ambientFront;
}
@@ -120,7 +120,7 @@ const Vec4& Material::getDiffuse(const Face face) const
if (!_diffuseFrontAndBack)
{
notify(NOTICE)<<"Notice: Material::getDiffuse(FRONT_AND_BACK) called on material "<< std::endl;
notify(NOTICE)<<" with seperate FRONT and BACK diffuse colors."<< std::endl;
notify(NOTICE)<<" with separate FRONT and BACK diffuse colors."<< std::endl;
}
return _diffuseFront;
}
@@ -168,7 +168,7 @@ const Vec4& Material::getSpecular(const Face face) const
if (!_specularFrontAndBack)
{
notify(NOTICE)<<"Notice: Material::getSpecular(FRONT_AND_BACK) called on material "<< std::endl;
notify(NOTICE)<<" with seperate FRONT and BACK specular colors."<< std::endl;
notify(NOTICE)<<" with separate FRONT and BACK specular colors."<< std::endl;
}
return _specularFront;
}
@@ -216,7 +216,7 @@ const Vec4& Material::getEmission(const Face face) const
if (!_emissionFrontAndBack)
{
notify(NOTICE)<<"Notice: Material::getEmission(FRONT_AND_BACK) called on material "<< std::endl;
notify(NOTICE)<<" with seperate FRONT and BACK emission colors."<< std::endl;
notify(NOTICE)<<" with separate FRONT and BACK emission colors."<< std::endl;
}
return _emissionFront;
}
@@ -263,7 +263,7 @@ const float Material::getShininess(const Face face) const
if (!_shininessFrontAndBack)
{
notify(NOTICE)<<"Notice: Material::getShininess(FRONT_AND_BACK) called on material "<< std::endl;
notify(NOTICE)<<" with seperate FRONT and BACK shininess colors."<< std::endl;
notify(NOTICE)<<" with separate FRONT and BACK shininess colors."<< std::endl;
}
return _shininessFront;
}