From eaa10899d070167fe36186ed56c64b042ac81ad4 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 8 Dec 2010 14:49:24 +0100 Subject: [PATCH] Changed: #878 Fix typos in comments/code --- code/nel/include/nel/3d/ps_force.h | 8 ++++---- code/nel/include/nel/3d/vertex_program_parse.h | 2 +- code/nel/src/3d/driver/opengl/driver_opengl.cpp | 2 +- code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp | 1 - code/nel/src/net/callback_client.cpp | 3 ++- code/nel/tools/3d/panoply_maker/color_modifier.cpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/nel/include/nel/3d/ps_force.h b/code/nel/include/nel/3d/ps_force.h index 9c583bdae..5e961dc43 100644 --- a/code/nel/include/nel/3d/ps_force.h +++ b/code/nel/include/nel/3d/ps_force.h @@ -70,16 +70,16 @@ public: virtual void show() = 0; /// Serial the force definition. MUST be called by deriver during their serialisation - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); /// check whether this force is integrable over time. The default is false - virtual bool isIntegrable(void) const { return false; } + virtual bool isIntegrable(void) const { return false; } /// inherited from CPSLocatedBindableTarget, we use that to tell whether this force is integrable or not - virtual void attachTarget(CPSLocated *ptr); + virtual void attachTarget(CPSLocated *ptr); /// inherited from CPSLocatedBindableTarget - void releaseTargetRsc(CPSLocated *target); + void releaseTargetRsc(CPSLocated *target); /** Integrate this force on the given located. If 'accumulate' is set to true, it just add the effect of this force on position diff --git a/code/nel/include/nel/3d/vertex_program_parse.h b/code/nel/include/nel/3d/vertex_program_parse.h index a66c7064e..d254b3f46 100644 --- a/code/nel/include/nel/3d/vertex_program_parse.h +++ b/code/nel/include/nel/3d/vertex_program_parse.h @@ -184,7 +184,7 @@ public: typedef std::vector TProgram; public: /** Parse a vertex program, and convert to proprietary format. - * It is intended to be use by a driver implementation. + * It is intended to be used by a driver implementation. * \warning: Only syntax is checked. It doesn't check that a register has been initialised before use. * \param src The input text of a vertex program, in OpenGL format. * \param result The result program. diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp index 34159f86c..f74f7b052 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp @@ -2425,7 +2425,7 @@ bool CDriverGL::getAdapter(uint adapter, CAdapter &desc) const desc.Driver = (const char *) glGetString (GL_VERSION); desc.Vendor= (const char *) glGetString (GL_VENDOR); - desc.Description = "Default openGL adapter"; + desc.Description = "Default OpenGL adapter"; desc.DeviceId = 0; desc.DriverVersion = 0; desc.Revision = 0; diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp index b67648e66..9aaa675a6 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp @@ -883,7 +883,6 @@ void CDriverGL::setupGlArraysStd(CVertexBufferInfo &vb) case CVertexBufferInfo::HwNVIDIA: case CVertexBufferInfo::HwARB: { - // setup vertex ptr. //----------- uint numVertexCoord = CVertexBuffer::NumComponentsType[vb.Type[CVertexBuffer::Position]]; diff --git a/code/nel/src/net/callback_client.cpp b/code/nel/src/net/callback_client.cpp index 87c12fefe..6f6011f38 100644 --- a/code/nel/src/net/callback_client.cpp +++ b/code/nel/src/net/callback_client.cpp @@ -19,7 +19,8 @@ #include "nel/misc/types_nl.h" #include "nel/net/callback_net_base.h" #include "nel/net/callback_client.h" -#include "nel/net/net_log.h" +#include "nel/net/net_log.h" + #ifdef USE_MESSAGE_RECORDER #include "nel/net/message_recorder.h" diff --git a/code/nel/tools/3d/panoply_maker/color_modifier.cpp b/code/nel/tools/3d/panoply_maker/color_modifier.cpp index 1aab4b9d2..57aac026b 100644 --- a/code/nel/tools/3d/panoply_maker/color_modifier.cpp +++ b/code/nel/tools/3d/panoply_maker/color_modifier.cpp @@ -63,7 +63,7 @@ void CColorModifier::convertBitmap(NLMISC::CBitmap &destBitmap, const NLMISC::CB result.buildFromHLS(h + deltaH, l + Lightness, s + Saturation); - /// apply contrasts + /// apply contrasts result.R = CalcBrightnessContrast(result.R, Luminosity, Contrast, grey); result.G = CalcBrightnessContrast(result.G, Luminosity, Contrast, grey); result.B = CalcBrightnessContrast(result.B, Luminosity, Contrast, grey);