From 2b10b4c3dff6dbee74589fee01782b82b1d0f96b Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Thu, 29 Aug 2002 03:22:27 +0000 Subject: [PATCH] Fixed 69 occurance of 'Seperate' misspelling (should be 'Separate') --- include/osg/DisplaySettings | 18 ++++++++-------- include/osg/Drawable | 6 +++--- include/osg/LightModel | 2 +- src/Demos/osgcluster/osgcluster.cpp | 2 +- src/Demos/osggeometry/osggeometry.cpp | 4 ++-- src/osg/DisplaySettings.cpp | 24 ++++++++++----------- src/osg/LightModel.cpp | 12 +++++------ src/osg/Material.cpp | 10 ++++----- src/osgDB/DotOsgWrapper.cpp | 2 +- src/osgGLUT/Viewer.cpp | 4 ++-- src/osgPlugins/obj/ReaderWriterOBJ.cpp | 2 +- src/osgPlugins/osg/LightModel.cpp | 8 +++---- src/osgPlugins/pfb/ConvertFromPerformer.cpp | 2 +- src/osgPlugins/txp/trpage_header.cpp | 2 +- src/osgPlugins/txp/trpage_rarchive.cpp | 10 ++++----- src/osgPlugins/txp/trpage_warchive.cpp | 12 +++++------ src/osgUtil/SceneView.cpp | 18 ++++++++-------- 17 files changed, 69 insertions(+), 69 deletions(-) diff --git a/include/osg/DisplaySettings b/include/osg/DisplaySettings index 6804ea1f7..f33fc2397 100644 --- a/include/osg/DisplaySettings +++ b/include/osg/DisplaySettings @@ -70,8 +70,8 @@ class SG_EXPORT DisplaySettings : public osg::Referenced void setStereoMode(const StereoMode mode) { _stereoMode = mode; } const StereoMode getStereoMode() const { return _stereoMode; } - void setEyeSeperation(const float eyeSeperation) { _eyeSeperation = eyeSeperation; } - const float getEyeSeperation() const { return _eyeSeperation; } + void setEyeSeparation(const float eyeSeparation) { _eyeSeparation = eyeSeparation; } + const float getEyeSeparation() const { return _eyeSeparation; } void setScreenDistance(const float distance) { _screenDistance = distance; } const float getScreenDistance() const { return _screenDistance; } @@ -85,8 +85,8 @@ class SG_EXPORT DisplaySettings : public osg::Referenced void setSplitStereoHorizontalEyeMapping(SplitStereoHorizontalEyeMapping m) { _splitStereoHorizontalEyeMapping = m; } SplitStereoHorizontalEyeMapping getSplitStereoHorizontalEyeMapping() const { return _splitStereoHorizontalEyeMapping; } - void setSplitStereoHorizontalSeperation(const int s) { _splitStereoHorizontalSeperation = s; } - const int getSplitStereoHorizontalSeperation() const { return _splitStereoHorizontalSeperation; } + void setSplitStereoHorizontalSeparation(const int s) { _splitStereoHorizontalSeparation = s; } + const int getSplitStereoHorizontalSeparation() const { return _splitStereoHorizontalSeparation; } enum SplitStereoVerticalEyeMapping { @@ -97,8 +97,8 @@ class SG_EXPORT DisplaySettings : public osg::Referenced void setSplitStereoVerticalEyeMapping(SplitStereoVerticalEyeMapping m) { _splitStereoVerticalEyeMapping = m; } SplitStereoVerticalEyeMapping getSplitStereoVerticalEyeMapping() const { return _splitStereoVerticalEyeMapping; } - void setSplitStereoVerticalSeperation(const int s) { _splitStereoVerticalSeperation = s; } - const int getSplitStereoVerticalSeperation() const { return _splitStereoVerticalSeperation; } + void setSplitStereoVerticalSeparation(const int s) { _splitStereoVerticalSeparation = s; } + const int getSplitStereoVerticalSeparation() const { return _splitStereoVerticalSeparation; } void setScreenHeight(const float height) { _screenHeight = height; } @@ -137,14 +137,14 @@ class SG_EXPORT DisplaySettings : public osg::Referenced bool _stereo; StereoMode _stereoMode; - float _eyeSeperation; + float _eyeSeparation; float _screenDistance; float _screenHeight; SplitStereoHorizontalEyeMapping _splitStereoHorizontalEyeMapping; - int _splitStereoHorizontalSeperation; + int _splitStereoHorizontalSeparation; SplitStereoVerticalEyeMapping _splitStereoVerticalEyeMapping; - int _splitStereoVerticalSeperation; + int _splitStereoVerticalSeparation; bool _doubleBuffer; bool _RGB; diff --git a/include/osg/Drawable b/include/osg/Drawable index 127edab5f..f5354344a 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -25,10 +25,10 @@ class Node; // this is define to alter the way display lists are compiled inside the // the draw method, it has been found that the NVidia drivers fail completely // to optimize COMPILE_AND_EXECUTE in fact make it go slower than for no display -// lists, but optimize a seperate COMPILE very well?! Define it as default +// lists, but optimize a separate COMPILE very well?! Define it as default // the use of a sperate COMPILE, then glCallList rather than use COMPILE_AND_EXECUTE. -#define USE_SEPERATE_COMPILE_AND_EXECUTE +#define USE_SEPARATE_COMPILE_AND_EXECUTE /** Pure virtual base class for drawable Geometry. Contains no drawing primitives directly, these are provided by subclasses such as osg::Geometry. State attributes @@ -346,7 +346,7 @@ inline void Drawable::draw(State& state) } else if (_useDisplayList) { -#ifdef USE_SEPERATE_COMPILE_AND_EXECUTE +#ifdef USE_SEPARATE_COMPILE_AND_EXECUTE globj = glGenLists( 1 ); glNewList( globj, GL_COMPILE ); if (_drawCallback.valid()) diff --git a/include/osg/LightModel b/include/osg/LightModel index f63434918..10ddd5e0f 100644 --- a/include/osg/LightModel +++ b/include/osg/LightModel @@ -50,7 +50,7 @@ class SG_EXPORT LightModel : public StateAttribute enum ColorControl { - SEPERATE_SPECULAR_COLOR, + SEPARATE_SPECULAR_COLOR, SINGLE_COLOR }; diff --git a/src/Demos/osgcluster/osgcluster.cpp b/src/Demos/osgcluster/osgcluster.cpp index 6179f6f04..d4fbe4151 100644 --- a/src/Demos/osgcluster/osgcluster.cpp +++ b/src/Demos/osgcluster/osgcluster.cpp @@ -72,7 +72,7 @@ class CameraPacket { void getSceneViewUpdate(osgUtil::SceneView& sv) { - // note pass a seperate reference counted FrameStamp + // note pass a separate reference counted FrameStamp // rather than this frame stamp as it can get overwritten. sv.setFrameStamp(new osg::FrameStamp(_frameStamp)); } diff --git a/src/Demos/osggeometry/osggeometry.cpp b/src/Demos/osggeometry/osggeometry.cpp index bb086cd23..01e2b79c4 100644 --- a/src/Demos/osggeometry/osggeometry.cpp +++ b/src/Demos/osggeometry/osggeometry.cpp @@ -63,7 +63,7 @@ osg::Node* createScene() // create the Geode (Geometry Node) to contain all our osg::Geometry objects. osg::Geode* geode = new osg::Geode(); - // follows are seperate blocks for creating POINTS, LINES, LINE_STRIP, LINE_LOOP, POLYGON, QUADS, + // follows are separate blocks for creating POINTS, LINES, LINE_STRIP, LINE_LOOP, POLYGON, QUADS, // QUAD_STRIP, TRIANGLES, TRIANGLE_STRIP and TRIANGLE_FAN primtives. A image of these primtives // are provided in the distribution : OpenSceneGraph-Data/Images/primtives.gif. @@ -259,7 +259,7 @@ osg::Node* createScene() - // now we'll stop creating seperate normal and color arrays + // now we'll stop creating separate normal and color arrays // since we are using the same values all the time, we'll just // share the same ColorArray and NormalArrays.. diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp index d99d73a29..efc7d9912 100644 --- a/src/osg/DisplaySettings.cpp +++ b/src/osg/DisplaySettings.cpp @@ -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) diff --git a/src/osg/LightModel.cpp b/src/osg/LightModel.cpp index 051187dfe..01e298dc3 100644 --- a/src/osg/LightModel.cpp +++ b/src/osg/LightModel.cpp @@ -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 { diff --git a/src/osg/Material.cpp b/src/osg/Material.cpp index 46d525e61..4aa6af2be 100644 --- a/src/osg/Material.cpp +++ b/src/osg/Material.cpp @@ -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; } diff --git a/src/osgDB/DotOsgWrapper.cpp b/src/osgDB/DotOsgWrapper.cpp index 24478cbac..4be6ecb41 100644 --- a/src/osgDB/DotOsgWrapper.cpp +++ b/src/osgDB/DotOsgWrapper.cpp @@ -16,7 +16,7 @@ DotOsgWrapper::DotOsgWrapper(osg::Object* proto, // copy the names in the space deliminated associates input into - // a vector of seperated names. + // a vector of separated names. std::string::size_type start_of_name = associates.find_first_not_of(' '); while (start_of_name!=std::string::npos) { diff --git a/src/osgGLUT/Viewer.cpp b/src/osgGLUT/Viewer.cpp index 3a91d5d41..cb9efb50e 100644 --- a/src/osgGLUT/Viewer.cpp +++ b/src/osgGLUT/Viewer.cpp @@ -864,14 +864,14 @@ void Viewer::keyboard(unsigned char key, int x, int y) case '>' : { osg::DisplaySettings* ds = const_cast(sceneView->getDisplaySettings()); - if (ds) ds->setEyeSeperation(ds->getEyeSeperation()*1.5f); + if (ds) ds->setEyeSeparation(ds->getEyeSeparation()*1.5f); } break; case '<' : { osg::DisplaySettings* ds = const_cast(sceneView->getDisplaySettings()); - if (ds) ds->setEyeSeperation(ds->getEyeSeperation()/1.5f); + if (ds) ds->setEyeSeparation(ds->getEyeSeparation()/1.5f); } break; diff --git a/src/osgPlugins/obj/ReaderWriterOBJ.cpp b/src/osgPlugins/obj/ReaderWriterOBJ.cpp index 7bf37955b..24e827ace 100644 --- a/src/osgPlugins/obj/ReaderWriterOBJ.cpp +++ b/src/osgPlugins/obj/ReaderWriterOBJ.cpp @@ -210,7 +210,7 @@ osg::Drawable* ReaderWriterOBJ::makeDrawable(GLMmodel* obj, geom->addPrimitive(new osg::DrawArrays(osg::Primitive::TRIANGLES,0,ntris*3)); // the following code for mapping the coords, normals and texcoords - // is complicated greatly by the need to create seperate out the + // is complicated greatly by the need to create separate out the // sets of coords etc for each drawable. bool needNormals = obj->normals && obj->normals>0; diff --git a/src/osgPlugins/osg/LightModel.cpp b/src/osgPlugins/osg/LightModel.cpp index eac28a329..788a969b2 100644 --- a/src/osgPlugins/osg/LightModel.cpp +++ b/src/osgPlugins/osg/LightModel.cpp @@ -43,9 +43,9 @@ bool LightModel_readLocalData(Object& obj, Input& fr) if (fr[0].matchWord("colorControl")) { - if (fr[1].matchWord("SEPERATE_SPECULAR_COLOR")) + if (fr[1].matchWord("SEPARATE_SPECULAR_COLOR")) { - lightmodel.setColorControl(osg::LightModel::SEPERATE_SPECULAR_COLOR); + lightmodel.setColorControl(osg::LightModel::SEPARATE_SPECULAR_COLOR); } else if (fr[1].matchWord("SINGLE_COLOR")) { @@ -95,8 +95,8 @@ bool LightModel_writeLocalData(const Object& obj,Output& fw) fw.indent() << "ambientIntensity " << lightmodel.getAmbientIntensity() << std::endl; - if (lightmodel.getColorControl()==osg::LightModel::SEPERATE_SPECULAR_COLOR) - fw.indent() << "colorControl SEPERATE_SPECULAR_COLOR" << std::endl; + if (lightmodel.getColorControl()==osg::LightModel::SEPARATE_SPECULAR_COLOR) + fw.indent() << "colorControl SEPARATE_SPECULAR_COLOR" << std::endl; else fw.indent() << "colorControl SINGLE_COLOR" << std::endl; diff --git a/src/osgPlugins/pfb/ConvertFromPerformer.cpp b/src/osgPlugins/pfb/ConvertFromPerformer.cpp index c75b04f10..25c732af5 100644 --- a/src/osgPlugins/pfb/ConvertFromPerformer.cpp +++ b/src/osgPlugins/pfb/ConvertFromPerformer.cpp @@ -1067,7 +1067,7 @@ osg::Material* ConvertFromPerformer::visitMaterial(osg::StateSet* osgStateSet,pf material->getColor(PFMTL_SPECULAR,&r,&g,&b); osgMaterial->setSpecular(osg::Material::FRONT_AND_BACK,osg::Vec4(r,g,b,a)); } - else // seperate materials for front and back. + else // separate materials for front and back. { int colorMode = front_mat->getColorMode(front_mat->getSide()); diff --git a/src/osgPlugins/txp/trpage_header.cpp b/src/osgPlugins/txp/trpage_header.cpp index d615d1d1c..9382f591b 100644 --- a/src/osgPlugins/txp/trpage_header.cpp +++ b/src/osgPlugins/txp/trpage_header.cpp @@ -289,7 +289,7 @@ bool trpgHeader::Read(trpgReadBuffer &buf) return isValid(); } -// Read the LOD info (seperate token) +// Read the LOD info (separate token) bool trpgHeader::ReadLodInfo(trpgReadBuffer &buf) { float64 range; diff --git a/src/osgPlugins/txp/trpage_rarchive.cpp b/src/osgPlugins/txp/trpage_rarchive.cpp index 02f5dbe2f..e4c70da5f 100644 --- a/src/osgPlugins/txp/trpage_rarchive.cpp +++ b/src/osgPlugins/txp/trpage_rarchive.cpp @@ -55,7 +55,7 @@ void trpgr_Archive::SetDirectory(const char *in_dir) bool trpgr_Archive::OpenFile(const char *name) { char file[1024]; - sprintf(file,"%s" PATHSEPERATOR "%s",dir,name); + sprintf(file,"%s" PATHSEPARATOR "%s",dir,name); CloseFile(); @@ -161,7 +161,7 @@ bool trpgr_Archive::ReadHeader() if (tileMode == trpgTileTable::Local) { if (tileCache) delete tileCache; char fullBase[1024]; - sprintf(fullBase,"%s" PATHSEPERATOR "tileFile",dir); + sprintf(fullBase,"%s" PATHSEPARATOR "tileFile",dir); tileCache = new trpgrAppFileCache(fullBase,"tpf"); } @@ -191,7 +191,7 @@ bool trpgr_Archive::ReadTile(uint32 x,uint32 y,uint32 lod,trpgMemReadBuffer &buf // Figure out the file name // Note: This assumes External tiles char filename[1024]; - sprintf(filename,"%s" PATHSEPERATOR "tile_%d_%d_%d.tpt",dir,x,y,lod); + sprintf(filename,"%s" PATHSEPARATOR "tile_%d_%d_%d.tpt",dir,x,y,lod); // Open the file and read the contents FILE *fp=NULL; @@ -313,7 +313,7 @@ trpgrImageHelper::trpgrImageHelper(trpgEndian inNess,char *inDir, // Set up the texture cache // It doesn't do anything until it's called anyway char fullBase[1024]; - sprintf(fullBase,"%s" PATHSEPERATOR "texFile",dir); + sprintf(fullBase,"%s" PATHSEPARATOR "texFile",dir); texCache = new trpgrAppFileCache(fullBase,"txf"); } @@ -481,7 +481,7 @@ bool trpgrImageHelper::GetImagePath(const trpgTexture *tex,char *fullPath,int pa if (strlen(dir) + nameLen + 2 > static_cast(pathLen)) return false; - sprintf(fullPath,"%s" PATHSEPERATOR "%s",dir,name); + sprintf(fullPath,"%s" PATHSEPARATOR "%s",dir,name); return true; } diff --git a/src/osgPlugins/txp/trpage_warchive.cpp b/src/osgPlugins/txp/trpage_warchive.cpp index e13801bb6..f24563587 100644 --- a/src/osgPlugins/txp/trpage_warchive.cpp +++ b/src/osgPlugins/txp/trpage_warchive.cpp @@ -193,7 +193,7 @@ bool trpgwArchive::OpenFile(const char *in_dir,const char *name) strncpy(dir,in_dir,1023); - sprintf(filename,"%s" PATHSEPERATOR "%s",dir,name); + sprintf(filename,"%s" PATHSEPARATOR "%s",dir,name); if (!(fp = fopen(filename,"wb"))) return false; @@ -353,7 +353,7 @@ bool trpgwArchive::IncrementTileFile() // Open the next one char filename[1024]; - sprintf(filename,"%s" PATHSEPERATOR "tileFile_%d.tpf",dir,tileFileCount++); + sprintf(filename,"%s" PATHSEPARATOR "tileFile_%d.tpf",dir,tileFileCount++); tileFile = new trpgwAppFile(ness,filename); if (!tileFile->isValid()) return false; @@ -379,7 +379,7 @@ bool trpgwArchive::DesignateTileFile(int id) // Open a named on char filename[1024]; - sprintf(filename,"%s" PATHSEPERATOR "tileFile_%d.tpf",dir,id); + sprintf(filename,"%s" PATHSEPARATOR "tileFile_%d.tpf",dir,id); tileFile = new trpgwAppFile(ness,filename); if (!tileFile->isValid()) return false; @@ -409,7 +409,7 @@ bool trpgwArchive::WriteTile(unsigned int x,unsigned int y,unsigned int lod, flo // Make a new filename char filename[1024]; // Note: Windows specific - sprintf(filename,"%s" PATHSEPERATOR "tile_%d_%d_%d.tpt",dir,x,y,lod); + sprintf(filename,"%s" PATHSEPARATOR "tile_%d_%d_%d.tpt",dir,x,y,lod); if (!(tfp = fopen(filename,"wb"))) return false; @@ -974,7 +974,7 @@ bool trpgwImageHelper::IncrementTextureFile() // Open the next one char filename[1024]; - sprintf(filename,"%s" PATHSEPERATOR "texFile_%d.txf",dir,texFileIDs.size()); + sprintf(filename,"%s" PATHSEPARATOR "texFile_%d.txf",dir,texFileIDs.size()); texFile = new trpgwAppFile(ness,filename); if (!texFile->isValid()) return false; @@ -996,7 +996,7 @@ bool trpgwImageHelper::DesignateTextureFile(int id) // Open one with the given base name char filename[1024]; - sprintf(filename,"%s" PATHSEPERATOR "texFile_%d.txf",dir,id); + sprintf(filename,"%s" PATHSEPARATOR "texFile_%d.txf",dir,id); texFile = new trpgwAppFile(ness,filename); if (!texFile->isValid()) return false; diff --git a/src/osgUtil/SceneView.cpp b/src/osgUtil/SceneView.cpp index cbae059ac..9333659cd 100644 --- a/src/osgUtil/SceneView.cpp +++ b/src/osgUtil/SceneView.cpp @@ -223,7 +223,7 @@ void SceneView::cull() fusionDistance = _camera->getFusionDistance(); } - float iod = _displaySettings->getEyeSeperation(); + float iod = _displaySettings->getEyeSeparation(); float sd = _displaySettings->getScreenDistance(); float es = 0.5f*iod*(fusionDistance/sd); @@ -499,10 +499,10 @@ void SceneView::draw() break; case(osg::DisplaySettings::HORIZONTAL_SPLIT): { - int seperation = _displaySettings->getSplitStereoHorizontalSeperation(); + int separation = _displaySettings->getSplitStereoHorizontalSeparation(); - int left_half_width = (_viewport->width()-seperation)/2; - int right_half_begin = (_viewport->width()+seperation)/2; + int left_half_width = (_viewport->width()-separation)/2; + int right_half_begin = (_viewport->width()+separation)/2; int right_half_width = _viewport->width()-right_half_begin; osg::ref_ptr viewportLeft = osgNew osg::Viewport; @@ -512,7 +512,7 @@ void SceneView::draw() viewportRight->setViewport(_viewport->x()+right_half_begin,_viewport->y(),right_half_width,_viewport->height()); - clearArea(_viewport->x()+left_half_width,_viewport->y(),seperation,_viewport->height(),_renderStageLeft->getClearColor()); + clearArea(_viewport->x()+left_half_width,_viewport->y(),separation,_viewport->height(),_renderStageLeft->getClearColor()); if (_displaySettings->getSplitStereoHorizontalEyeMapping()==osg::DisplaySettings::LEFT_EYE_LEFT_VIEWPORT) { @@ -540,10 +540,10 @@ void SceneView::draw() case(osg::DisplaySettings::VERTICAL_SPLIT): { - int seperation = _displaySettings->getSplitStereoVerticalSeperation(); + int separation = _displaySettings->getSplitStereoVerticalSeparation(); - int bottom_half_height = (_viewport->height()-seperation)/2; - int top_half_begin = (_viewport->height()+seperation)/2; + int bottom_half_height = (_viewport->height()-separation)/2; + int top_half_begin = (_viewport->height()+separation)/2; int top_half_height = _viewport->height()-top_half_begin; osg::ref_ptr viewportTop = osgNew osg::Viewport; @@ -552,7 +552,7 @@ void SceneView::draw() osg::ref_ptr viewportBottom = osgNew osg::Viewport; viewportBottom->setViewport(_viewport->x(),_viewport->y(),_viewport->width(),bottom_half_height); - clearArea(_viewport->x(),_viewport->y()+bottom_half_height,_viewport->width(),seperation,_renderStageLeft->getClearColor()); + clearArea(_viewport->x(),_viewport->y()+bottom_half_height,_viewport->width(),separation,_renderStageLeft->getClearColor()); if (_displaySettings->getSplitStereoVerticalEyeMapping()==osg::DisplaySettings::LEFT_EYE_TOP_VIEWPORT) {