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

Merge pull request #152 from aluaces/spelling2

Browse Source 
Some spelling fixes in comments.
This commit is contained in:
OpenSceneGraph git repository
2016-10-07 17:05:58 +01:00
committed by GitHub
parent 299452cf84 7f3c92f492
commit 05ed7d1336
22 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ IF(MSVC80 OR MSVC90)
OPTION(OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS "Generate or not manifests files under VS8 for dynamically loaded dlls" ON)
ENDIF()
#the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs.
#the old construct SUBDIRS( was substituted by ADD_SUBDIRECTORY that is to be preferred according on CMake docs.
FOREACH( mylibfolder
OpenThreads
osg

2
src/OpenThreads/win32/Win32BarrierPrivateData.h
View File

@@ -41,7 +41,7 @@ private:
volatile int cnt; // number of waiting threads
volatile int phase; // flag to seperate two barriers
volatile int phase; // flag to separate two barriers
};

2
src/osg/GL.in
View File

@@ -43,7 +43,7 @@
#ifndef WIN32
// Required for compatibility with glext.h sytle function definitions of
// Required for compatibility with glext.h style function definitions of
// OpenGL extensions, such as in src/osg/Point.cpp.
#ifndef APIENTRY
#define APIENTRY

2
src/osg/TextureBuffer.cpp
View File

@@ -138,7 +138,7 @@ void TextureBuffer::apply(State& state) const
TextureObject* textureObject = getTextureObject(contextID);
///This code could be usefull but would require to watch BufferData changes
///This code could be useful but would require to watch BufferData changes
///perhaps a mutable percontext dirtyflag (all reset to true onTextureObjectChanged) would do the trick
#if 0
if (textureObject)

6
src/osgAnimation/RigGeometry.cpp
View File

