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

2
examples/osgAndroidExampleGLES1/AndroidManifest.xml
View File

@@ -5,7 +5,7 @@
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:targetSdkVersion="8" android:minSdkVersion="8"></uses-sdk>
<uses-feature android:glEsVersion="0x00010001"/> <!-- OpenGL min requierements (1.1) -->
<uses-feature android:glEsVersion="0x00010001"/> <!-- OpenGL min requirements (1.1) -->
<uses-permission android:name="android.permission.INTERNET"/>
<application android:label="@string/app_name" android:icon="@drawable/osg">

2
examples/osgAndroidExampleGLES2/AndroidManifest.xml
View File

@@ -5,7 +5,7 @@
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:targetSdkVersion="8" android:minSdkVersion="8"></uses-sdk>
<uses-feature android:glEsVersion="0x00020000"/> <!-- OpenGL min requierements (2.0) -->
<uses-feature android:glEsVersion="0x00020000"/> <!-- OpenGL min requirements (2.0) -->
<uses-permission android:name="android.permission.INTERNET"/>
<application android:label="@string/app_name" android:icon="@drawable/osg">

2
examples/osganimationhardware/osganimationhardware.cpp
View File

@@ -84,7 +84,7 @@ struct MyRigTransformHardware : public osgAnimation::RigTransformHardware
CommonProgram = new osg::Program;
CommonProgram->setName("HardwareSkinning");
//set default source if _shader is not user setted
//set default source if _shader is not user set
if (!vertexshader.valid())
{
vertexshader = osgDB::readRefShaderFile(osg::Shader::VERTEX,"skinning.vert");

2
examples/osgautocapture/osgautocapture.cpp
View File

@@ -245,7 +245,7 @@ int main( int argc, char **argv )
traits->depth = src_traits->depth;
traits->pbuffer = true;
} else {
//viewer would use fullscreen size (unknown here) pbuffer will use 4096 x4096 (or best avaiable)
//viewer would use fullscreen size (unknown here) pbuffer will use 4096 x4096 (or best available)
traits->width = 1 << 12;
traits->height = 1 << 12;
traits->pbuffer = true;

2
examples/osgcluster/osgcluster.cpp
View File

@@ -509,7 +509,7 @@ int main( int argc, char **argv )
// any option left unread are converted into errors to write out later.
arguments.reportRemainingOptionsAsUnrecognized();
// report any errors if they have occurred when parsing the program aguments.
// report any errors if they have occurred when parsing the program arguments.
if (arguments.errors())
{
arguments.writeErrorMessages(std::cout);

2
examples/osgdepthpeeling/DePee.h
View File

@@ -91,7 +91,7 @@ private:
bool createMap(MapMode mapMode, bool first=false);
/*!
Creates a two dimensional noise map and initalizes _noiseMap with it
Creates a two dimensional noise map and initializes _noiseMap with it
*/
bool createNoiseMap();

2
examples/osgdepthpeeling/DePeePass.h
View File

@@ -34,7 +34,7 @@ class DePeePass
DePeePass();
/*!
Desctructor cleans the whole depth peeling pass
Destructor cleans the whole depth peeling pass
*/
~DePeePass();

2
examples/osgfpdepth/osgfpdepth.cpp
View File

@@ -381,7 +381,7 @@ AppState::AppState(osgViewer::Viewer* viewer_)
textProjection = new Projection;
textProjection->setMatrix(Matrix::ortho2D(0,1280,0,1024));
textProjection->addChild(textGeode);
// "texture not available" text displayed when the user trys to
// "texture not available" text displayed when the user tries to
// display the depth texture while multisampling.
osgText::Text* noCanDo = new osgText::Text;
noCanDo->setFont(fontName);

2
examples/osgframerenderer/osgframerenderer.cpp
View File

@@ -74,7 +74,7 @@ int main( int argc, char **argv )
arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options]");
arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
arguments.getApplicationUsage()->addCommandLineOption("-i <filename>","Input scene (or presentation) filename.");
arguments.getApplicationUsage()->addCommandLineOption("-o <filename>","Base ouput filename of the images, recommended to use something like Images/image.png");
arguments.getApplicationUsage()->addCommandLineOption("-o <filename>","Base output filename of the images, recommended to use something like Images/image.png");
arguments.getApplicationUsage()->addCommandLineOption("--cs <filename>","Load pre-generated configuration file for run.");
arguments.getApplicationUsage()->addCommandLineOption("--ouput-cs <filename>","Output configuration file with settings provided on commandline.");
arguments.getApplicationUsage()->addCommandLineOption("-p <filename>","Use specificied camera path file to control camera position.");

2
examples/osggameoflife/osggameoflife.cpp
View File

@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
osg::ArgumentParser arguments(&argc,argv);
// set up the usage document, in case we need to print out how to use this program.
arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates ping pong rendering with FBOs and mutliple rendering branches. It uses Conway's Game of Life to illustrate the concept.");
arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates ping pong rendering with FBOs and multiple rendering branches. It uses Conway's Game of Life to illustrate the concept.");
arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] --startim start_image");
arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
arguments.getApplicationUsage()->addCommandLineOption("--startim","The initial image to seed the game of life with.");

