minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-11-19 08:40:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch releases/1.8 revisions r5898 through r6137 into trunk.

Browse Source 
Documentation fixes.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6138 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2020-08-31 20:11:14 +00:00
parent 2378c47d05
commit 0cc51b74a6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/IGUIStaticText.h
View File

@ -85,8 +85,8 @@ namespace gui
//! Sets text justification mode //! Sets text justification mode
/** \param horizontal: EGUIA_UPPERLEFT for left justified (default), /** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
EGUIA_LOWEERRIGHT for right justified, or EGUIA_CENTER for centered text. EGUIA_LOWEERRIGHT for right justified, or EGUIA_CENTER for centered text.
\param vertical: EGUIA_UPPERLEFT to align with top edge, \param vertical: EGUIA_UPPERLEFT to align with top edge (default),
EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */ EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text. */
virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0; virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
//! Enables or disables word wrap for using the static text as multiline text control. //! Enables or disables word wrap for using the static text as multiline text control.

6
include/IVideoDriver.h
View File

@ -382,7 +382,9 @@ namespace video
\param format The color format of the render target. Floating point formats are supported. \param format The color format of the render target. Floating point formats are supported.
\return Pointer to the created texture or 0 if the texture \return Pointer to the created texture or 0 if the texture
could not be created. This pointer should not be dropped. See could not be created. This pointer should not be dropped. See
IReferenceCounted::drop() for more information. */ IReferenceCounted::drop() for more information.
You may want to remove it from driver texture cache with removeTexture if you no longer need it.
*/
virtual ITexture* addRenderTargetTexture(const core::dimension2d<u32>& size, virtual ITexture* addRenderTargetTexture(const core::dimension2d<u32>& size,
const io::path& name = "rt", const ECOLOR_FORMAT format = ECF_UNKNOWN) =0; const io::path& name = "rt", const ECOLOR_FORMAT format = ECF_UNKNOWN) =0;
@ -1476,7 +1478,7 @@ namespace video
other flags can be changed, though some might have to effect other flags can be changed, though some might have to effect
in most cases. in most cases.
Please note that you have to enable/disable this effect with Please note that you have to enable/disable this effect with
enableInitMaterial2D(). This effect is costly, as it increases enableMaterial2D(). This effect is costly, as it increases
the number of state changes considerably. Always reset the the number of state changes considerably. Always reset the
values when done. values when done.
\return Material reference which should be altered to reflect \return Material reference which should be altered to reflect