@@ -32,7 +32,7 @@ osg::BoundingBox RigComputeBoundingBoxCallback::computeBound(const osg::Drawable
return _boundingBox;
// if the computing of bb is invalid (like no geometry inside)
// then dont tag the bounding box as computed
// then don't tag the bounding box as computed
osg::BoundingBox bb = rig.computeBoundingBox();
if (!bb.valid())
return bb;
@@ -72,8 +72,8 @@ RigGeometry::RigGeometry(const RigGeometry& b, const osg::CopyOp& copyop) :
{
// disable the computation of boundingbox for the rig mesh
setComputeBoundingBoxCallback(new RigComputeBoundingBoxCallback);
// we dont copy the RigImplementation yet. because the RigImplementation need to be initialized in a valid graph, with a skeleton ...
// dont know yet what to do with a clone of a RigGeometry
// we don't copy the RigImplementation yet. because the RigImplementation need to be initialized in a valid graph, with a skeleton ...
// don't know yet what to do with a clone of a RigGeometry
}

2
src/osgAnimation/RigTransformHardware.cpp
View File

@@ -96,7 +96,7 @@ bool RigTransformHardware::createPalette(int nbVertexes, BoneMap boneMap, const
for (VertexInfluenceSet::BoneWeightList::const_iterator it = boneWeightList.begin(); it != boneWeightList.end(); ++it)
{
const VertexInfluenceSet::BoneWeight& bw = *it;
if(fabs(bw.getWeight()) > 1e-2) // dont use bone with weight too small
if(fabs(bw.getWeight()) > 1e-2) // don't use bone with weight too small
{
if (boneNameCountMap.find(bw.getBoneName()) != boneNameCountMap.end())
{

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

@@ -7,7 +7,7 @@
// SGI Inventor , or TGS Inventor.
//
//
// Autor: PCJohn (peciva _at fit.vutbr.cz)
// Author: PCJohn (peciva _at fit.vutbr.cz)
//
// License: public domain
//

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

@@ -2343,7 +2343,7 @@ DNSServiceErrorType DNSSD_API DNSServiceSetDefaultDomainForUser
* and report errors at compile-time if anything is wrong. The usual way to do this would
* be to use a run-time "if" statement or the conventional run-time "assert" mechanism, but
* then you don't find out what's wrong until you run the software. This way, if the assertion
* condition is false, the array size is negative, and the complier complains immediately.
* condition is false, the array size is negative, and the compiler complains immediately.
*/
struct CompileTimeAssertionChecks_DNS_SD

8
src/osgPlugins/cfg/Camera.h
View File

@@ -87,10 +87,10 @@ class Camera : public osg::Referenced
viewing frustum.
farClip - Distance from the viewer to the far plane of the
viewing frustum.
xshear- Assymetrical shear in viewing frustum in the horizontal
xshear- Asymmetrical shear in viewing frustum in the horizontal
direction. Value given in normalized device coordinates
(see setShear() below).
yshear- Assymetrical shear in viewing frustum in the vertical
yshear- Asymmetrical shear in viewing frustum in the vertical
direction. Value given in normalized device coordinates
(see setShear() below).
*/
@@ -100,10 +100,10 @@ class Camera : public osg::Referenced
/** Set the Projection type to be of Perspective and provide
the dimensions of the left, right, bottom, top, nearClip and farClip
extents of the viewing frustum as indicated.
xshear- Assymetrical shear in viewing frustum in the horizontal
xshear- Asymmetrical shear in viewing frustum in the horizontal
direction. Value given in normalized device coordinates
(see setShear() below).
yshear- Assymetrical shear in viewing frustum in the vertical
yshear- Asymmetrical shear in viewing frustum in the vertical
direction. Value given in normalized device coordinates
(see setShear() below).
*/

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

@@ -240,7 +240,7 @@ class RenderSurface : public osg::Referenced
#if 0
/** Set the current window cursor. Producer provides no functionality to create
* cursors. It is the application's responsiblity to create a Cursor using the
* cursors. It is the application's responsibility to create a Cursor using the
* windowing system of choice. setCursor() will simply set a predefined cursor
* as the current Cursor */
void setCursor( Cursor );

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

@@ -131,7 +131,7 @@ class VisualChooser : public osg::Referenced
#if 0
//-------------------------------------------------------------------------
// Chooses visual based on previously selected attributes and parameters
// dpy = Conection to Xserver as returned by XOpenDisplay()
// dpy = Connection to Xserver as returned by XOpenDisplay()
// screen = XServer screen (Could be DefaultScreen(dpy))
// strict_adherence = If true, return NULL visual info if the set of
// parameters is not matched verbatim. If set to

2
src/osgPlugins/lwo/README.txt
View File

@@ -6,7 +6,7 @@ features (and drawbacks) of the original converter but it doesn't replace
it completely.
I'm planning to further enhance the stand-alone converter by adding osgNV
compatibility and I can't do this on the plugin version because I'm not going
to introduce a dependancy to osgNV into OSG.
to introduce a dependency to osgNV into OSG.
There is also a LWS plugin which reads Lightwave scene files; make sure you
only read scene files that point to LWO2 (not LWO1) objects, otherwise you may
experience problems (the LWO1 plugin doesn't convert the coordinate system

4
src/osgPlugins/obj/spec_obj.txt
View File

@@ -859,7 +859,7 @@ surf s0 s1 t0 t1 v1/vt1/vn1 v2/vt2/vn2 . . .
For a non-rational surface, the control vertices are 3D. For a
rational surface the control vertices can be 3D or 4D. The fourth
coordinate (weight) defaults to 1.0 if ommitted.
coordinate (weight) defaults to 1.0 if omitted.
NOTE: For more information on the ordering of control points for
survaces, refer to the section on surfaces and control points in
@@ -1636,7 +1636,7 @@ Grouping
There are four statements in the .obj file to help you manipulate groups
of elements:
o Gropu name statements are used to organize collections of
o Group name statements are used to organize collections of
elements and simplify data manipulation for operations in
Model.

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

@@ -26,7 +26,7 @@
* /my_user_event/value_1 23
* /my_user_event/value_2 42
*
* this will result in one osgGA:Event (when both messages are bundled) witht the name "/my_user_event",
* this will result in one osgGA:Event (when both messages are bundled) with the name "/my_user_event",
* and two user-values (value_1 and value_2)
* To get value_1 you'll do something like event->getUserValue("value_1", my_int);
*

2
src/osgPlugins/pov/POVWriterNodeVisitor.h
View File

@@ -5,7 +5,7 @@
// and writes it to the stream.
//
//
// Autor: PCJohn (peciva _at fit.vutbr.cz)
// Author: PCJohn (peciva _at fit.vutbr.cz)
// developed for research purposes of Cadwork (c) and
// Brno University of Technology (Czech Rep., EU)
//

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

@@ -20,7 +20,7 @@
/**
* the class MovieData encapsulates all quicktime-related stuff, so it doesn't polute the namespaces
* the class MovieData encapsulates all quicktime-related stuff, so it doesn't pollute the namespaces
* it handles all calls to quicktime etc... It is mainly used by the QuicktimeImageStream, it is
* rarely needed in other contexts
*/

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

@@ -32,7 +32,7 @@ class QuicktimeImportExport {
/** get the last error-message */
const std::string getLastErrorString() { return _lastError; }
/** return true if no error occured */
/** return true if no error occurred */
bool success() { return (_error == false); }
protected:

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

@@ -1518,7 +1518,7 @@ protected:
more like tile terrain geometry. In that case there is scene node type data (LODs,
groups, geometry, etc...) associated with it.
trpgModel objects live within a trpgModelTable. They are indexed there and refered
trpgModel objects live within a trpgModelTable. They are indexed there and referred
to by trpgModelRef objects. Those model references are the only things that explicitly
use trpgModel objects.
@@ -2320,7 +2320,7 @@ protected:
deep they may be) then a pop.
All groups have IDs. These IDs are unique among groups and group-like things
(i.e. LODs) and are used to hook trpgAttach geometry into a scene graph hierachy
(i.e. LODs) and are used to hook trpgAttach geometry into a scene graph hierarchy
as you page in higher terrain levels of detail.
If you're doing a TerraPage reader, the group tells you to put together

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

@@ -310,7 +310,7 @@ public:
float64 red,green,blue;
};
// Used to specify machine endianess
// Used to specify machine endianness
typedef enum {LittleEndian,BigEndian} trpgEndian;
/* This is a base class for an abstract buffer type.
@@ -444,7 +444,7 @@ protected:
};
/* This is a virtual base class for reading data from a device.
The device implementation is left as an excercise to the sub class.
The device implementation is left as an exercise to the sub class.
This class contains methods for getting data that must be filled in
as well as helper methods that call those.
{group:Low Level I/O}
@@ -518,7 +518,7 @@ protected:
/* This virtual method must be filled in by the subclass so that SkipToLimit
will work correctly. */
virtual bool Skip(int) = 0;
/* Utility function that must be called after a successfull read to update
/* Utility function that must be called after a successful read to update
the outside imposed read limits. */
virtual void UpdateLimits(int);
std::vector<int> limits;

4
src/osgViewer/CMakeLists.txt
View File

@@ -62,7 +62,7 @@ IF(WIN32 AND NOT ANDROID)
# Enable workaround for OpenGL driver issues when used in multithreaded/multiscreen with NVidia drivers on Windows XP
# For example: osgviewer dumptruck.osg was showing total garbage (screen looked like shattered, splashed hedgehog)
# There were also serious issues with render to texture cameras.
# Workaround repeats makeCurrentContext call as it was found that this causes the problems to dissapear.
# Workaround repeats makeCurrentContext call as it was found that this causes the problems to disappear.
#
OPTION(OSG_MULTIMONITOR_MULTITHREAD_WIN32_NVIDIA_WORKAROUND "Set to ON if you have NVidia board and drivers earlier than 177.92 ver" OFF)
MARK_AS_ADVANCED(OSG_MULTIMONITOR_MULTITHREAD_WIN32_NVIDIA_WORKAROUND)
@@ -250,7 +250,7 @@ SETUP_LIBRARY(${LIB_NAME})
# install these headers manually since setup_library and moduleinstall
# wouldn't keep the structure, e.g. api/X11/xyz.h
FOREACH(HEADERFILE ${TARGET_H_NO_MODULE_INSTALL} ${CONFIG_HEADER_FILES})
# get relative path to graphics system dependant header
# get relative path to graphics system dependent header
FILE(RELATIVE_PATH REL_INCLUDEFILE ${HEADER_PATH} ${HEADERFILE})
GET_FILENAME_COMPONENT(REL_INCLUDE_PATH ${REL_INCLUDEFILE} PATH)

4
src/osgViewer/DarwinUtils.mm
View File

@@ -372,7 +372,7 @@ static double getDictDouble (CFDictionaryRef refDict, CFStringRef key)
CFNumberRef number_value = (CFNumberRef) CFDictionaryGetValue(refDict, key);
if (!number_value) // if can't get a number for the dictionary
return -1; // fail
if (!CFNumberGetValue(number_value, kCFNumberDoubleType, &value)) // or if cant convert it
if (!CFNumberGetValue(number_value, kCFNumberDoubleType, &value)) // or if can't convert it
return -1; // fail
return value; // otherwise return the long value
}
@@ -384,7 +384,7 @@ static long getDictLong(CFDictionaryRef refDict, CFStringRef key) // cons
CFNumberRef number_value = (CFNumberRef)CFDictionaryGetValue(refDict, key);
if (!number_value) // if can't get a number for the dictionary
return -1; // fail
if (!CFNumberGetValue(number_value, kCFNumberLongType, &value)) // or if cant convert it
if (!CFNumberGetValue(number_value, kCFNumberLongType, &value)) // or if can't convert it
return -1; // fail
return value;
}

2
src/osgViewer/GraphicsWindowIOS.mm
View File

@@ -296,7 +296,7 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
}
//
//Implement dealloc to destory our frame buffer
//Implement dealloc to destroy our frame buffer
//
- (void) dealloc
{