4
examples/osggpucull/osggpucull.cpp
View File

@@ -124,7 +124,7 @@
but if Robert will accept its current implementations ( I mean - primitive
sets that have osg::TextureBuffer in constructor ), I may add it to
osg/include/PrimitiveSet header.
- I used BufferTemplate class writen and published by Aurelien in submission forum
- I used BufferTemplate class written and published by Aurelien in submission forum
some time ago. For some reason this class never got into osg/include, but is
really needed during creation of UBOs, TBOs, and possibly SSBOs in the future.
I added std::vector specialization to that template class.
@@ -1145,7 +1145,7 @@ osg::Group* createAirplane( float detailRatio, const osg::Vec4& hullColor, const
return root.release();
}
// createStaticRendering() shows how to use any OSG graph ( wheter it is single osg::Geode, or sophisticated osg::PagedLOD tree covering whole earth )
// createStaticRendering() shows how to use any OSG graph ( whether it is single osg::Geode, or sophisticated osg::PagedLOD tree covering whole earth )
// as a source of instance data. This way, the OSG graph of arbitrary size is at first culled using typical OSG mechanisms, then remaining osg::Geometries
// are sent to cull shader ( cullProgram ). Cull shader does not draw anything to screen ( thanks to GL_RASTERIZER_DISCARD mode ), but calculates if particular
// instances - sourced from above mentioned osg::Geometries - are visible and what LODs for these instances should be rendered.

2
examples/osghangglide/osghangglide.cpp
View File

@@ -125,7 +125,7 @@ int main( int argc, char **argv )
osg::ArgumentParser arguments(&argc,argv);
// set up the usage document, in case we need to print out how to use this program.
arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates how to create a scene programatically, in this case a hang gliding flying site.");
arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates how to create a scene programmatically, in this case a hang gliding flying site.");
arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");

2
examples/osglight/osglight.cpp
View File

