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

Fix typos and spelling.

Browse Source
This commit is contained in:
Alberto Luaces
2018-04-20 18:18:22 +02:00
committed by Robert Osfield
parent c3008512f1
commit 02c310982e
187 changed files with 302 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/3ds/ReaderWriter3DS.cpp
View File

@@ -204,7 +204,7 @@ protected:
typedef std::vector<int> FaceList;
typedef std::map<std::string,osg::StateSet*> GeoStateMap;
osg::Texture2D* createTexture(Lib3dsTextureMap *texture,const char* label,bool& transparancy);
osg::Texture2D* createTexture(Lib3dsTextureMap *texture,const char* label,bool& transparency);
StateSetInfo createStateSet(Lib3dsMaterial *materials);
osg::Drawable* createDrawable(Lib3dsMesh *meshes,FaceList& faceList, const osg::Matrix * matrix, StateSetInfo & ssi, bool smoothVertexNormals);
@@ -1205,7 +1205,7 @@ osg::Texture2D* ReaderWriter3DS::ReaderObject::createTexture(Lib3dsTextureMap *
osg::Texture2D* osg_texture = new osg::Texture2D;
osg_texture->setImage(osg_image.get());
osg_texture->setName(texture->name);
// does the texture support transparancy?
// does the texture support transparency?
transparency = ((texture->flags)&LIB3DS_TEXTURE_ALPHA_SOURCE)!=0;
// what is the wrap mode of the texture.

2
src/osgPlugins/CMakeLists.txt
View File

@@ -32,7 +32,7 @@ SET(TARGET_COMMON_LIBRARIES
osgUtil
)
OPTION(BUILD_OSG_PLUGINS_BY_DEFAULT "If set, all available plugins are built by default and each plugin can be disabled from the build by setting BUILD_OSG_PLUGIN_<PLUGINNAME> to 0. If not set, no plugins are built by default and each desired plugin must be explicitely enabled by setting BUILD_OSG_PLUGIN_<PLUGINNAME> to 1." ON)
OPTION(BUILD_OSG_PLUGINS_BY_DEFAULT "If set, all available plugins are built by default and each plugin can be disabled from the build by setting BUILD_OSG_PLUGIN_<PLUGINNAME> to 0. If not set, no plugins are built by default and each desired plugin must be explicitly enabled by setting BUILD_OSG_PLUGIN_<PLUGINNAME> to 1." ON)
# Macro used for adding plugins below. By default, all plugins are built
# but can be disabled by setting the CMake Variable BUILD_OSG_PLUGIN_<PLUGINNAME> to 0.

6
src/osgPlugins/Inventor/ConvertFromInventor.cpp
View File

@@ -125,7 +125,7 @@ ConvertFromInventor::restructure(void* data, SoCallbackAction* action,
if (!child->isOfType(SoSeparator::getClassTypeId()) &&
child->affectsState()) {
// Put the node bellow separator
// Put the node below separator
SoSeparator *s = new SoSeparator;
s->addChild(group->getChild(i));
group->replaceChild(i, s);
@@ -1492,7 +1492,7 @@ ConvertFromInventor::preLight(void* data, SoCallbackAction* action,
// Set object names
const char* name = ivLight->getName().getString();
osgLight->setName(name);
//ls->setName(name); -> this will be handled bellow in ivPushState
//ls->setName(name); -> this will be handled below in ivPushState
#if 1 // Let's place the light to its place in scene graph instead of
// old approach of global light group.
@@ -1837,7 +1837,7 @@ ConvertFromInventor::getStateSet(SoCallbackAction* action)
const SbColor &c = ivState.currentAmbientLight;
lightModel->setAmbientIntensity(osg::Vec4(c[0], c[1], c[2], 1.0));
#if 0
// disable as two sided lighting causes problem under NVidia, and the above osg::Material settings are single sided anway..
// disable as two sided lighting causes problems under NVidia, and the above osg::Material settings are single sided anyway..
update: The mentioned bug is probably just for very old NVidia drivers (commit time of the comment is 2005-03-18).
The proper solution should be to set two sided lighting based on SoShapeHints node. Need to be developed. PCJohn-2010-01-20
// Set two sided lighting

2
src/osgPlugins/Inventor/ConvertFromInventor.h
View File

@@ -28,7 +28,7 @@ class ConvertFromInventor
osg::Node* convert(SoNode* rootIVNode);
/**
* Preprocessing restructure the scene for the convertor
* Preprocessing restructure the scene for the converter
* to be able to convert some peculiar scene constructions.
* Resulting scene is geometrically equivalent to the source
* scene. The preprocessing is related to grouping nodes only

2
src/osgPlugins/Inventor/DeprecatedGeometry.h
View File

@@ -40,7 +40,7 @@ namespace deprecated_osg {
#define GET_BINDING(array) (array!=0 ? static_cast<AttributeBinding>(array->getBinding()) : BIND_OFF)
/** Geometry class contaning deprecated features.
/** Geometry class containing deprecated features.
* Users should only use deprecated_osg::Geometry when absolutely necessary for keeping things compiling,
* it is recommended that you should migrate your code to work just with osg::Geometry as existing
* deprecated_osg::Geometry will be removed in future release.

4
src/osgPlugins/Inventor/ReaderWriterIV.cpp
View File

@@ -66,7 +66,7 @@ void ReaderWriterIV::initInventor() const
// Disable delayed loading of VRML textures
SoVRMLImageTexture::setDelayFetchURL(FALSE);
// initialize convertor
// initialize converter
ConvertFromInventor::init();
#endif
}
@@ -226,7 +226,7 @@ ReaderWriterIV::readNode(std::istream& fin,
// about it and think how to stream textures instead.
// Get the data to the buffer
size_t bufSize = 126*1024; // let's make it something bellow 128KB
size_t bufSize = 126*1024; // let's make it something below 128KB
char *buf = (char*)malloc(bufSize);
size_t dataSize = 0;
while (!fin.eof() && fin.good()) {

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

@@ -321,7 +321,7 @@ osg::ref_ptr<osg::Geode> ReaderWritterOpenCASCADE::OCCTKReader::igesToOSGGeode(c
_colorTool = XCAFDoc_DocumentTool::ColorTool(doc->Main());
// free shape sequence
// get sequence of free shape lables
// get sequence of free shape labels
TDF_LabelSequence freeShapes;
_assembly->GetFreeShapes(freeShapes);

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

@@ -709,7 +709,7 @@ FltExportVisitor::writeLightPoint( const osgSim::LightPointNode* lpn )
_records->writeID( id );
_records->writeInt16( 0 ); // Surface material code
_records->writeInt16( 0 ); // Feature ID
_records->writeUInt32( ~0u ); // OpenFlight erronously say -1, so will assume ~0u is OK. Back color for bidirectional
_records->writeUInt32( ~0u ); // OpenFlight erroneously say -1, so will assume ~0u is OK. Back color for bidirectional
_records->writeInt32( EITHER ); // Display mode
_records->writeFloat32( lp0._intensity ); // Intensity
_records->writeFloat32( 0.f ); // Back intensity TBD

4
src/osgPlugins/ZeroConfDevice/mdns_win/dns_sd.h
View File

@@ -990,7 +990,7 @@ DNSServiceErrorType DNSSD_API DNSServiceRegister
*
* sdRef: A DNSServiceRef initialized by DNSServiceRegister().
*
* RecordRef: A pointer to an uninitialized DNSRecordRef. Upon succesfull completion of this
* RecordRef: A pointer to an uninitialized DNSRecordRef. Upon successful completion of this
* call, this ref may be passed to DNSServiceUpdateRecord() or DNSServiceRemoveRecord().
* If the above DNSServiceRef is passed to DNSServiceRefDeallocate(), RecordRef is also
* invalidated and may not be used further.
@@ -1624,7 +1624,7 @@ DNSServiceErrorType DNSSD_API DNSServiceCreateConnection(DNSServiceRef *sdRef);
*
* sdRef: A DNSServiceRef initialized by DNSServiceCreateConnection().
*
* RecordRef: A pointer to an uninitialized DNSRecordRef. Upon succesfull completion of this
* RecordRef: A pointer to an uninitialized DNSRecordRef. Upon successful completion of this
* call, this ref may be passed to DNSServiceUpdateRecord() or DNSServiceRemoveRecord().
* (To deregister ALL records registered on a single connected DNSServiceRef
* and deallocate each of their corresponding DNSServiceRecordRefs, call

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

@@ -731,7 +731,7 @@ class LineBin : public PrimitiveBin
virtual bool beginPrimitive(unsigned nRefs)
{
// Check if we have enough for a line or someting broken ...
// Check if we have enough for a line or something broken ...
if (nRefs < 2) {
OSG_WARN << "osgDB ac3d reader: detected line with less than 2 vertices!" << std::endl;
return false;
@@ -823,7 +823,7 @@ class SurfaceBin : public PrimitiveBin {
_refs.reserve(nRefs);
_refs.clear();
// Check if we have enough for a line or someting broken ...
// Check if we have enough for a line or something broken ...
if (nRefs < 3) {
OSG_WARN << "osgDB ac3d reader: detected surface with less than 3 vertices!" << std::endl;
return false;

2
src/osgPlugins/bsp/VBSPEntity.cpp
View File

@@ -358,7 +358,7 @@ void VBSPEntity::parseParameters(std::string & entityText)
// This is an "item". Like a prop, these are external models
// placed in the scene, but the specific model is determined
// directly by the entity's class. In HL2, these entities are
// useable by the player (ammunition and health packs are examples)
// usable by the player (ammunition and health packs are examples)
entity_class = ENTITY_ITEM;
processItem();
}

4
src/osgPlugins/cfg/RenderSurface.h
View File

@@ -184,14 +184,14 @@ class RenderSurface : public osg::Referenced
unsigned int getWindowHeight() const;
#if 0
/** Explicitely set the Display variable before realization. (X11 only). */
/** Explicitly set the Display variable before realization. (X11 only). */
void setDisplay( Display *dpy );
/** Get the Display. (X11 only). */
Display* getDisplay( void );
/** Get the const Display. (X11 only). */
const Display* getDisplay( void ) const;
/** Explicitely set the Windowing system window before realization. */
/** Explicitly set the Windowing system window before realization. */
void setWindow( const Window win );
/** Returns the Windowing system handle to the window */
Window getWindow( void ) const;

2
src/osgPlugins/cfg/VisualChooser.cpp
View File

@@ -527,7 +527,7 @@ void VisualChooser::applyAttribute(const VisualAttribute &va, std::vector<int> &
}
// please note that *all* WGL attributes must have a parameter!
// to keep compatibility we'll explicitely set a boolean
// to keep compatibility we'll explicitly set a boolean
// parameter value where needed.
std::pair<int, int> attr = std::make_pair(static_cast<int>(va.attribute()), va.parameter());

4
src/osgPlugins/cfg/VisualChooser.h
View File

@@ -49,7 +49,7 @@ class VisualChooser : public osg::Referenced
};
#if 0
//-------------------------------------------------------------------------
// Explicitely set the visual info pointer. This will override the use of
// Explicitly set the visual info pointer. This will override the use of
// glXChooseVisual(). Useful for functions requiring a VisualChooser
// argument, but not a XVisualInfo.
void setVisual( VisualInfo *vinfo );
@@ -87,7 +87,7 @@ class VisualChooser : public osg::Referenced
bool isDoubleBuffer() const;
//-------------------------------------------------------------------------
// The following methods set attributes explicitely
// The following methods set attributes explicitly
//
void setBufferSize( unsigned int size );

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

@@ -33,7 +33,7 @@ using namespace osgDAE;
// Note <lookat>, <matrix>, <rotate>, <scale>, <skew> and <translate> may appear in any order
// These transformations can be combined in any number and ordering to produce the desired
// coordinate system for the parent <node> element. The COLLADA specificatin requires that the
// coordinate system for the parent <node> element. The COLLADA specification requires that the
// transformation elements are processed in order and accumulate the result as if they were
// converted to column-order matrices and concatenated using matrix post-multiplication.
osg::Transform* daeReader::processOsgMatrixTransform(domNode *node, bool isBone)

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

@@ -1309,7 +1309,7 @@ bool CTextureRenderer::openSoundCaptureDevice(const std::string& capture, int nb
}
else
{
OSG_WARN << prefixForMessage << " can t retrieve informations pins" << std::endl;
OSG_WARN << prefixForMessage << " can t retrieve information pins" << std::endl;
}
}
if (pISC) pISC->Release(); pISC = 0;
@@ -1639,7 +1639,7 @@ HRESULT CTextureRenderer::CheckMediaType(const CMediaType *pmt)
//-----------------------------------------------------------------------------
HRESULT CTextureRenderer::SetMediaType(const CMediaType *pmt)
{
// Retrive the size of this media type
// Retrieve the size of this media type
VIDEOINFO *pviBmp; // Bitmap info header
pviBmp = (VIDEOINFO *)pmt->Format();
@@ -1673,7 +1673,7 @@ void CTextureRenderer::syncStreams(bool state)
_dropFrame = S_OK;
}
HRESULT CTextureRenderer::ShouldDrawSampleNow(IMediaSample *sample, REFERENCE_TIME *start, REFERENCE_TIME *stop) {
return _dropFrame; // disable droping of frames
return _dropFrame; // disable dropping of frames
}
bool CTextureRenderer::StopFilters()

4
src/osgPlugins/exr/ReaderWriterEXR.cpp
View File

@@ -25,7 +25,7 @@ using namespace Imath;
*
* Follows is code written by FOI (www.foi.se)
* it is a wrapper of openEXR(www.openexr.com)
* to add suport of exr images into osg
* to add support of exr images into osg
*
* Ported to a OSG-plugin, Ragnar Hammarqvist.
* For patches, bugs and new features
@@ -404,6 +404,6 @@ protected:
}
};
// now register with Registry to instantiate the exr suport
// now register with Registry to instantiate the exr support
// reader/writer.
REGISTER_OSGPLUGIN(exr, ReaderWriterEXR)

