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

Code comments, log strings and some variable spell fixes.

Browse Source
This commit is contained in:
Alberto Luaces
2020-10-28 17:05:06 +01:00
committed by Robert Osfield
parent 300ba7aa02
commit 2ade061ced
88 changed files with 143 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgPlugins/3ds/WriterCompareTriangle.cpp
View File

@@ -49,14 +49,14 @@ void WriterCompareTriangle::cutscene(int nbVertices, const osg::BoundingBox & sc
int nbVerticesY = static_cast<int>( (nbVertices * k) / (length.z() * length.x()) );
int nbVerticesZ = static_cast<int>( (nbVertices * k) / (length.x() * length.y()) );
setMaxMin (nbVerticesX, nbVerticesY, nbVerticesZ); // This function prevent from cutting the scene in too many blocs
setMaxMin (nbVerticesX, nbVerticesY, nbVerticesZ); // This function prevent from cutting the scene in too many blocks
OSG_INFO
<< "Cutting x by " << nbVerticesX << std::endl
<< "Cutting y by " << nbVerticesY << std::endl
<< "Cutting z by " << nbVerticesZ << std::endl;
osg::BoundingBox::value_type blocX = length.x() / nbVerticesX; // These 3 lines set the size of a bloc in x, y and z
osg::BoundingBox::value_type blocX = length.x() / nbVerticesX; // These 3 lines set the size of a block in x, y and z
osg::BoundingBox::value_type blocY = length.y() / nbVerticesY;
osg::BoundingBox::value_type blocZ = length.z() / nbVerticesZ;
@@ -95,7 +95,7 @@ void WriterCompareTriangle::cutscene(int nbVertices, const osg::BoundingBox & sc
if (z == nbVerticesZ - 1) //to prevent from mesh with no case
zMax += 10;
boxList.push_back(osg::BoundingBox(xMin, // Add a bloc to the list
boxList.push_back(osg::BoundingBox(xMin, // Add a block to the list
yMin,
zMin,
xMax,
@@ -129,7 +129,7 @@ WriterCompareTriangle::inWhichBox(const osg::BoundingBox::value_type x,
return i;
}
}
assert(false && "Point is not in any blocs");
assert(false && "Point is not in any blocks");
return 0;
}

4
src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp
View File

@@ -124,7 +124,7 @@ osgDB::ReaderWriter::WriteResult ReaderWritterOpenCASCADE::writeNode(const osg::
/// \detail http://www.opencascade.org/org/forum/thread_12716/?forum=3
/// Usually IGES files suffer from precision problems (when transferring from
/// one CAD system to another).It might be the case that faces are not sewed
/// properly, or do not have the right precision, and so the tesselator does
/// properly, or do not have the right precision, and so the tessellator does
/// not treat them like "sewed". this needs to be done for sewing
/// \param shape opencascade shape to be healed
void ReaderWritterOpenCASCADE::OCCTKReader::_healShape(TopoDS_Shape& shape)
@@ -386,7 +386,7 @@ void ReaderWritterOpenCASCADE::OCCTKReader::_traverse(const TDF_Label &shapeTree
}
/// if referred shape has children traverse them first else
/// travese the shape itself
/// traverse the shape itself
if(referredShape.HasChild())
{
TDF_ChildIterator it;

2
src/osgPlugins/OpenFlight/ExportOptions.cpp
View File

@@ -150,7 +150,7 @@ ExportOptions::parseOptionsString()
else
pos += (count+1);
// See if it's a Boolen/toggle
// See if it's a Boolean/toggle
if ( token == _validateOption )
{
OSG_INFO << "fltexp: Found: " << token << std::endl;

2
src/osgPlugins/QTKit/ReaderWriterQTKit.cpp
View File

@@ -87,7 +87,7 @@ class ReaderWriterQTKit : public osgDB::ReaderWriter
if (ext=="QTKit")
{
fileName = osgDB::getNameLessExtension(fileName);
OSG_INFO<<"ReaderWriterQTKit stipped filename = "<<fileName<<std::endl;
OSG_INFO<<"ReaderWriterQTKit stripped filename = "<<fileName<<std::endl;
}
if (!osgDB::containsServerAddress(fileName))
{

2
src/osgPlugins/RestHttpDevice/ReaderWriterRestHttpDevice.cpp
View File

@@ -110,7 +110,7 @@ class ReaderWriterRestHttp : public osgDB::ReaderWriter
}
catch(...)
{
OSG_WARN << "ReaderWriterRestHttpDevice : could not create http-server, unknown excpetion thrown " << std::endl;
OSG_WARN << "ReaderWriterRestHttpDevice : could not create http-server, unknown exception thrown " << std::endl;
return ReadResult::ERROR_IN_READING_FILE;
}

4
src/osgPlugins/ac/Geode.cpp
View File

@@ -715,7 +715,7 @@ void Geode::ProcessGeometry(ostream& fout, const unsigned int ioffset)
int iNumMaterials = 0;
const osg::StateSet::RefAttributePair* pRAP=NULL;
// Let ac3d optimise the file
// whiz round and get a list of materails
// whiz round and get a list of materials
// write them out
// write out an object for each drawable.
// Write out world object
@@ -764,7 +764,7 @@ void Geode::ProcessGeometry(ostream& fout, const unsigned int ioffset)
fout << "OBJECT poly" << std::endl;
fout << "name \"" << getName() << "\"" << std::endl;
// Use zero offset co-ordinate as location IS OPTIONAL
// Use zero offset coordinate as location IS OPTIONAL
// fout << "loc " << "0 0 0" << std::endl;
/* you could have an offset for the coordinates; it was suggested that the first coord would do.
if((*pVertexArray).getType()==osg::Array::Vec3ArrayType) {

2
src/osgPlugins/ac/ac3d.cpp
View File

@@ -1355,7 +1355,7 @@ readObject(std::istream& stream, FileData& fileData, const osg::Matrix& parentTr
return group.release();
}
// Read the texture corrdinates
// Read the texture coordinates
osg::Vec2 texCoord;
stream >> texCoord[0] >> texCoord[1];
if (!stream) {

2
src/osgPlugins/avfoundation/ReaderWriterAVFoundation.cpp
View File

@@ -52,7 +52,7 @@ class ReaderWriterAVFoundation : public osgDB::ReaderWriter
if (ext=="avfoundation")
{
fileName = osgDB::getNameLessExtension(fileName);
OSG_INFO<<"AVFoundation stipped filename = "<<fileName<<std::endl;
OSG_INFO<<"AVFoundation stripped filename = "<<fileName<<std::endl;
}
if (!osgDB::containsServerAddress(fileName))
{

2
src/osgPlugins/dae/daeRGeometry.cpp
View File

@@ -769,7 +769,7 @@ struct VertexIndices
return false;
}
/// Templated getter for memebers, used for createGeometryArray()
/// Templated getter for members, used for createGeometryArray()
enum ValueType { POSITION, COLOR, NORMAL, TEXCOORD };
template <int Value>
inline int get() const;

4
src/osgPlugins/dae/daeRMaterials.cpp
View File

@@ -768,7 +768,7 @@ bool daeReader::GetFloat4Param(xsNCName Reference, domFloat4 &f4) const
size_t NumberOfSetParams = SetParamArray.getCount();
for (size_t i = 0; i < NumberOfSetParams; i++)
{
// Just do a simple comaprison of the ref strings for the time being
// Just do a simple comparison of the ref strings for the time being
if (0 == strcmp(SetParamArray[i]->getRef(), Reference))
{
if (NULL != SetParamArray[i]->getFx_basic_type_common() && (NULL != SetParamArray[i]->getFx_basic_type_common()->getFloat4()))
@@ -815,7 +815,7 @@ bool daeReader::GetFloatParam(xsNCName Reference, domFloat &f) const
size_t NumberOfSetParams = SetParamArray.getCount();
for (size_t i = 0; i < NumberOfSetParams; i++)
{
// Just do a simple comaprison of the ref strings for the time being
// Just do a simple comparison of the ref strings for the time being
if (0 == strcmp(SetParamArray[i]->getRef(), Reference))
{
if (NULL != SetParamArray[i]->getFx_basic_type_common() && (NULL != SetParamArray[i]->getFx_basic_type_common()->getFloat()))

2
src/osgPlugins/dae/daeWMaterials.cpp
View File

@@ -112,7 +112,7 @@ void daeWriter::processMaterial( osg::StateSet *ss, domBind_material *pDomBindMa
std::string fileURI;
if (_pluginOptions.linkOrignialTextures)
{
// We link to orignial images (not the ones in memory).
// We link to original images (not the ones in memory).
fileURI = osgDB::findDataFile(osgimg->getFileName());
if (fileURI=="" && _pluginOptions.forceTexture)
{

2
src/osgPlugins/dicom/ReaderWriterDICOM.cpp
View File

@@ -129,7 +129,7 @@ class ReaderWriterDICOM : public osgDB::ReaderWriter
if ((*itr)[0]=='.')
{
info()<<"Ignoring tempory file "<<*itr<<std::endl;
info()<<"Ignoring temporary file "<<*itr<<std::endl;
continue;
}

4
src/osgPlugins/directshow/DirectShowTexture.cpp
View File

@@ -837,11 +837,11 @@ struct ListDeviceAvailable
_listDevice[i]._device->Release();
}
void displayDevicesFound(const std::string& prefixForMessage, osg::NotifySeverity serverity = osg::NOTICE) const
void displayDevicesFound(const std::string& prefixForMessage, osg::NotifySeverity severity = osg::NOTICE) const
{
for (int i = 0; i < (int)_listDevice.size(); i++)
{
OSG_NOTIFY(serverity) << prefixForMessage << " device \"" << _listDevice[i]._name << "\" clsid " << _listDevice[i]._clsid << std::endl;
OSG_NOTIFY(severity) << prefixForMessage << " device \"" << _listDevice[i]._name << "\" clsid " << _listDevice[i]._clsid << std::endl;
}
}

4
src/osgPlugins/dxf/ReaderWriterDXF.cpp
View File

@@ -40,8 +40,8 @@ public:
supportsOption("UTF8", "Assuming UTF8 encoding of dxf text");
supportsOption("UTF16", "Assuming UTF16 encoding of dxf text");
supportsOption("UTF32", "Assuming UTF32 encoding of dxf text");
supportsOption("SIGNATURE", "Detrmine encoding of dxf text from it's signative");
supportsOption("WideChar | CurrentCodePage", "Detrmine encoding of dxf text using CurrentCodePage (Windows only.)");
supportsOption("SIGNATURE", "Determine encoding of dxf text from it's signative");
supportsOption("WideChar | CurrentCodePage", "Determine encoding of dxf text using CurrentCodePage (Windows only.)");
supportsOption("FontFile=<fontfile>", "Set the font file for dxf text");
}

2
src/osgPlugins/gles/AnimationCleanerVisitor.cpp
View File

@@ -177,7 +177,7 @@ void AnimationCleanerVisitor::cleanInvalidMorphGeometries() {
void AnimationCleanerVisitor::cleanInvalidRigGeometries() {
// Replace rig geometries by static geometries if:
// * empty or inexistant vertex influence map
// * empty or inexistent vertex influence map
// * no *strictly* positive influence coefficient
for(RigGeometryList::iterator iterator = _rigGeometries.begin() ; iterator != _rigGeometries.end() ; ) {
osg::ref_ptr<osgAnimation::RigGeometry> rigGeometry = *iterator;

2
src/osgPlugins/gles/TangentSpaceVisitor.cpp
View File

@@ -24,7 +24,7 @@ void TangentSpaceVisitor::process(osg::Geometry& geometry) {
return;
}
else {
OSG_WARN << "Anomaly: [TangentSpaceVisitor] Missing tangent array at specificied index." << std::endl;
OSG_WARN << "Anomaly: [TangentSpaceVisitor] Missing tangent array at specified index." << std::endl;
}
}

2
src/osgPlugins/hdr/hdrwriter.cpp
View File

@@ -8,7 +8,7 @@
developed by Greg Ward. It handles the conversions between rgbe and
pixels consisting of floats. The data is assumed to be an array of floats.
By default there are three floats per pixel in the order red, green, blue.
(RGBE_DATA_??? values control this.) Only the mimimal header reading and
(RGBE_DATA_??? values control this.) Only the minimal header reading and
writing is implemented. Each routine does error checking and will return
a status value as defined below. This code is intended as a skeleton so
feel free to modify it to suit your needs.

2
src/osgPlugins/ive/VolumeTransferFunctionProperty.cpp
View File

@@ -53,7 +53,7 @@ void VolumeTransferFunctionProperty::write(DataOutputStream* out)
// write out the num of colours
out->writeUInt(numColours);
// write out the colour map entires
// write out the colour map entries
for(osg::TransferFunction1D::ColorMap::const_iterator itr = colourMap.begin();
itr != colourMap.end();
++itr)

2
src/osgPlugins/jpeg/EXIF_Orientation.cpp
View File

@@ -140,7 +140,7 @@ int EXIF_Orientation (j_decompress_ptr cinfo)
a pointer to the actual value, are packed into these 12 byte entries. */
if ((i + tags * 12) > exif_marker->data_length)
{
OSG_INFO<<"Not enough length for requied tags"<<std::endl;
OSG_INFO<<"Not enough length for required tags"<<std::endl;
return 0;
}

2
src/osgPlugins/las/ReaderWriterLAS.cpp
View File

@@ -28,7 +28,7 @@ class ReaderWriterLAS : public osgDB::ReaderWriter
supportsExtension("las", "LAS point cloud format");
supportsExtension("laz", "compressed LAS point cloud format");
supportsOption("v", "Verbose output");
supportsOption("noScale", "don't scale vertices according to las haeder - put schale in matixTransform");
supportsOption("noScale", "don't scale vertices according to las header - put scale in matrixTransform");
supportsOption("noReCenter", "don't transform vertex coords to re-center the pointcloud");
}

2
src/osgPlugins/obj/ReaderWriterOBJ.cpp
View File

@@ -59,7 +59,7 @@ public:
{
supportsExtension("obj","Alias Wavefront OBJ format");
supportsOption("noRotation","Do not do the default rotate about X axis");
supportsOption("noTesselateLargePolygons","Do not do the default tesselation of large polygons");
supportsOption("noTesselateLargePolygons","Do not do the default tessellation of large polygons");
supportsOption("noTriStripPolygons","Do not do the default tri stripping of polygons");
supportsOption("generateFacetNormals","generate facet normals for vertices without normals");
supportsOption("noReverseFaces","avoid to reverse faces when normals and triangles orientation are reversed");

2
src/osgPlugins/osga/OSGA_Archive.cpp
View File

@@ -351,7 +351,7 @@ bool OSGA_Archive::open(const std::string& filename, ArchiveStatus status, unsig
_input.seekg( 0, std::ios_base::end );
file_size = ARCHIVE_POS( _input.tellg() );
if( _input.is_open() && file_size <= 0 )
{ // compute end of file postition manually ...
{ // compute end of file position manually ...
// seekp( 0, ios::end ), tellp( ) fails in 32 bit windows with files > 4 GiB
size_t BlockHeaderSize =
sizeof( unsigned int /*_blockSize*/ ) +

2
src/osgPlugins/ply/vertexData.cpp
View File

@@ -535,7 +535,7 @@ osg::Node* VertexData::readPlyFile( const char* filename, const bool ignoreColor
osgUtil::SmoothingVisitor::smooth((*geom), osg::PI/2);
}
// set flage true to activate the vertex buffer object of drawable
// set flags true to activate the vertex buffer object of drawable
geom->setUseVertexBufferObjects(true);
osg::ref_ptr<osg::Image> image;

2
src/osgPlugins/rot/ReaderWriterROT.cpp
View File

@@ -54,7 +54,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename
return false;
}
// clear the params sting of any brackets.
// clear the params string of any brackets.
std::string::size_type params_pos = params.size();
for(; params_pos>0; )
{

2
src/osgPlugins/shadow/ReaderWriterOsgShadow.cpp
View File

@@ -49,7 +49,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename
return false;
}
// clear the params sting of any brackets.
// clear the params string of any brackets.
std::string::size_type params_pos = params.size();
for(; params_pos>0; )
{

2
src/osgPlugins/trans/ReaderWriterTRANS.cpp
View File

@@ -55,7 +55,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename
return false;
}
// clear the params sting of any brackets.
// clear the params string of any brackets.
std::string::size_type params_pos = params.size();
for(; params_pos>0; )
{

2
src/osgPlugins/trk/ReaderWriterTRK.cpp
View File

@@ -311,7 +311,7 @@ class ReaderWriterTRK : public osgDB::ReaderWriter
vertices->push_back(osg::Vec3(vptr[0],vptr[1],vptr[2]));
}
// add the line segmenets for track
// add the line segments for track
for(int pi=0; pi<n_points-1; ++pi, ++vi)
{
lines->push_back(vi);

6
src/osgPlugins/txf/TXFFont.cpp
View File

@@ -182,7 +182,7 @@ TXFFont::loadFont(std::istream& stream)
stream.read(reinterpret_cast<std::istream::char_type*>(image->data()), ntexels);
if (!stream)
{
OSG_FATAL << "osgdb_txf: unxpected end of file in txf file \"" << _filename << "\"!" << std::endl;
OSG_FATAL << "osgdb_txf: unexpected end of file in txf file \"" << _filename << "\"!" << std::endl;
return false;
}
}
@@ -194,7 +194,7 @@ TXFFont::loadFont(std::istream& stream)
if (!stream)
{
delete [] texbitmap;
OSG_FATAL << "osgdb_txf: unxpected end of file in txf file \"" << _filename << "\"!" << std::endl;
OSG_FATAL << "osgdb_txf: unexpected end of file in txf file \"" << _filename << "\"!" << std::endl;
return false;
}
@@ -217,7 +217,7 @@ TXFFont::loadFont(std::istream& stream)
}
else
{
OSG_FATAL << "osgdb_txf: unxpected txf file!" << std::endl;
OSG_FATAL << "osgdb_txf: unexpected txf file!" << std::endl;
return false;
}

2
src/osgPlugins/txp/TXPPagedLOD.cpp
View File

@@ -103,7 +103,7 @@ void TXPPagedLOD::traverse(osg::NodeVisitor& nv)
// modify the priority according to the child's priority offset and scale.
priority = _perRangeDataList[numChildren]._priorityOffset + priority * _perRangeDataList[numChildren]._priorityScale;
//std::cout<<" requesting child "<<_fileNameList[numChildren]<<" priotity = "<<priority<<std::endl;
//std::cout<<" requesting child "<<_fileNameList[numChildren]<<" priority = "<<priority<<std::endl;
nv.getDatabaseRequestHandler()->requestNodeFile(_perRangeDataList[numChildren]._filename,
nv.getNodePath(),
priority,

2
src/osgPlugins/txp/TileMapper.cpp
View File

@@ -154,7 +154,7 @@ bool TileMapper::isTileNeighbourALowerLODLevel(const TileIdentifier& tid, int dx
{
if (_tileMap.count(TileIdentifier(tid.x+dx,tid.y+dy,tid.lod))!=0)
{
// we have a neightbour at the same lod level.
// we have a neighbour at the same lod level.
return false;
}