diff --git a/changes.txt b/changes.txt index a1ddd294..36a66db0 100644 --- a/changes.txt +++ b/changes.txt @@ -11,13 +11,13 @@ Changes in 1.8 (??.??.2011) - Add parameter useAlphaChannel to second IGUIEnvironment::addImage function. - Fix vsync on X11 - - - Fix MRT disabling. Bug found and fixed by hendu. + + - Fix MRT disabling. Bug found and fixed by hendu. - core:::array::reallocate returning now immediately when it has nothing to do. Should reduce a lot of memory thrashing on irrArrays. - Start mesh animations at first OnAnimate , before start-frame was rather random. Thx @Auria for reporting and patch proposal. - + - renderTargetTexture now working with ECF_R5G6B5 - add -fPic in c::b linux fast math shared build. @@ -27,7 +27,7 @@ Changes in 1.8 (??.??.2011) - triangle3d::getIntersectionOfPlaneWithLine calculates now with higher precision for more exact results. - triangle3d::isOnSameSide (used by isPointInside) calculates now with higher precision and uses some epsilon to make it work with larger integers and less floating point troubles. Slightly slower now. - + - new function equalsByUlp to test for spacing between floating point numbers. - speedup for collada writing. @@ -41,7 +41,7 @@ Changes in 1.8 (??.??.2011) - replace asserts in tests with macro assert_log to allow running all tests through on problems. - added IGUIElement::setName and IGUIElement::getName (similar to ISceneNode) - + - CSceneCollisionManager::getScreenCoordinatesFrom3DPosition uses now getCurrentRenderTargetSize instead of getScreenSize so it can work with render textures. - line2d::getClosestPoint can now also get the closest point on the line additional to only checking for closest point on the line-segment. @@ -50,7 +50,7 @@ Changes in 1.8 (??.??.2011) - Support for better collada texture wrapping support on loading. - - XML-reader now ignores all whitespace-only EXN_TEXT elements as old way didn't work in cross-platform way (and arguably also not well on Windows). + - XML-reader now ignores all whitespace-only EXN_TEXT elements as old way didn't work in cross-platform way (and arguably also not well on Windows). - CXMLReader initializes IsEmptyElement now. @@ -72,7 +72,7 @@ Changes in 1.8 (??.??.2011) - IGUIEditBox: added missing serialization for Border - - IGUIEditBox: remove bug that added spaces to the end of each line + - IGUIEditBox: remove bug that added spaces to the end of each line - IGUIEditBox: fix crash that happened when wordwrapping was enabled, spaces were entered beyond the border and then cursor-key was pressed. @@ -82,7 +82,7 @@ Changes in 1.8 (??.??.2011) - CDummyTransformationSceneNode::clone() added. - - IParticleSystemSceneNode::doParticleSystem now public to allow rendering outside scenegraph. + - IParticleSystemSceneNode::doParticleSystem now public to allow rendering outside scenegraph. - Renamed IOSOperator::getOperationSystemVersion to getOperatingSystemVersion. Changed return type from wchar_t to core::stringc, as that's the internal representation the name is built on. @@ -100,7 +100,7 @@ Changes in 1.8 (??.??.2011) - Added SMF mesh loader, loads meshes from 3D World Studio. Originally written by Joseph Ellis - - The loader selection process now consistently checks loader lists in reverse order, so new loaders added to Irrlicht override the internal ones. This applies when adding external mesh, image, scene and archive loaders, image writers, plus node, animator and GUI element factories. + - The loader selection process now consistently checks loader lists in reverse order, so new loaders added to Irrlicht override the internal ones. This applies when adding external mesh, image, scene and archive loaders, image writers, plus node, animator and GUI element factories. - Added getters to retrieve mesh, scene and archive loaders. @@ -183,13 +183,13 @@ Changes in 1.8 (??.??.2011) - Compile-defines can now be disabled from Makefiles/Projectfiles instead of having to change IrrCompileConfig.h each time. - IGUITabControl::setActiveTab should only take IGUITab* and not IGUIElement* (thx to greenya for finding) - + - Add new skin-colors: EGDC_GRAY_WINDOW_SYMBOL, EGDC_EDITABLE, EGDC_GRAY_EDITABLE, EGDC_FOCUSED_EDITABLE - + - Disabled state is now extended to sub-elements - + - Make disabled state for several elements more visible - + - Bugfix: Icons in tabcontrol get now affected immediately by skin-changes - Add xml example written by Yoran Bosman. @@ -215,7 +215,7 @@ The following names can be queried for the given types: * MaxTextureLODBias (float) Maximum value for LOD bias. Is usually at around 16, but can be lower on some systems. * Version (int) Version of the driver. Should be Major*100+Minor * ShaderLanguageVersion (int) Version of the high level shader language. Should be Major*100+Minor. - + - Fix getRotationDegrees - Add creation parameter which allows to disable highres timers on Windows upon device creation. @@ -236,7 +236,7 @@ The following names can be queried for the given types: - Add IGUIElement::bringToBack (patch written by DtD, although I'm to blame for the function-name) - - BurningVideo + - BurningVideo - add Normalmap Rendering (one light only), pushed Burningvideo to 0.46 - add Stencil Shadow Rendering (one color only and 32 bit only), pushed Burningvideo to 0.47 @@ -249,13 +249,13 @@ The following names can be queried for the given types: allow to disable the bump/parallax on the earth like in the room ( with transparency ) - added DDS Image files, DXT2, DXT3, DXT4, DXT5, based on code from nvidia and Randy Reddig - + - added Halflife 1 Model Loader (based on code by Fabio Concas) Halflife 1.1.0.8, Counter-Strike 1.6 working -> Load all Textures ( can even optimize it to texture atlas ), all bone animation, all submodels. -> But to make use of the values (named animation, mouth animation) the Interface for IAnimatedMeshSceneNode has to be redone. - + TODO: ->can handle float frames numbers, the interface for getMesh should be reworked This is my idea of a new getMesh interface for IAnimatedMesh @@ -271,20 +271,20 @@ The following names can be queried for the given types: 40.5 0.5 0.5 40.9 0.1 0.9 41.0 0 1 - \param frameB: Frame number as zero based index. The other KeyFrame which is blended with FrameA. + \param frameB: Frame number as zero based index. The other KeyFrame which is blended with FrameA. \param userParam: for Example Level of detail, or something else */ virtual IMesh* getMesh(f32 frameA, s32 frameB = 0,s32 param = 0) = 0; - + For now i used the (unused, always 255) detail level parameter and set a blend percentage as s32 frameNr = (s32) getFrameNr(); s32 frameBlend = (s32) (core::fract ( getFrameNr() ) * 1000.f); return Mesh->getMesh(frameNr, frameBlend, StartFrame, EndFrame); So no interface is affected. - + -> TODO: Quaternion Rotation is done private hand made and should be done with irrlicht quaternions - + - Included 357kb Yodan.mdl mesh and copyright info file from Doug Hillyer to the media directory, used in example 7. collision as 4th model. @@ -303,7 +303,7 @@ The following names can be queried for the given types: - added parameter make_lower to substring ( copy just lower case ) string subString(u32 begin, s32 length, bool make_lower = false ) const - + - ColorConverter added //! converts a 8 bit palettized or non palettized image (A8) into R8G8B8 static void convert8BitTo24Bit(const u8* in, s16* out, s32 width, s32 height, const s32* palette, s32 linepad = 0, bool flip=false); @@ -352,11 +352,11 @@ The following names can be queried for the given types: Changes in 1.7.4 - Change include order to get example 21 compiling on MinGW. - + - Irrlicht.dll has correct name now again (was named libIrrlicht.dll in c::b). This fixes bugreport 3518765 reported by tetho. - + - Fix linker path in example 16 for C::B project file (linker path was in include path section). - + - Link with opengl32 and gdi32 in Example 14 in C::B. - Remove --no-export-all-symbols which got recently added to the windows build as that flag is not known by gcc on Windows. @@ -372,7 +372,7 @@ Changes in 1.7.4 - SceneNodeAnimatorFlyCircle fixes serialization of RadiusEllipsoid (was writing Radius). Thx @ wing64 for reporting. - Yield on Linux now uses nanosleep with 1ns as 0 isn't guaranteed to yield (thx @ hendu for finding + fix) - + ----------------------------- Changes in 1.7.3 (20.02.2012) @@ -383,11 +383,11 @@ Changes in 1.7.3 (20.02.2012) - GUIEditor attributes have now scrollbar to be editable - Remove warning when compiling line2d::intersectWith with other types than f32. - + - Document that triangle3d::isPointInside should not be used with int's. - triangle3d::isPointInsideFast handles 'on-border' cases now consistently. - + - Some more editbox fixes - Harden Linux joystick usage, in case the driver returns illegal values @@ -427,7 +427,7 @@ Changes in 1.7.3 (20.02.2012) - Add integer template specialization for vector3d::getSphericalCoordinateAngles which rounds angles to nearest integer now. - Recalculate FrameRect and ScrollPos in CGUIEditBox when AbsoluteRect gets changed (thx @ serengeor for report + testcase) - + - Fix crash in editbox - Fix 'k' in bigfont.png (thx @ Scrappi for reporting) @@ -437,9 +437,9 @@ Changes in 1.7.3 (20.02.2012) - EMIE_MOUSE_WHEEL messages now handled correctly in several gui-element when wheel isn't just 1.0 or -1.0 (thx @ Reiko for reporting) - Fix problems in Textwrapping in CGUIStaticText. Did use wrong size and did ignore last word of the text (thx @ Reiko for bugreport) - + - Fix crash in collada (.dae) loading - + - Fix bug handling in case RTT is not properly created - Fix SColorf interpolation @@ -497,7 +497,7 @@ Changes in 1.7.3 (20.02.2012) - Fix crash on null-readfile in texture loading - Get particles saved before 1.7.2 (for example in irrEdit) working again (thx to smashly for problem reporting) - + - Fix IGUIScrollBar setMax and setMin which had been restricted wrongly (reported by REDDemon) - Fix CNullDriver::createImage - Creating the image from a texture-rectangle which doesn't start at 0,0 works now again (thx @ ceyron for bugreport+testcase) @@ -529,15 +529,15 @@ Changes in 1.7.2 (15.11.2010) - StaticText does now serialize the background color - - Fix gui-elements which didn't care when skin-colors changed. That made it impossible to make the gui slowly transparent (thx to PI for reporting). + - Fix gui-elements which didn't care when skin-colors changed. That made it impossible to make the gui slowly transparent (thx to PI for reporting). Note that it couldn't be completely fixed for the SpinBox without breaking the interface, so for that element you have to enforce this by calling for example element->setValue(element->getValue()) once. - Fix CXMLReaderImpl::getAttributeValueAsInt which returned wrong values with large integers (thx to squisher for finding) - + - Fix compile problem in swap when using irrlicht in combination with stl (backport from trunk r3281) - Add EGET_TREEVIEW_NODE_COLLAPSE and deprecate EGET_TREEVIEW_NODE_COLLAPS (found by greenya) - + - Fix serialization in CParticleSystemSceneNode (found by B@z) - Prevent crash in BillboardTextSceneNode when a custom font is used. Found and fixed by Nalin (bugtracker id: 3020487) @@ -547,15 +547,15 @@ Changes in 1.7.2 (15.11.2010) Also remove BeginFrameTime in CAnimatedMeshSceneNode as it hasn't been used anymore since some time. - Add framerate and current frame information for animations in example 09 and do some minor cleanup. - + - Added another test for xml-reader. - + - Fix serialization in several particle emitters and affectors (thx to Ion Dune for reporting). - + - Fix compile-error on VS for vector2d::getAngleTrig when used with integers. (thx to greenya for reporting) - + - Fix bug in dimension2d::getInterpolated that caused wrong results when used with integers as template parameter. (thx to Greenya for noticing a warning which made me look over this code). - + - Remove 2 minor memory leaks in meshloaders (found by tool cppcheck-1.43) - reduce file dependencies for IGUIEventReceiver.h (thx ngc92) @@ -572,7 +572,7 @@ Changes in 1.7.2 (15.11.2010) - Fix crash in CGUIListBox when environment was cleared on events - - Bugfix: Clear up depth-textures which could not be attached in OpenGL to prevent crashes. + - Bugfix: Clear up depth-textures which could not be attached in OpenGL to prevent crashes. - Fix arrowMesh boundingbox. @@ -594,12 +594,12 @@ Changes in 1.7.2 (15.11.2010) Changes in 1.7.1 (17.02.2010) - Fix octree with frustum+parent checks enabled (didn't clip at all before). Now using plane-checks instead of edge-checks for frustum-box intersection. - + - Prevent that X11 selects larger resolutions in fullscreen even when perfect fits are available. - Ignore setResizable also on X11 when we're fullscreen to avoid messing up the window mode. - - Work around a crash when pressing ESC after closing a Messagebox (found by Acki) + - Work around a crash when pressing ESC after closing a Messagebox (found by Acki) - Prevent borland compile warnings in SColorHSL::FromRGB and in SVertexColorThresholdManipulator (found by mdeininger) @@ -672,7 +672,7 @@ Changes in 1.7 (03.02.2010) - Add hasType to IGUIElement as a dynamic_cast substitute. - - Add another parameter to IGUISkin::draw3DWindowBackground to allow getting the client area without actually drawing + - Add another parameter to IGUISkin::draw3DWindowBackground to allow getting the client area without actually drawing - Add function getClientRect to IGUIWindow for getting the draw-able area @@ -689,7 +689,7 @@ Changes in 1.7 (03.02.2010) - Allow to set the logging level already in SIrrlichtCreationParameters. - Add clearSystemMessages to devices (implemented only for Linux and Win32 so far). - + - Support changing the render window from beginScene also with OpenGL driver. - Add getMaterial2D which allows to alter the 2d render state settings, such as filtering, anti-aliasing, thickness, etc. @@ -746,7 +746,7 @@ Changes in 1.7 (03.02.2010) - Separate TextureWrap mode into U and V fields - Add mirror texture wrap modes - + - windows show now active/inactive state - remove unneeded drop/grab calls found by manik_sheeri @@ -797,7 +797,7 @@ Changes in 1.7 (03.02.2010) - Active camera not registered twice anymore - - Parallax/normal map shader rotation bug under OpenGL fixed + - Parallax/normal map shader rotation bug under OpenGL fixed - bump map handling for obj files fixed @@ -974,7 +974,7 @@ Changes in 1.6 (23.09.2009) - Made IGUIElements recalculate clipping rectangle after setNotClipped, reported by Aelis440 - - Bug fix for the combo box where it showed white text instead of skin colour before being focused, fix posted by drewbacca + - Bug fix for the combo box where it showed white text instead of skin color before being focused, fix posted by drewbacca - EGDS_MESSAGE_BOX_HEIGHT is now honoured, bug reported by Spkka @@ -1525,9 +1525,9 @@ Changes in 1.6 (23.09.2009) - D3D devices use DISCARD for windowed renderbuffers now, can be faster. - - Changed behaviour of PixelBlend16() / PixelBlend16_simd() so that they treat the 1 bit alpha of the source pixel as boolean, i.e. they draw either the source pixel, or the destination pixel, rather than "blending". (Issue revealed by the fix to IVideoDriver::makeColorKeyTexture()). + - Changed behavior of PixelBlend16() / PixelBlend16_simd() so that they treat the 1 bit alpha of the source pixel as boolean, i.e. they draw either the source pixel, or the destination pixel, rather than "blending". (Issue revealed by the fix to IVideoDriver::makeColorKeyTexture()). - - IVideoDriver::makeColorKeyTexture() bug fixed so that only alphas, not whole texel colors, are zeroed. An optional parameter allows using the old (buggy) behaviour for backwards compatibility. + - IVideoDriver::makeColorKeyTexture() bug fixed so that only alphas, not whole texel colors, are zeroed. An optional parameter allows using the old (buggy) behavior for backwards compatibility. - position2d is now a synonym for vector2d. position2d is therefore marked as deprecated, although it's unlikely to be removed. @@ -1676,7 +1676,7 @@ Changes in version 1.5 (15.12.2008) - Terrain heightmap and texture were flipped in order to draw them as expected (looking onto the terrain from high above will just look like the actual texture/heightmap). - - Significant internal change to the way that FPS camera jump speed and collision response animator gravity interact. The behaviour is now much more realistic, but it will require you to adjust your jump speed and gravity. + - Significant internal change to the way that FPS camera jump speed and collision response animator gravity interact. The behavior is now much more realistic, but it will require you to adjust your jump speed and gravity. - Skybox won't be culled anymore by nearplane or farplane. @@ -2544,7 +2544,7 @@ Font improvements: - Elements can now automatically resize to fit their parents, or align themselves to an edge: setAlignment(left, right, top, bottom) - sets how each edge aligns to its parent, through EGUI_ALIGNMENT enum - EGUIA_UPPERLEFT - default behaviour, aligns to top or left edge + EGUIA_UPPERLEFT - default behavior, aligns to top or left edge EGUIA_LOWERRIGHT - aligns to the lower or right edge EGUIA_CENTER - moves relative to the center of its parent EGUIA_SCALE - uses relative scale @@ -3024,7 +3024,7 @@ Changes in version 0.14.0 (30 November 2005) - Irrlicht.NET now supports shaders. - Irrlicht now loads all textures in 32 bit mode by default. (Previously this - was 16bit). To change this behaviour back again, use + was 16bit). To change this behavior back again, use device->getVideoDriver()->setTextureCreationFlag(ETCF_ALWAYS_16_BIT, true); - Irrlicht.NET now supports Particlesystems and Shaders. Thanks to a code diff --git a/include/ICursorControl.h b/include/ICursorControl.h index 06d3124c..64ebfa95 100644 --- a/include/ICursorControl.h +++ b/include/ICursorControl.h @@ -81,7 +81,7 @@ namespace gui //! platform specific behavior flags for the cursor enum ECURSOR_PLATFORM_BEHAVIOR { - //! default - no platform specific behaviour + //! default - no platform specific behavior ECPB_NONE = 0, //! On X11 try caching cursor updates as XQueryPointer calls can be expensive. diff --git a/include/IEventReceiver.h b/include/IEventReceiver.h index 1a19dff7..fc0a523a 100644 --- a/include/IEventReceiver.h +++ b/include/IEventReceiver.h @@ -53,7 +53,7 @@ namespace irr /** This is not used by Irrlicht and can be used to send user specific data though the system. The Irrlicht 'window handle' can be obtained from IrrlichtDevice::getExposedVideoData() - The usage and behaviour depends on the operating system: + The usage and behavior depends on the operating system: Windows: send a WM_USER message to the Irrlicht Window; the wParam and lParam will be used to populate the UserData1 and UserData2 members of the SUserEvent. @@ -248,8 +248,8 @@ namespace irr //! A tree view node was collapsed. See IGUITreeView::getLastEventNode(). EGET_TREEVIEW_NODE_COLLAPSE, - //! deprecated - use EGET_TREEVIEW_NODE_COLLAPSE instead. This - //! may be removed by Irrlicht 1.9 + //! deprecated - use EGET_TREEVIEW_NODE_COLLAPSE instead. This + //! may be removed by Irrlicht 1.9 EGET_TREEVIEW_NODE_COLLAPS = EGET_TREEVIEW_NODE_COLLAPSE, //! No real event. Just for convenience to get number of events diff --git a/include/IGUIContextMenu.h b/include/IGUIContextMenu.h index 4191b238..8ca87180 100644 --- a/include/IGUIContextMenu.h +++ b/include/IGUIContextMenu.h @@ -11,7 +11,7 @@ namespace irr { namespace gui { - //! Close behaviour. + //! Close behavior. //! Default is ECMC_REMOVE enum ECONTEXT_MENU_CLOSE { @@ -40,10 +40,10 @@ namespace gui IGUIContextMenu(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect rectangle) : IGUIElement(EGUIET_CONTEXT_MENU, environment, parent, id, rectangle) {} - //! set behaviour when menus are closed + //! set behavior when menus are closed virtual void setCloseHandling(ECONTEXT_MENU_CLOSE onClose) = 0; - //! get current behaviour when the menu will be closed + //! get current behavior when the menu will be closed virtual ECONTEXT_MENU_CLOSE getCloseHandling() const = 0; //! Get amount of menu items diff --git a/include/IGeometryCreator.h b/include/IGeometryCreator.h index 82889d58..d539fba7 100644 --- a/include/IGeometryCreator.h +++ b/include/IGeometryCreator.h @@ -71,7 +71,7 @@ public: /** \param texture The texture to apply to the terrain. \param heightmap An image that will be interpreted as a heightmap. The - brightness (average colour) of each pixel is interpreted as a height, + brightness (average color) of each pixel is interpreted as a height, with a 255 brightness pixel producing the maximum height. \param stretchSize The size that each pixel will produce, i.e. a 512x512 heightmap diff --git a/include/ISceneManager.h b/include/ISceneManager.h index a29d4814..32e4e9cf 100644 --- a/include/ISceneManager.h +++ b/include/ISceneManager.h @@ -856,9 +856,9 @@ namespace scene \param vertexColor: The default color of all the vertices. If no texture is associated with the scene node, then all vertices will be this color. Defaults to white. \param maxLOD: The maximum LOD (level of detail) for the node. Only change if you - know what you are doing, this might lead to strange behaviour. + know what you are doing, this might lead to strange behavior. \param patchSize: patch size of the terrain. Only change if you - know what you are doing, this might lead to strange behaviour. + know what you are doing, this might lead to strange behavior. \param smoothFactor: The number of times the vertices are smoothed. \param addAlsoIfHeightmapEmpty: Add terrain node even with empty heightmap. \return Pointer to the created scene node. Can be null @@ -894,9 +894,9 @@ namespace scene \param vertexColor: The default color of all the vertices. If no texture is associated with the scene node, then all vertices will be this color. Defaults to white. \param maxLOD: The maximum LOD (level of detail) for the node. Only change if you - know what you are doing, this might lead to strange behaviour. + know what you are doing, this might lead to strange behavior. \param patchSize: patch size of the terrain. Only change if you - know what you are doing, this might lead to strange behaviour. + know what you are doing, this might lead to strange behavior. \param smoothFactor: The number of times the vertices are smoothed. \param addAlsoIfHeightmapEmpty: Add terrain node even with empty heightmap. \return Pointer to the created scene node. Can be null @@ -1603,7 +1603,7 @@ namespace scene //! Register a custom callbacks manager which gets callbacks during scene rendering. /** \param[in] lightManager: the new callbacks manager. You may pass 0 to remove the - current callbacks manager and restore the default behaviour. */ + current callbacks manager and restore the default behavior. */ virtual void setLightManager(ILightManager* lightManager) = 0; //! Get an instance of a geometry creator. diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h index 861ddc1e..da3c4ae1 100644 --- a/include/IVideoDriver.h +++ b/include/IVideoDriver.h @@ -517,8 +517,8 @@ namespace video position of a pixel instead a color value. \param zeroTexels \deprecated If set to true, then any texels that match the color key will have their color, as well as their alpha, set to zero - (i.e. black). This behaviour matches the legacy (buggy) behaviour prior - to release 1.5 and is provided for backwards compatibility only. + (i.e. black). This behavior matches the legacy (buggy) behavior prior + to release 1.5 and is provided for backwards compatibility only. This parameter may be removed by Irrlicht 1.9. */ virtual void makeColorKeyTexture(video::ITexture* texture, video::SColor color, @@ -534,7 +534,7 @@ namespace video described above. \param zeroTexels \deprecated If set to true, then any texels that match the color key will have their color, as well as their alpha, set to zero - (i.e. black). This behaviour matches the legacy (buggy) behaviour prior + (i.e. black). This behavior matches the legacy (buggy) behavior prior to release 1.5 and is provided for backwards compatibility only. This parameter may be removed by Irrlicht 1.9. */ virtual void makeColorKeyTexture(video::ITexture* texture, diff --git a/include/IVolumeLightSceneNode.h b/include/IVolumeLightSceneNode.h index cfe1aeff..7011c04e 100644 --- a/include/IVolumeLightSceneNode.h +++ b/include/IVolumeLightSceneNode.h @@ -31,7 +31,7 @@ namespace scene //! Sets the number of segments across the U axis virtual void setSubDivideU(const u32 inU) =0; - + //! Sets the number of segments across the V axis virtual void setSubDivideV(const u32 inV) =0; @@ -42,10 +42,10 @@ namespace scene virtual u32 getSubDivideV() const =0; //! Sets the color of the base of the light - virtual void setFootColor(const video::SColor inColour) =0; + virtual void setFootColor(const video::SColor inColor) =0; //! Sets the color of the tip of the light - virtual void setTailColor(const video::SColor inColour) =0; + virtual void setTailColor(const video::SColor inColor) =0; //! Returns the color of the base of the light virtual video::SColor getFootColor() const =0; diff --git a/include/SceneParameters.h b/include/SceneParameters.h index ed6a53f2..5b1bb120 100644 --- a/include/SceneParameters.h +++ b/include/SceneParameters.h @@ -9,7 +9,7 @@ \brief Header file containing all scene parameters for modifying mesh loading etc. This file includes all parameter names which can be set using ISceneManager::getParameters() - to modify the behaviour of plugins and mesh loaders. + to modify the behavior of plugins and mesh loaders. */ namespace irr diff --git a/include/irrMap.h b/include/irrMap.h index 3d326fa6..bbe22f82 100644 --- a/include/irrMap.h +++ b/include/irrMap.h @@ -704,7 +704,7 @@ class map Node* newNodesUncle = newNode->getParent()->getParent()->getRightChild(); if ( newNodesUncle!=0 && newNodesUncle->isRed()) { - // case 1 - change the colours + // case 1 - change the colors newNode->getParent()->setBlack(); newNodesUncle->setBlack(); newNode->getParent()->getParent()->setRed(); @@ -733,7 +733,7 @@ class map Node* newNodesUncle = newNode->getParent()->getParent()->getLeftChild(); if ( newNodesUncle!=0 && newNodesUncle->isRed()) { - // case 1 - change the colours + // case 1 - change the colors newNode->getParent()->setBlack(); newNodesUncle->setBlack(); newNode->getParent()->getParent()->setRed(); @@ -890,7 +890,7 @@ class map return Root == 0; } - //! \deprecated Use empty() instead. This method may be removed by Irrlicht 1.9 + //! \deprecated Use empty() instead. This method may be removed by Irrlicht 1.9 _IRR_DEPRECATED_ bool isEmpty() const { return empty(); diff --git a/source/Irrlicht/CDMFLoader.cpp b/source/Irrlicht/CDMFLoader.cpp index cbd93483..dfc11d4a 100644 --- a/source/Irrlicht/CDMFLoader.cpp +++ b/source/Irrlicht/CDMFLoader.cpp @@ -274,7 +274,7 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file) findFile(use_mat_dirs, path, materiali[i].pathName, materiali[i].textureName); tex = driver->getTexture(materiali[i].textureName); } - //Primary texture is just a colour + //Primary texture is just a color else if(materiali[i].textureFlag==1) { video::SColor color(axtoi(materiali[i].textureName.c_str())); diff --git a/source/Irrlicht/CGUIContextMenu.cpp b/source/Irrlicht/CGUIContextMenu.cpp index dc6618f1..191869bd 100644 --- a/source/Irrlicht/CGUIContextMenu.cpp +++ b/source/Irrlicht/CGUIContextMenu.cpp @@ -51,13 +51,13 @@ CGUIContextMenu::~CGUIContextMenu() LastFont->drop(); } -//! set behaviour when menus are closed +//! set behavior when menus are closed void CGUIContextMenu::setCloseHandling(ECONTEXT_MENU_CLOSE onClose) { CloseHandling = onClose; } -//! get current behaviour when the menue will be closed +//! get current behavior when the menue will be closed ECONTEXT_MENU_CLOSE CGUIContextMenu::getCloseHandling() const { return CloseHandling; diff --git a/source/Irrlicht/CGUIContextMenu.h b/source/Irrlicht/CGUIContextMenu.h index 80786231..7ce3ec41 100644 --- a/source/Irrlicht/CGUIContextMenu.h +++ b/source/Irrlicht/CGUIContextMenu.h @@ -31,10 +31,10 @@ namespace gui //! destructor virtual ~CGUIContextMenu(); - //! set behaviour when menus are closed + //! set behavior when menus are closed virtual void setCloseHandling(ECONTEXT_MENU_CLOSE onClose); - //! get current behaviour when the menue will be closed + //! get current behavior when the menue will be closed virtual ECONTEXT_MENU_CLOSE getCloseHandling() const; //! Returns amount of menu items diff --git a/source/Irrlicht/CGUIEditBox.cpp b/source/Irrlicht/CGUIEditBox.cpp index 112f87f5..fdc697ab 100644 --- a/source/Irrlicht/CGUIEditBox.cpp +++ b/source/Irrlicht/CGUIEditBox.cpp @@ -1120,7 +1120,7 @@ void CGUIEditBox::breakText() { // TODO: I (Michael) think that we shouldn't change the text given by the user for whatever reason. // Instead rework the cursor positioning to be able to handle this (but not in stable release - // branch as users might already expect this behaviour). + // branch as users might already expect this behavior). Text.erase(i+1); --size; if ( CursorPos > i ) diff --git a/source/Irrlicht/CGUIModalScreen.h b/source/Irrlicht/CGUIModalScreen.h index c934aa4e..145bf72e 100644 --- a/source/Irrlicht/CGUIModalScreen.h +++ b/source/Irrlicht/CGUIModalScreen.h @@ -39,7 +39,7 @@ namespace gui virtual void updateAbsolutePosition(); //! Modalscreen is not a typical element, but rather acts like a state for it's children. - //! isVisible is overriden to give this a useful behaviour, so that a modal will no longer + //! isVisible is overriden to give this a useful behavior, so that a modal will no longer //! be active when its parent is invisible or all its children are invisible. virtual bool isVisible() const; diff --git a/source/Irrlicht/CIrrDeviceStub.cpp b/source/Irrlicht/CIrrDeviceStub.cpp index d2274696..b5f5900e 100644 --- a/source/Irrlicht/CIrrDeviceStub.cpp +++ b/source/Irrlicht/CIrrDeviceStub.cpp @@ -402,7 +402,7 @@ bool CIrrDeviceStub::getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightn return false; } -//! Set the maximal elapsed time between 2 clicks to generate doubleclicks for the mouse. It also affects tripleclick behaviour. +//! Set the maximal elapsed time between 2 clicks to generate doubleclicks for the mouse. It also affects tripleclick behavior. void CIrrDeviceStub::setDoubleClickTime( u32 timeMs ) { MouseMultiClicks.DoubleClickTime = timeMs; diff --git a/source/Irrlicht/CIrrDeviceStub.h b/source/Irrlicht/CIrrDeviceStub.h index c4da62c5..a05ac560 100644 --- a/source/Irrlicht/CIrrDeviceStub.h +++ b/source/Irrlicht/CIrrDeviceStub.h @@ -125,7 +125,7 @@ namespace irr //! Get the current Gamma Value for the Display virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ); - //! Set the maximal elapsed time between 2 clicks to generate doubleclicks for the mouse. It also affects tripleclick behaviour. + //! Set the maximal elapsed time between 2 clicks to generate doubleclicks for the mouse. It also affects tripleclick behavior. //! When set to 0 no double- and tripleclicks will be generated. virtual void setDoubleClickTime( u32 timeMs ); diff --git a/source/Irrlicht/CMD2MeshFileLoader.cpp b/source/Irrlicht/CMD2MeshFileLoader.cpp index 8b67c2af..95093464 100644 --- a/source/Irrlicht/CMD2MeshFileLoader.cpp +++ b/source/Irrlicht/CMD2MeshFileLoader.cpp @@ -331,7 +331,7 @@ bool CMD2MeshFileLoader::loadFile(io::IReadFile* file, CAnimatedMeshMD2* mesh) } } - // populate interpolation buffer with texture coordinates and colours + // populate interpolation buffer with texture coordinates and colors if (header.numFrames) { f32 dmaxs = 1.0f/(header.skinWidth); diff --git a/source/Irrlicht/CNullDriver.cpp b/source/Irrlicht/CNullDriver.cpp index 4460eb9b..a1180892 100644 --- a/source/Irrlicht/CNullDriver.cpp +++ b/source/Irrlicht/CNullDriver.cpp @@ -1017,7 +1017,7 @@ void CNullDriver::makeColorKeyTexture(video::ITexture* texture, for (u32 pixel = 0; pixel < pixels; ++ pixel) { - // If the colour matches the reference colour, ignoring alphas, + // If the color matches the reference color, ignoring alphas, // set the alpha to zero. if(((*p) & 0x7fff) == refZeroAlpha) { @@ -1051,7 +1051,7 @@ void CNullDriver::makeColorKeyTexture(video::ITexture* texture, const u32 pixels = pitch * dim.Height; for (u32 pixel = 0; pixel < pixels; ++ pixel) { - // If the colour matches the reference colour, ignoring alphas, + // If the color matches the reference color, ignoring alphas, // set the alpha to zero. if(((*p) & 0x00ffffff) == refZeroAlpha) { diff --git a/source/Irrlicht/COBJMeshFileLoader.cpp b/source/Irrlicht/COBJMeshFileLoader.cpp index 6ca43874..1f478355 100644 --- a/source/Irrlicht/COBJMeshFileLoader.cpp +++ b/source/Irrlicht/COBJMeshFileLoader.cpp @@ -187,7 +187,7 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file) { c8 vertexWord[WORD_BUFFER_LENGTH]; // for retrieving vertex data video::S3DVertex v; - // Assign vertex color from currently active material's diffuse colour + // Assign vertex color from currently active material's diffuse color if (mtlChanged) { // retrieve the material @@ -468,8 +468,8 @@ const c8* COBJMeshFileLoader::readTextures(const c8* bufPtr, const c8* const buf // currMaterial->Meshbuffer->Material.Textures[1] = texture; // currMaterial->Meshbuffer->Material.MaterialType=video::EMT_REFLECTION_2_LAYER; } - // Set diffuse material colour to white so as not to affect texture colour - // Because Maya set diffuse colour Kd to black when you use a diffuse colour map + // Set diffuse material color to white so as not to affect texture color + // Because Maya set diffuse color Kd to black when you use a diffuse color map // But is this the right thing to do? currMaterial->Meshbuffer->Material.DiffuseColor.set( currMaterial->Meshbuffer->Material.DiffuseColor.getAlpha(), 255, 255, 255 ); diff --git a/source/Irrlicht/COpenGLDriver.cpp b/source/Irrlicht/COpenGLDriver.cpp index 941811b7..046769bc 100644 --- a/source/Irrlicht/COpenGLDriver.cpp +++ b/source/Irrlicht/COpenGLDriver.cpp @@ -1013,7 +1013,7 @@ bool COpenGLDriver::updateVertexHardwareBuffer(SHWBufferLink_opengl *HWBuffer) core::array buffer; if (!FeatureAvailable[IRR_ARB_vertex_array_bgra] && !FeatureAvailable[IRR_EXT_vertex_array_bgra]) { - //buffer vertex data, and convert colours... + //buffer vertex data, and convert colors... buffer.set_used(vertexSize * vertexCount); memcpy(buffer.pointer(), vertices, vertexSize * vertexCount); vbuf = buffer.const_pointer(); diff --git a/source/Irrlicht/SoftwareDriver2_helper.h b/source/Irrlicht/SoftwareDriver2_helper.h index 802cf03d..cc3c1388 100644 --- a/source/Irrlicht/SoftwareDriver2_helper.h +++ b/source/Irrlicht/SoftwareDriver2_helper.h @@ -4,7 +4,7 @@ /* History: - - changed behaviour for log2 textures ( replaced multiplies by shift ) + - changed behavior for log2 textures ( replaced multiplies by shift ) */ #ifndef __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__ @@ -714,7 +714,7 @@ inline void getTexel_fix ( tFixPoint &r, tFixPoint &g, tFixPoint &b, } // get video sample to fixpoint -REALINLINE void getTexel_fix ( tFixPoint &a, +REALINLINE void getTexel_fix ( tFixPoint &a, const sInternalTexture * t, const tFixPointu tx, const tFixPointu ty ) { diff --git a/source/Irrlicht/dmfsupport.h b/source/Irrlicht/dmfsupport.h index 0244b656..2b3e8e71 100644 --- a/source/Irrlicht/dmfsupport.h +++ b/source/Irrlicht/dmfsupport.h @@ -29,7 +29,7 @@ namespace { /** A structure representing some DeleD infos. -This structure contains data about DeleD level file like: version, ambient colour, number of objects etc...*/ +This structure contains data about DeleD level file like: version, ambient color, number of objects etc...*/ struct dmfHeader { //main file header @@ -84,7 +84,7 @@ struct dmfVert /** A structure representing a single dynamic light. -This structure contains light position coordinates, diffuse colour, specular colour and maximum radius of light.*/ +This structure contains light position coordinates, diffuse color, specular color and maximum radius of light.*/ struct dmfLight { core::vector3df pos;//!