2
src/osgPlugins/ffmpeg/FFmpegImageStream.cpp
View File

@@ -50,7 +50,7 @@ FFmpegImageStream::~FFmpegImageStream()
OSG_INFO<<"Have done quit"<<std::endl;
// release athe audio streams to make sure that the decoder doesn't retain any external
// refences.
// references.
getAudioStreams().clear();
// destroy the decoder and associated threads

2
src/osgPlugins/gles/AABBonBoneVisitor
View File

@@ -27,7 +27,7 @@
#include <osg/Shape>
// Here the idea is to compute AABB by bone for a skelton
// Here the idea is to compute AABB by bone for a skeleton
// You just need to call this visitor on a skeleton and after call computeBoundingBoxOnBones
// If you have more than one skeleton you should crete a visitor by skeleton
class ComputeAABBOnBoneVisitor : public osg::NodeVisitor {

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

@@ -395,7 +395,7 @@ bool AnimationCleanerVisitor::isValidAnimation(const osgAnimation::Animation& an
bool AnimationCleanerVisitor::isValidChannel(const osgAnimation::Channel& channel) const {
// a valid channel has valid target i.e.
// 1. there exists some UpdateMatrixTransform with channel's target name
// 2. the channel does not simply mimick the UpdateMatrixTransform content
// 2. the channel does not simply mimic the UpdateMatrixTransform content
std::string target = channel.getTargetName();
for(AnimationUpdateCallBackMap::const_iterator update = _updates.begin() ; update != _updates.end() ; ++ update) {
osgAnimation::UpdateMorph *updateMorph = dynamic_cast<osgAnimation::UpdateMorph*>(update->first.get());
@@ -408,7 +408,7 @@ bool AnimationCleanerVisitor::isValidChannel(const osgAnimation::Channel& channe
}
else {
if(update->first->getName() == target) {
// check if channel contains necessary data or just mimick the UpdateCallback's StackedTransform
// check if channel contains necessary data or just mimic the UpdateCallback's StackedTransform
bool channelMimickingTransform = isChannelEqualToStackedTransform(channel,
dynamic_cast<osgAnimation::UpdateMatrixTransform*>(update->first.get()));
if(channelMimickingTransform) {

4
src/osgPlugins/gles/DetachPrimitiveVisitor.cpp
View File

@@ -68,7 +68,7 @@ osg::Geometry* DetachPrimitiveVisitor::makeDetachedGeometry(osg::Geometry& geome
osg::Geometry* DetachPrimitiveVisitor::createDetachedGeometry(osg::Geometry& source) {
osg::Geometry* detached = new osg::Geometry(source, osg::CopyOp::SHALLOW_COPY);
if(!_keepGeometryAttributes) {
// we keep only vertexes and clean all other attributes and values
// we keep only vertices and clean all other attributes and values
detached->setNormalArray(0);
detached->setColorArray(0);
detached->setSecondaryColorArray(0);
@@ -119,7 +119,7 @@ osg::Geometry* DetachPrimitiveVisitor::createDetachedGeometry(osgAnimation::RigG
detached = new osgAnimation::RigGeometry();
detached->setSourceGeometry(makeDetachedGeometry(*source.getSourceGeometry()));
// Only keep vertexes and Bones/Weights attrib arrays
// Only keep vertices and Bones/Weights attrib arrays
detached->setVertexArray(source.getVertexArray());
for(unsigned int i = 0 ; i < source.getVertexAttribArrayList().size() ; ++ i) {
osg::Array* attribute = source.getVertexAttribArray(i);

4
src/osgPlugins/gles/GeometryIndexSplitter.cpp
View File

@@ -141,8 +141,8 @@ bool GeometryIndexSplitter::split(osg::Geometry& geometry) {
}
osg::notify(osg::NOTICE) << "geometry " << &geometry << " " << geometry.getName()
<< " vertexes (" << geometry.getVertexArray()->getNumElements()
<< ") has DrawElements index > " << _maxAllowedIndex << ", splitted to "
<< " vertices (" << geometry.getVertexArray()->getNumElements()
<< ") has DrawElements index > " << _maxAllowedIndex << ", split to "
<< _geometryList.size() << " geometry" << std::endl;
return true;

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

@@ -39,7 +39,7 @@ void GeometrySplitterVisitor::apply(osg::Geode& geode) {
// remove all drawables
geode.removeDrawables(0, geode.getNumDrawables());
// insert splitted geometries
// insert split geometries
for(unsigned int i = 0 ; i < remappedGeometries.size() ; ++ i) {
geode.addDrawable(remappedGeometries[i].get());
}

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

@@ -42,7 +42,7 @@ void RemapGeometryVisitor::apply(osg::Geode& geode) {
// remove all drawables
geode.removeDrawables(0, geode.getNumDrawables());
// insert splitted geometries
// insert split geometries
for(unsigned int i = 0 ; i < remappedGeometries.size() ; ++ i) {
geode.addDrawable(remappedGeometries[i].get());
}

2
src/osgPlugins/gles/TriangleMeshGraph
View File

@@ -95,7 +95,7 @@ public:
}
inline float angleCosine(const Triangle& other) const {
// Triangle._normal is normalized so no need to divide by lengthes
// Triangle._normal is normalized so no need to divide by lengths
return (_normal * other._normal);
}

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

@@ -69,7 +69,7 @@ void UnIndexMeshVisitor::process(osg::Geometry& geom)
case(osg::PrimitiveSet::QUAD_STRIP):
case(osg::PrimitiveSet::POLYGON):
{
// for each geometry list indexes of vertexes
// for each geometry list indexes of vertices
// to makes triangles
TriangleIndexor triangleIndexList;
(*itr)->accept(triangleIndexList);

2
src/osgPlugins/hdr/hdrloader.h
View File

@@ -28,7 +28,7 @@
* Class to load a HDR file
* An HDR file is an image file where each pixel is stored as float values in opposite
* of traditional other formats (BMP, TGA, etc.) where integerer values are used.
* see http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-HDRImageReader&forum=cotd&id=-1 for more informations
* see http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-HDRImageReader&forum=cotd&id=-1 for more information
*/
#ifndef HDRLOADER_H

2
src/osgPlugins/ive/DataOutputStream.h
View File

@@ -110,7 +110,7 @@ public:
void writeVolumeLayer(const osgVolume::Layer* layer);
void writeVolumeLocator(const osgVolume::Locator* locator);
void writeVolumeProperty(const osgVolume::Property* propety);
void writeVolumeProperty(const osgVolume::Property* property);
void writeObject(const osg::Object* object);

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

@@ -176,7 +176,7 @@ void Geometry::read(DataInputStream* in)
in_THROW_EXCEPTION("Geometry::read(): Could not cast this osg::Geometry to an osg::Drawable.");
// Read geoemtry properties
// Read geometry properties
// Read primitiveset list.
int size = in->readInt();

2
src/osgPlugins/ktx/ReaderWriterKTX.cpp
View File

@@ -333,7 +333,7 @@ osgDB::ReaderWriter::WriteResult ReaderWriterKTX::writeImage(const osg::Image &i
DELETEFILE(file.c_str());
OSG_WARN << "ReaderWriterKTX::writeImage Failed to write " << file << "." << std::endl;
}
OSG_INFO << "ReaderWriterKTX::writeImage write " << file << " sucess;" << image.s() << "x" << image.t() << "x" << image.r() << std::endl;
OSG_INFO << "ReaderWriterKTX::writeImage write " << file << " success;" << image.s() << "x" << image.t() << "x" << image.r() << std::endl;
return res;
}

10
src/osgPlugins/lua/LuaScriptEngine.cpp
View File

@@ -3979,7 +3979,7 @@ void LuaScriptEngine::pushContainer(osg::Object* object, const std::string& prop
}
else
{
OSG_NOTICE<<"Container type not suppported."<<std::endl;
OSG_NOTICE<<"Container type not supported."<<std::endl;
}
}
else
@@ -4115,9 +4115,9 @@ void LuaScriptEngine::pushAndCastObject(const std::string& compoundClassName, os
object->ref();
}
std::string::size_type seperator = compoundClassName.find("::");
std::string libraryName = (seperator==std::string::npos) ? object->libraryName() : compoundClassName.substr(0, seperator);
std::string className = (seperator==std::string::npos) ? object->className() : compoundClassName.substr(seperator+2,std::string::npos);
std::string::size_type separator = compoundClassName.find("::");
std::string libraryName = (separator==std::string::npos) ? object->libraryName() : compoundClassName.substr(0, separator);
std::string className = (separator==std::string::npos) ? object->className() : compoundClassName.substr(separator+2,std::string::npos);
lua_pushstring(_lua, "libraryName"); lua_pushstring(_lua, libraryName.c_str()); lua_settable(_lua, -3);
lua_pushstring(_lua, "className"); lua_pushstring(_lua, className.c_str()); lua_settable(_lua, -3);
@@ -4168,7 +4168,7 @@ void LuaScriptEngine::addPaths(const osgDB::FilePathList& paths)
lua_pushstring( _lua, path.c_str() );
lua_setfield( _lua, -2, "path" );
lua_pop( _lua, 1 ); // return stack to orignal
lua_pop( _lua, 1 ); // return stack to original
}
void LuaScriptEngine::addPaths(const osgDB::Options* options)

4
src/osgPlugins/lwo/ReaderWriterLWO.cpp
View File

@@ -141,7 +141,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterLWO::readNode_LWO2(const std::string
}
// collect all the data relavent to a particular osg::Geometry being created.
// collect all the data relevant to a particular osg::Geometry being created.
struct GeometryCollection
{
GeometryCollection():
@@ -298,7 +298,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterLWO::readNode_LWO1(const std::string
// "By convention, the +X direction is to the right or east, the +Y
// direction is upward, and the +Z direction is forward or north"
// However, the osg sticks to the more conventional, y to the north,
// z upwards, x is the same - rigth/east. To handle this difference
// z upwards, x is the same - right/east. To handle this difference
// simple exchange osg_z for lwo_y, and osg_y for lwo_z.
// add the corners in reverse order to reverse the windings, to keep the anticlockwise rotation of polys.

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

@@ -61,7 +61,7 @@ public:
supportsOption("noRotation","Do not do the default rotate about X axis");
supportsOption("noTesselateLargePolygons","Do not do the default tesselation of large polygons");
supportsOption("noTriStripPolygons","Do not do the default tri stripping of polygons");
supportsOption("generateFacetNormals","generate facet normals for verticies without normals");
supportsOption("generateFacetNormals","generate facet normals for vertices without normals");
supportsOption("noReverseFaces","avoid to reverse faces when normals and triangles orientation are reversed");
supportsOption("DIFFUSE=<unit>", "Set texture unit for diffuse texture");
@@ -794,7 +794,7 @@ osg::Node* ReaderWriterOBJ::convertModelToSceneGraph(obj::Model& model, ObjOptio
tessellator.retessellatePolygons(*geometry);
}
// tri strip polygons to improve graphics peformance
// tri strip polygons to improve graphics performance
if (!localOptions.noTriStripPolygons)
{
osgUtil::optimizeMesh(geometry);

4
src/osgPlugins/ogr/ReaderWriterOGR.cpp
View File

@@ -284,7 +284,7 @@ public:
if (pointGeom->getVertexArray())
{
OSG_INFO << "osgOgrFeature::multiPointToDrawable " << pointGeom->getVertexArray()->getNumElements() << " vertexes"<< std::endl;
OSG_INFO << "osgOgrFeature::multiPointToDrawable " << pointGeom->getVertexArray()->getNumElements() << " vertices"<< std::endl;
}
return pointGeom;
@@ -338,7 +338,7 @@ public:
if (geom->getVertexArray())
{
OSG_INFO << "osgOgrFeature::multiPolygonToDrawable " << geom->getVertexArray()->getNumElements() << " vertexes"<< std::endl;
OSG_INFO << "osgOgrFeature::multiPolygonToDrawable " << geom->getVertexArray()->getNumElements() << " vertices"<< std::endl;
}
return geom;

2
src/osgPlugins/osc/OscSendingDevice.hpp
View File

@@ -36,7 +36,7 @@
* The sending device knows how to handle Vec2, Vec3, Vec4, Quat, Plane and Matrix values
*
* TUIO-specific notes:
* If you want to explicitely set the application-name when sending multi-touch-events, use
* If you want to explicitly set the application-name when sending multi-touch-events, use
* osc_device->setUserValue("tuio_application_name", "<your application name>");
* You'll also have to add the address-part, e.g.
* osc_device->setUserValue("tuio_application_name", "my_tuio_application@192.168.1.1");

2
src/osgPlugins/osc/ip/win32/NetworkingUtils.cpp
View File

@@ -44,7 +44,7 @@ NetworkInitializer::NetworkInitializer()
// there is a race condition here if one thread tries to access
// the library while another is still initializing it.
// i can't think of an easy way to fix it so i'm telling you here
// incase you need to init the library from two threads at once.
// in case you need to init the library from two threads at once.
// this is why the header file advises to instantiate one of these
// in main() so that the initialization happens globally

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

@@ -37,7 +37,7 @@ Purpose:
But, when such situation occurs more elaborate conversion methods from/to
std::streampos are needed. Functions below employ such methods.
I made this fix for use with 32 bit Windows OSG. Acutally this
I made this fix for use with 32 bit Windows OSG. Actually this
solution is not dependent on OS but standard C++ library.
Microsoft SDKs always use some version of Dinkumware libs.

2
src/osgPlugins/osgjs/ReaderWriterJSON.cpp
View File

@@ -69,7 +69,7 @@ public:
supportsOption("mergeAllBinaryFiles","merge all binary files into one to avoid multi request on a server");
supportsOption("inlineImages","insert base64 encoded images instead of referring to them");
supportsOption("varint","Use varint encoding to serialize integer buffers");
supportsOption("useSpecificBuffer=userkey1[=uservalue1][:buffername1],userkey2[=uservalue2][:buffername2]","uses specific buffers for unshared buffers attached to geometries having a specified user key/value. Buffer name *may* be specificed after ':' and will be set to uservalue by default. If no value is set then only the existence of a uservalue with key string is performed.");
supportsOption("useSpecificBuffer=userkey1[=uservalue1][:buffername1],userkey2[=uservalue2][:buffername2]","uses specific buffers for unshared buffers attached to geometries having a specified user key/value. Buffer name *may* be specified after ':' and will be set to uservalue by default. If no value is set then only the existence of a uservalue with key string is performed.");
supportsOption("disableCompactBuffer","keep source types and do not try to optimize buffers size");
supportsOption("disableStrictJson","do not clean string (to utf8) or floating point (should be finite) values");
}

2
src/osgPlugins/osgtgz/ReaderWriterOSGTGZ.cpp
View File

@@ -102,7 +102,7 @@ class sgReaderWriterOSGTGZ : public osgDB::ReaderWriter
#if defined(_WIN32) && !defined(__CYGWIN__)
// note, is this the right command for windows?
// is there any way of overiding the Y/N option? RO.
// is there any way of overriding the Y/N option? RO.
sprintf( command, "erase %s", dirname );
#else

2
src/osgPlugins/p3d/ReaderWriterP3D.cpp
View File

@@ -123,7 +123,7 @@ public:
if (l>='a' && l<='z') l = (l-'a')+'A';
if (r>='a' && r<='z') r = (r-'a')+'A';
// if both charaters are equal then move to the next character
// if both characters are equal then move to the next character
if (l==r)
{
lhs_itr++;

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

@@ -28,7 +28,7 @@ using namespace std;
using namespace ply;
/* Contructor. */
/* Constructor. */
VertexData::VertexData()
: _invertFaces( false )
{

18
src/osgPlugins/quicktime/QTLiveUtils.cpp
View File

@@ -281,9 +281,9 @@ void probe_video_digitizer_components()
// #define videoDigitizerComponentType = 'vdig'
ComponentDescription video_component_description;
video_component_description.componentType = 'vdig'; /* A unique 4-byte code indentifying the command set */
video_component_description.componentType = 'vdig'; /* A unique 4-byte code identifying the command set */
video_component_description.componentSubType = 0; /* Particular flavor of this instance */
video_component_description.componentManufacturer = 0; /* Vendor indentification */
video_component_description.componentManufacturer = 0; /* Vendor identification */
video_component_description.componentFlags = 0; /* 8 each for Component,Type,SubType,Manuf/revision */
video_component_description.componentFlagsMask = 0; /* Mask for specifying which flags to consider in search, zero during registration */
long num_video_components = CountComponents (&video_component_description);
@@ -378,9 +378,9 @@ std::vector<OSG_SGDeviceList> probe_sequence_grabber_components()
// #define videoDigitizerComponentType = 'vdig'
ComponentDescription sg_component_description;
sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code indentifying the command set */
sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code identifying the command set */
sg_component_description.componentSubType = 0L; /* Particular flavor of this instance */
sg_component_description.componentManufacturer = 'appl'; /* Vendor indentification */
sg_component_description.componentManufacturer = 'appl'; /* Vendor identification */
sg_component_description.componentFlags = 0L; /* 8 each for Component,Type,SubType,Manuf/revision */
sg_component_description.componentFlagsMask = 0L; /* Mask for specifying which flags to consider in search, zero during registration */
long num_sg_components = CountComponents (&sg_component_description);
@@ -547,9 +547,9 @@ void get_video_device_bounds_idstr(short deviceID, short deviceInputID, short& o
QTScopedMovieInitialiser qt_movie_init;
ComponentDescription sg_component_description;
sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code indentifying the command set */
sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code identifying the command set */
sg_component_description.componentSubType = 0L; /* Particular flavor of this instance */
sg_component_description.componentManufacturer = 0L; /* Vendor indentification */
sg_component_description.componentManufacturer = 0L; /* Vendor identification */
sg_component_description.componentFlags = 0L; /* 8 each for Component,Type,SubType,Manuf/revision */
sg_component_description.componentFlagsMask = 0L; /* Mask for specifying which flags to consider in search, zero during registration */
long num_sg_components = CountComponents (&sg_component_description);
@@ -689,9 +689,9 @@ void get_sound_device_idstr(short soundDeviceID, short soundDeviceInputID, Str63
// #define videoDigitizerComponentType = 'vdig'
ComponentDescription sg_component_description;
sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code indentifying the command set */
sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code identifying the command set */
sg_component_description.componentSubType = 0L; /* Particular flavor of this instance */
sg_component_description.componentManufacturer = 0L; /* Vendor indentification */
sg_component_description.componentManufacturer = 0L; /* Vendor identification */
sg_component_description.componentFlags = 0L; /* 8 each for Component,Type,SubType,Manuf/revision */
sg_component_description.componentFlagsMask = 0L; /* Mask for specifying which flags to consider in search, zero during registration */
long num_sg_components = CountComponents (&sg_component_description);
@@ -775,7 +775,7 @@ void get_sound_device_idstr(short soundDeviceID, short soundDeviceInputID, Str63
// You can use the VDSetDigitizerRect function to set the size and location of the digitizer rectangle.
// The VDGetDigitizerRect function lets you retrieve the size and location of this rectangle.
// Imput Source
// Input Source
// Some of these functions provide information about the available video inputs. Applications can use
// the VDGetNumberOfInputs function to determine the number of video inputs supported by the digitizer component.
// The VDGetInputFormat function allows applications to find out the video format (composite, s-video, or component) employed by a specified input.

10
src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp
View File

@@ -226,9 +226,9 @@ void QuicktimeLiveImageStream::createAndRunWithSequenceGrabber(std::string fileN
void QuicktimeLiveImageStream::createSequenceGrabber()
{
ComponentDescription sg_component_description;
sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code indentifying the command set */
sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code identifying the command set */
sg_component_description.componentSubType = 0L; /* Particular flavor of this instance */
sg_component_description.componentManufacturer = 'appl'; /* Vendor indentification */
sg_component_description.componentManufacturer = 'appl'; /* Vendor identification */
sg_component_description.componentFlags = 0L; /* 8 each for Component,Type,SubType,Manuf/revision */
sg_component_description.componentFlagsMask = 0L; /* Mask for specifying which flags to consider in search, zero during registration */
long num_sg_components = CountComponents (&sg_component_description);
@@ -519,14 +519,14 @@ void QuicktimeLiveImageStream::createAndRunWithVideoDigitizer(std::string fileNa
}
// 2.
// Create the Video Digitizer (using GWorld Pixmap as target mamory)
// Create the Video Digitizer (using GWorld Pixmap as target memory)
void QuicktimeLiveImageStream::createVideoDigitizer()
{
// #define videoDigitizerComponentType = 'vdig'
ComponentDescription video_component_description;
video_component_description.componentType = 'vdig'; /* A unique 4-byte code indentifying the command set */
video_component_description.componentType = 'vdig'; /* A unique 4-byte code identifying the command set */
video_component_description.componentSubType = 0; /* Particular flavor of this instance */
video_component_description.componentManufacturer = 0; /* Vendor indentification */
video_component_description.componentManufacturer = 0; /* Vendor identification */
video_component_description.componentFlags = 0; /* 8 each for Component,Type,SubType,Manuf/revision */
video_component_description.componentFlagsMask = 0; /* Mask for specifying which flags to consider in search, zero during registration */
long num_video_components = CountComponents (&video_component_description);

2
src/osgPlugins/quicktime/QuicktimeLiveImageStream.h
View File

@@ -91,7 +91,7 @@ public:
// 2.
// CreateAndRunWithVideoDigitizer
void createAndRunWithVideoDigitizer(std::string fileName);
// Create the Video Digitizer (using GWorld Pixmap as target mamory)
// Create the Video Digitizer (using GWorld Pixmap as target memory)
void createVideoDigitizer();
// Thread run method

4
src/osgPlugins/quicktime/ReaderWriterQT.cpp
View File

@@ -229,9 +229,9 @@ public:
QTScopedMovieInitialiser qt_movie_init;
//
ComponentDescription video_component_description;
video_component_description.componentType = 'vdig'; /* A unique 4-byte code indentifying the command set */
video_component_description.componentType = 'vdig'; /* A unique 4-byte code identifying the command set */
video_component_description.componentSubType = 0L; /* Particular flavor of this instance */
video_component_description.componentManufacturer = 0L; /* Vendor indentification */
video_component_description.componentManufacturer = 0L; /* Vendor identification */
video_component_description.componentFlags = 0L; /* 8 each for Component,Type,SubType,Manuf/revision */
video_component_description.componentFlagsMask = 0L; /* Mask for specifying which flags to consider in search, zero during registration */
num_video_components = CountComponents (&video_component_description);

2
src/osgPlugins/stl/ReaderWriterSTL.cpp
View File

@@ -741,7 +741,7 @@ ReaderWriterSTL::ReaderObject::ReadResult ReaderWriterSTL::BinaryReaderObject::r
*
* The magics files may use whether per-face or per-object colors
* for a given face, according to the value of the last bit (0 = per-face, 1 = per-object)
* Moreover, magics uses RGB instead of BGR (as the other softwares)
* Moreover, magics uses RGB instead of BGR (as the other software)
*/
if (!_color.valid())
{

2
src/osgPlugins/tiff/ReaderWriterTIFF.cpp
View File

@@ -269,7 +269,7 @@ simage_tiff_error(char * buffer, int buflen)
/// Generates a std::string from a printf format string and a va_list.
/// Took & adapted from the man page of printf.
///\todo Externalize this function to make is useable for all OSG?
///\todo Externalize this function to make is usable for all OSG?
std::string doFormat(const char* fmt, va_list ap) {
static const int MSG_BUFSIZE = 256; // Initial size of the buffer used for formatting
static const int MAX_BUFSIZE = 256*1024; // Maximum size of the buffer used for formatting

2
src/osgPlugins/txp/TXPArchive.h
View File

@@ -107,7 +107,7 @@ namespace txp
return _lights[i];
};
// Gets some informations for a given tile
// Gets some information for a given tile
struct TileInfo
{
osg::Vec3 center;

2
src/osgPlugins/txp/TXPParser.h
View File

@@ -59,7 +59,7 @@ osg::Texture2D* getTemplateTexture(trpgrImageHelper& image_helper, trpgLocalMate
// It is better since all the geometry children will be
// added into one Geode node as drawables, then having one
// geode node per child
// Means, instad of having
// Means, instead of having
// Group
// +-----------
// | |

8
src/osgPlugins/txp/trpage_geom.h
View File

@@ -1681,7 +1681,7 @@ TX_EXDECL class TX_CLDECL trpgTileTable : public trpgReadWriteable
{
public:
// Tiles can be stored individually (External and ExternalSaved) or in grouped files (Local).
// ExternalSaved still have an entry in the table. In this case the addess data is not valid.
// ExternalSaved still have an entry in the table. In this case the address data is not valid.
enum TileMode {Local,External, ExternalSaved};
@@ -1943,7 +1943,7 @@ public:
*/
bool GetLocalMaterial(int32 nth,trpgLocalMaterial &locMat) const;
/* Return a pointer to the list of locally defined materials.
See GetLocalMaterial for an explantion of local materials.
See GetLocalMaterial for an explanation of local materials.
*/
const std::vector<trpgLocalMaterial> *GetLocalMaterialList(void) const;
// {secret}
@@ -2618,7 +2618,7 @@ protected:
In TerraPage 2.0 we added the Range Index field. This field is here to help
run-time systems gracefully degrade visual fidelity. The trpgLod node still acts
like a normal LOD and you can safely ignore the range index field. If, however,
you want to use it, please read the documention on the trpgRangeTable for further
you want to use it, please read the documentation on the trpgRangeTable for further
information.
{group:Read/Write Classes}
@@ -2692,7 +2692,7 @@ protected:
don't sweat it.
If you're doing a TerraPage writer, this is fairly simple. Obey the ordering
contraints and try to keep this simple. Ideally that would mean just a few
constraints and try to keep this simple. Ideally that would mean just a few
trpgGeometry nodes below this node. Also keep in mind that layering works
very poorly on most OpenGL systems.
{group:Read/Write Classes}

2
src/osgPlugins/txp/trpage_io.h
View File

@@ -357,7 +357,7 @@ public:
virtual void Add(const std::string &);
/* Endianness is something the child class buffer type must set and use.
This function returns the endiannes of the current buffer. */
This function returns the endianness of the current buffer. */
virtual trpgEndian GetEndian(void) { return ness; }
protected:

2
src/osgPlugins/txp/trpage_managers.h
View File

@@ -296,7 +296,7 @@ protected:
// loaded list.
virtual void AckLoad();
// Get the lsit of
// Get the list of
//bool GetLoadedTile
// Return the next tile to unload for this terrain lod

2
src/osgPlugins/txp/trpage_print.h
View File

@@ -112,7 +112,7 @@ public:
// After parsing this will return the number of trpgChildRef node found.
unsigned int GetNbChildrenRef() const;
// This will return the trpgChildRef node associated with the index.
// this will retrun 0 if idx is out of bound
// this will return 0 if idx is out of bound
const trpgChildRef* GetChildRef(unsigned int idx) const;
protected:
trpgPrintBuffer *pBuf;

2
src/osgPlugins/xine/video_out_rgb.h
View File

@@ -77,7 +77,7 @@ typedef enum
* RGBout will pass it a buffer containing pixels in the format
* specified by "format" (generally you have only to BLIT
* the buffer if you want to display the frame).
* "levels" selects which RGB level is visible (if you dont't
* "levels" selects which RGB level is visible (if you don't
* need this feature, set it to PXLEVEL_ALL).
*
* N.B.: DO NOT FREE THE BUFFER

2
src/osgPlugins/zip/unzip.cpp
View File

@@ -3705,7 +3705,7 @@ int unzOpenCurrentFile (unzFile file, const char *password)
// Read bytes from the current file.
// buf contain buffer where data must be copied
// len the size of buf.
// return the number of byte copied if somes bytes are copied (and also sets *reached_eof)
// return the number of byte copied if some bytes are copied (and also sets *reached_eof)
// return 0 if the end of file was reached. (and also sets *reached_eof).
// return <0 with error code if there is an error. (in which case *reached_eof is meaningless)
// (UNZ_ERRNO for IO error, or zLib error for uncompress error)