From 5a16a9ccfdbdacb864c5a1f28d46330f74323bc9 Mon Sep 17 00:00:00 2001 From: hybrid Date: Tue, 6 Nov 2007 23:29:59 +0000 Subject: [PATCH] Some code doc updates by Dorth. git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@1040 dfc29bdd-3216-0410-991c-e03cc46cb475 --- include/ISceneManager.h | 2 +- include/SMaterial.h | 12 +++---- source/Irrlicht/BuiltInFont.h | 2 +- source/Irrlicht/CDefaultGUIElementFactory.cpp | 8 ++--- source/Irrlicht/CDefaultGUIElementFactory.h | 36 +++++++++---------- source/Irrlicht/CGUIButton.cpp | 8 ++--- source/Irrlicht/COpenGLMaterialRenderer.h | 2 +- source/Irrlicht/COpenGLNormalMapRenderer.cpp | 2 +- .../Irrlicht/COpenGLParallaxMapRenderer.cpp | 4 +-- .../COpenGLShaderMaterialRenderer.cpp | 2 +- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/include/ISceneManager.h b/include/ISceneManager.h index 6da82440..f64ae5c2 100644 --- a/include/ISceneManager.h +++ b/include/ISceneManager.h @@ -64,7 +64,7 @@ namespace scene //! This value will never be returned by ISceneManager::getSceneNodeRenderPass(). //! The scene manager will determine by itself if an object is //! transparent or solid and register the object as SNRT_TRANSPARENT or - //! SNRT_SOLD automaticly if you call registerNodeForRendering with this + //! SNRT_SOLD automatically if you call registerNodeForRendering with this //! value (which is default). Note that it will register the node only as ONE type. //! If your scene node has both solid and transparent material types register //! it twice (one time as SNRT_SOLID, the other time as SNRT_TRANSPARENT) and diff --git a/include/SMaterial.h b/include/SMaterial.h index d1034797..ac3e1cc7 100644 --- a/include/SMaterial.h +++ b/include/SMaterial.h @@ -35,7 +35,7 @@ namespace video EBF_SRC_ALPHA_SATURATE // src (min(srcA, 1-destA), idem, ...) }; - //! MaterialTypeParam: eg. DirectX: D3DTOP_MODULATE, D3DTOP_MODULATE2X, D3DTOP_MODULATE4X + //! MaterialTypeParam: e.g. DirectX: D3DTOP_MODULATE, D3DTOP_MODULATE2X, D3DTOP_MODULATE4X enum E_MODULATE_FUNC { EMFN_MODULATE_1X = 1, @@ -166,12 +166,12 @@ namespace video \endcode */ f32 Shininess; - //! Free parameter dependend on the material type. + //! Free parameter, dependent on the material type. /** Mostly ignored, used for example in EMT_PARALLAX_MAP_SOLID and EMT_TRANSPARENT_ALPHA_CHANNEL. */ f32 MaterialTypeParam; - //! Second free parameter dependend on the material type. + //! Second free parameter, dependent on the material type. /** Mostly ignored. */ f32 MaterialTypeParam2; @@ -197,16 +197,16 @@ namespace video bool Lighting; //! Is the ZBuffer enabled? Default: true - //! Changed from Bool to Integer + //! Changed from bool to integer // ( 0 == ZBuffer Off, 1 == ZBuffer LessEqual, 2 == ZBuffer Equal ) u32 ZBuffer; - //! May be written to the zbuffer or is it readonly. + //! Is the zbuffer writeable or is it read-only. /** Default: 1 This flag is ignored, if the MaterialType is a transparent type. */ bool ZWriteEnable; - //! Is backfaceculling enabled? Default: true + //! Is backface culling enabled? Default: true bool BackfaceCulling; //! Is fog enabled? Default: false diff --git a/source/Irrlicht/BuiltInFont.h b/source/Irrlicht/BuiltInFont.h index f2793f1a..bc0a4c25 100644 --- a/source/Irrlicht/BuiltInFont.h +++ b/source/Irrlicht/BuiltInFont.h @@ -8,7 +8,7 @@ #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ -// headerfile generated by Bin2H, copyright 2002 by N.Gebhardt. +// header file generated by Bin2H, copyright 2002 by N.Gebhardt. // Bin2H is Freeware. Download it freely from www.code3d.com. // for the source bitmap, see builtInFont.bmp diff --git a/source/Irrlicht/CDefaultGUIElementFactory.cpp b/source/Irrlicht/CDefaultGUIElementFactory.cpp index 8447505a..534c77a0 100644 --- a/source/Irrlicht/CDefaultGUIElementFactory.cpp +++ b/source/Irrlicht/CDefaultGUIElementFactory.cpp @@ -99,14 +99,14 @@ IGUIElement* CDefaultGUIElementFactory::addGUIElement(const c8* typeName, IGUIEl } -//! returns amount of element types this factory is able to create +//! Returns the amount of element types this factory is able to create. s32 CDefaultGUIElementFactory::getCreatableGUIElementTypeCount() const { return EGUIET_COUNT; } -//! returns type of a createable element type +//! Returns the type of a createable element type. EGUI_ELEMENT_TYPE CDefaultGUIElementFactory::getCreateableGUIElementType(s32 idx) const { if (idx>=0 && idx=0 && idx& pos) { if (Image) @@ -348,7 +348,7 @@ void CGUIButton::setPressedImage(video::ITexture* image) PressedImage->grab(); } -//! Sets an image which should be displayed on the button when it is in pressed state. +//! Sets the image which should be displayed on the button when it is in its pressed state. void CGUIButton::setPressedImage(video::ITexture* image, const core::rect& pos) { if (PressedImage) diff --git a/source/Irrlicht/COpenGLMaterialRenderer.h b/source/Irrlicht/COpenGLMaterialRenderer.h index 6a82a72d..3b6b911f 100644 --- a/source/Irrlicht/COpenGLMaterialRenderer.h +++ b/source/Irrlicht/COpenGLMaterialRenderer.h @@ -479,7 +479,7 @@ public: if (Driver->queryFeature(EVDF_MULTITEXTURE)) { - // detailmap + // detail map Driver->extGlActiveTexture(GL_TEXTURE1_ARB); diff --git a/source/Irrlicht/COpenGLNormalMapRenderer.cpp b/source/Irrlicht/COpenGLNormalMapRenderer.cpp index 6f3220fd..0f3d01db 100644 --- a/source/Irrlicht/COpenGLNormalMapRenderer.cpp +++ b/source/Irrlicht/COpenGLNormalMapRenderer.cpp @@ -260,7 +260,7 @@ void COpenGLNormalMapRenderer::OnSetConstants(IMaterialRendererServices* service core::matrix4 tr(worldViewProj.getTransposed()); services->setVertexShaderConstant(tr.pointer(), 8, 4); - // here we've got to fetch the fixed function lights from the driver + // here we fetch the fixed function lights from the driver // and set them as constants u32 cnt = driver->getDynamicLightCount(); diff --git a/source/Irrlicht/COpenGLParallaxMapRenderer.cpp b/source/Irrlicht/COpenGLParallaxMapRenderer.cpp index a63e401c..28538356 100644 --- a/source/Irrlicht/COpenGLParallaxMapRenderer.cpp +++ b/source/Irrlicht/COpenGLParallaxMapRenderer.cpp @@ -216,7 +216,7 @@ COpenGLParallaxMapRenderer::COpenGLParallaxMapRenderer(video::COpenGLDriver* dri CallBack = this; - // basicly, this thing simply compiles these hardcoded shaders if the + // basically, this simply compiles the hard coded shaders if the // hardware is able to do them, otherwise it maps to the base material if (!driver->queryFeature(video::EVDF_ARB_FRAGMENT_PROGRAM_1) || @@ -317,7 +317,7 @@ void COpenGLParallaxMapRenderer::OnSetConstants(IMaterialRendererServices* servi core::matrix4 tr(worldViewProj.getTransposed()); services->setVertexShaderConstant(tr.pointer(), 8, 4); - // here we've got to fetch the fixed function lights from the driver + // here we fetch the fixed function lights from the driver // and set them as constants u32 cnt = driver->getDynamicLightCount(); diff --git a/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp b/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp index 0005f633..69a7aca0 100644 --- a/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp +++ b/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp @@ -80,7 +80,7 @@ void COpenGLShaderMaterialRenderer::init(s32& outMaterialTypeNr, const c8* verte if (!createPixelShader(pixelShaderProgram)) return; - // register myself as new material + // register as a new material outMaterialTypeNr = Driver->addMaterialRenderer(this); }