@@ -39,7 +39,7 @@
#include "stdio.h"
// callback to make the loaded model oscilate up and down.
// callback to make the loaded model oscillate up and down.
class ModelTransformCallback : public osg::NodeCallback
{
public:

2
examples/osgmemorytest/osgmemorytest.cpp
View File

@@ -326,7 +326,7 @@ int main( int argc, char **argv )
arguments.getApplicationUsage()->addCommandLineOption("--texture <width> <height> <depth>","Allocate a 3D texture of specified dimensions.");
arguments.getApplicationUsage()->addCommandLineOption("--texture <width> <height>","Allocate a 2D texture of specified dimensions.");
arguments.getApplicationUsage()->addCommandLineOption("--texture <width>","Allocate a 1D texture of specified dimensions.");
arguments.getApplicationUsage()->addCommandLineOption("--geometry <width> <height>","Allocate a osg::Geometry representing a grid of specified size, using OpenGL Dislay Lists.");
arguments.getApplicationUsage()->addCommandLineOption("--geometry <width> <height>","Allocate a osg::Geometry representing a grid of specified size, using OpenGL Display Lists.");
arguments.getApplicationUsage()->addCommandLineOption("--geometry-va <width> <height>","Allocate a osg::Geometry representing a grid of specified size, using Vertex Arrays.");
arguments.getApplicationUsage()->addCommandLineOption("--geometry-vbo <width> <height>","Allocate a osg::Geometry representing a grid of specified size, using Vertex Buffer Objects.");
arguments.getApplicationUsage()->addCommandLineOption("--fbo <width> <height>","Allocate a FrameBufferObject of specified dimensions.");

2
examples/osgoccluder/osgoccluder.cpp
View File

@@ -290,7 +290,7 @@ int main( int argc, char **argv )
arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates use of convex planer occluders.");
arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
arguments.getApplicationUsage()->addCommandLineOption("-m","Mannually create occluders");
arguments.getApplicationUsage()->addCommandLineOption("-m","Manually create occluders");
// initialize the viewer.
osgViewer::Viewer viewer;

2
examples/osgparticle/osgparticle.cpp
View File

@@ -444,7 +444,7 @@ void build_world(osg::Group *root)
// the second one will be a little bit more complex, showing how to
// create custom operators.
// To avoid inserting too much code in a single function, we have
// splitted the work into two functions which accept a Group node as
// split the work into two functions which accept a Group node as
// parameter, and return a pointer to the particle system they created.
osgParticle::ParticleSystem *ps1 = create_simple_particle_system(root);

2
examples/osgparticleeffects/osgparticleeffects.cpp
View File

@@ -317,7 +317,7 @@ public:
// insert particle effects alongside the hit node, therefore able to track that nodes movement,
// however, this does require us to insert the ParticleSystem itself into the root of the scene graph
// separately from the main particle effects group which contains the emitters and programs.
// the follow code block implements this, note the path for handling particle effects which arn't attached to
// the follow code block implements this, note the path for handling particle effects which aren't attached to
// moving models is easy - just a single line of code!
// tell the effects not to attach to the particle system locally for rendering, as we'll handle add it into the

2
examples/osgparticleshader/osgparticleshader.cpp
View File

@@ -155,7 +155,7 @@ int main( int argc, char** argv )
root->addChild( parent.get() );
root->addChild( updater.get() );
// FIXME 2010.9.19: the updater can't be a drawable; otehrwise the ParticleEffect will not work properly. why?
// FIXME 2010.9.19: the updater can't be a drawable; otherwise the ParticleEffect will not work properly. why?
updater->addParticleSystem( ps.get() );
osg::ref_ptr<osg::Geode> geode = new osg::Geode;

2
examples/osgphotoalbum/osgphotoalbum.cpp
View File

@@ -747,7 +747,7 @@ int main( int argc, char **argv )
osg::ref_ptr<Album> album = new Album(arguments,width,height);
// creat the scene from the file list.
// create the scene from the file list.
osg::ref_ptr<osg::Group> rootNode = album->getScene();
if (!rootNode) return 0;

2
examples/osgpresentation/osgpresentation.cpp
View File

@@ -50,7 +50,7 @@ int main(int argc, char** argv)
if (script.valid()) scripts.push_back(script.get());
}
// assgin script engine to scene graphs
// assign script engine to scene graphs
model->getOrCreateUserDataContainer()->addUserObject(osgDB::readFile<osg::ScriptEngine>("ScriptEngine.lua"));
model->getOrCreateUserDataContainer()->addUserObject(osgDB::readFile<osg::ScriptEngine>("ScriptEngine.python"));
model->getOrCreateUserDataContainer()->addUserObject(osgDB::readFile<osg::ScriptEngine>("ScriptEngine.js"));

4
examples/osgsampler/osgSampler.cpp
View File

@@ -120,7 +120,7 @@ int main(int argc, char* argv[])
sampler2=(osg::Sampler*)(*it)->getTextureAttribute(0, osg::StateAttribute::SAMPLER);
}
if(sampler1.valid()&&sampler2.valid()){
OSG_WARN<<"2samplers manipulator setted"<<std::endl;
OSG_WARN<<"2samplers manipulator set"<<std::endl;
viewer.addEventHandler(new SamplersKeyboardEventHandler(sampler1.get(), sampler2.get()));
}
}
@@ -185,7 +185,7 @@ int main(int argc, char* argv[])
im->dirty();
tex2->setImage(im);
}
///Overrided Filtering setup
///Overridden Filtering setup
tex1->setFilter(osg::Texture::MAG_FILTER,osg::Texture::NEAREST);
tex1->setFilter(osg::Texture::MIN_FILTER,osg::Texture::NEAREST);

2
examples/osgslice/osgslice.cpp
View File

@@ -187,7 +187,7 @@ int main( int argc, char **argv )
// pass frame stamp to the SceneView so that the update, cull and draw traversals all use the same FrameStamp
sceneView->setFrameStamp(frameStamp.get());
// update the viewport dimensions, incase the window has been resized.
// update the viewport dimensions, in case the window has been resized.
sceneView->setViewport(0,0,traits->width,traits->height);

2
examples/osgstereoimage/osgstereoimage.cpp
View File

@@ -610,7 +610,7 @@ int main( int argc, char **argv )
osg::TexMat* texmatLeft = new osg::TexMat;
osg::TexMat* texmatRight = new osg::TexMat;
// creat the scene from the file list.
// create the scene from the file list.
osg::ref_ptr<osg::Switch> rootNode;
if (!onDisk) rootNode = createScene(fileList,texmatLeft,texmatRight,radius,height,length);
else rootNode=new osg::Switch();

2
examples/osgteapot/osgteapot.cpp
View File

@@ -235,7 +235,7 @@ class Teapot : public osg::Drawable
// of OpenGL primitives.
virtual void drawImplementation(osg::RenderInfo&) const
{
// teapot(..) doens't use vertex arrays at all so we don't need to toggle their state
// teapot(..) doesn't use vertex arrays at all so we don't need to toggle their state
// if we did we'd need to something like following call
// state.disableAllVertexArrays(), see src/osg/Geometry.cpp for the low down.

4
examples/osgtext3D/TextNode.h
View File

@@ -61,7 +61,7 @@ class /*OSGTEXT_EXPORT*/ TextTechnique : public osg::Object
/// default TextTechnique implementation used if no other is specified on TextNode
static osg::ref_ptr<TextTechnique>& getDefaultTextTechinque();
/// start building a new charater layout
/// start building a new character layout
virtual void start();
/// called by Layout engine to place individual characters
@@ -70,7 +70,7 @@ class /*OSGTEXT_EXPORT*/ TextTechnique : public osg::Object
/// called by Layout engine to place individual characters
virtual void addCharacter(const osg::Vec3& position, const osg::Vec3& size, Glyph3D* glyph, Style* style);
/// finish building new charater layout
/// finish building new character layout
virtual void finish();
/// provide traversal control

2
examples/osgviewerGTK/osggtkdrawingarea.h
View File

@@ -4,7 +4,7 @@
#include <osgGA/TrackballManipulator>
// This is an implementation of SimpleViewer that is designed to be subclassed
// and used as a GtkDrawingArea in a GTK application. Because of the implemention
// and used as a GtkDrawingArea in a GTK application. Because of the implementation
// of GTK, I was unable to derive from GtkWidget and instead had to "wrap" it.
// Conceptually, however, you can think of an OSGGTKDrawingArea as both an OSG
// Viewer AND GtkDrawingArea.

2
examples/osgvirtualprogram/CreateAdvancedHierachy.cpp
View File

@@ -211,7 +211,7 @@ osg::Node * CreateAdvancedHierarchy( osg::Node * model )
// Set default VirtualProgram in root StateSet
// With main vertex and main fragment shaders calling
// lighting and texture functions defined in aditional shaders
// lighting and texture functions defined in additional shaders
// Lighting is done per vertex using simple directional light
// Texture uses stage 0 TexCoords and TexMap