luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
source/Irrlicht/CGUISkin.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_SKIN_H_INCLUDED__
#define __C_GUI_SKIN_H_INCLUDED__
#ifndef IRR_C_GUI_SKIN_H_INCLUDED
#define IRR_C_GUI_SKIN_H_INCLUDED
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_
@@ -30,49 +30,49 @@ namespace gui
virtual ~CGUISkin();
//! returns default color
virtual video::SColor getColor(EGUI_DEFAULT_COLOR color) const _IRR_OVERRIDE_;
virtual video::SColor getColor(EGUI_DEFAULT_COLOR color) const IRR_OVERRIDE;
//! sets a default color
virtual void setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor) _IRR_OVERRIDE_;
virtual void setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor) IRR_OVERRIDE;
//! returns size for the given size type
virtual s32 getSize(EGUI_DEFAULT_SIZE size) const _IRR_OVERRIDE_;
virtual s32 getSize(EGUI_DEFAULT_SIZE size) const IRR_OVERRIDE;
//! sets a default size
virtual void setSize(EGUI_DEFAULT_SIZE which, s32 size) _IRR_OVERRIDE_;
virtual void setSize(EGUI_DEFAULT_SIZE which, s32 size) IRR_OVERRIDE;
//! returns the default font
virtual IGUIFont* getFont(EGUI_DEFAULT_FONT which=EGDF_DEFAULT) const _IRR_OVERRIDE_;
virtual IGUIFont* getFont(EGUI_DEFAULT_FONT which=EGDF_DEFAULT) const IRR_OVERRIDE;
//! sets a default font
virtual void setFont(IGUIFont* font, EGUI_DEFAULT_FONT which=EGDF_DEFAULT) _IRR_OVERRIDE_;
virtual void setFont(IGUIFont* font, EGUI_DEFAULT_FONT which=EGDF_DEFAULT) IRR_OVERRIDE;
//! sets the sprite bank used for drawing icons
virtual void setSpriteBank(IGUISpriteBank* bank) _IRR_OVERRIDE_;
virtual void setSpriteBank(IGUISpriteBank* bank) IRR_OVERRIDE;
//! gets the sprite bank used for drawing icons
virtual IGUISpriteBank* getSpriteBank() const _IRR_OVERRIDE_;
virtual IGUISpriteBank* getSpriteBank() const IRR_OVERRIDE;
//! Returns a default icon
/** Returns the sprite index within the sprite bank */
virtual u32 getIcon(EGUI_DEFAULT_ICON icon) const _IRR_OVERRIDE_;
virtual u32 getIcon(EGUI_DEFAULT_ICON icon) const IRR_OVERRIDE;
//! Sets a default icon
/** Sets the sprite index used for drawing icons like arrows,
close buttons and ticks in checkboxes
\param icon: Enum specifying which icon to change
\param index: The sprite index used to draw this icon */
virtual void setIcon(EGUI_DEFAULT_ICON icon, u32 index) _IRR_OVERRIDE_;
virtual void setIcon(EGUI_DEFAULT_ICON icon, u32 index) IRR_OVERRIDE;
//! Returns a default text.
/** For example for Message box button captions:
"OK", "Cancel", "Yes", "No" and so on. */
virtual const wchar_t* getDefaultText(EGUI_DEFAULT_TEXT text) const _IRR_OVERRIDE_;
virtual const wchar_t* getDefaultText(EGUI_DEFAULT_TEXT text) const IRR_OVERRIDE;
//! Sets a default text.
/** For example for Message box button captions:
"OK", "Cancel", "Yes", "No" and so on. */
virtual void setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t* newText) _IRR_OVERRIDE_;
virtual void setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t* newText) IRR_OVERRIDE;
//! draws a standard 3d button pane
/** Used for drawing for example buttons in normal state.
@@ -85,7 +85,7 @@ namespace gui
implementations to find out how to draw the part exactly. */
virtual void draw3DButtonPaneStandard(IGUIElement* element,
const core::rect<s32>& rect,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a pressed 3d button pane
/** Used for drawing for example buttons in pressed state.
@@ -98,7 +98,7 @@ namespace gui
implementations to find out how to draw the part exactly. */
virtual void draw3DButtonPanePressed(IGUIElement* element,
const core::rect<s32>& rect,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a sunken 3d pane
/** Used for drawing the background of edit, combo or check boxes.
@@ -114,7 +114,7 @@ namespace gui
video::SColor bgcolor, bool flat,
bool fillBackGround,
const core::rect<s32>& rect,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a window background
/** Used for drawing the background of dialogs and windows.
@@ -134,7 +134,7 @@ namespace gui
bool drawTitleBar, video::SColor titleBarColor,
const core::rect<s32>& rect,
const core::rect<s32>* clip,
core::rect<s32>* checkClientArea) _IRR_OVERRIDE_;
core::rect<s32>* checkClientArea) IRR_OVERRIDE;
//! draws a standard 3d menu pane
/** Used for drawing for menus and context menus.
@@ -147,7 +147,7 @@ namespace gui
\param clip: Clip area. */
virtual void draw3DMenuPane(IGUIElement* element,
const core::rect<s32>& rect,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a standard 3d tool bar
/** Used for drawing for toolbars and menus.
@@ -158,7 +158,7 @@ namespace gui
\param clip: Clip area. */
virtual void draw3DToolBar(IGUIElement* element,
const core::rect<s32>& rect,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a tab button
/** Used for drawing for tab buttons on top of tabs.
@@ -170,7 +170,7 @@ namespace gui
\param clip: Clip area. */
virtual void draw3DTabButton(IGUIElement* element, bool active,
const core::rect<s32>& rect, const core::rect<s32>* clip=0,
EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) _IRR_OVERRIDE_;
EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) IRR_OVERRIDE;
//! draws a tab control body
/** \param element: Pointer to the element which wishes to draw this. This parameter
@@ -182,7 +182,7 @@ namespace gui
\param clip: Clip area. */
virtual void draw3DTabBody(IGUIElement* element, bool border, bool background,
const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1,
EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) _IRR_OVERRIDE_;
EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) IRR_OVERRIDE;
//! draws an icon, usually from the skin's sprite bank
/** \param element: Pointer to the element which wishes to draw this icon.
@@ -197,7 +197,7 @@ namespace gui
virtual void drawIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
const core::position2di position,
u32 starttime=0, u32 currenttime=0,
bool loop=false, const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
bool loop=false, const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a 2d rectangle.
@@ -210,17 +210,17 @@ namespace gui
\param clip: Pointer to rectangle against which the rectangle will be clipped.
If the pointer is null, no clipping will be performed. */
virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color,
const core::rect<s32>& pos, const core::rect<s32>* clip = 0) _IRR_OVERRIDE_;
const core::rect<s32>& pos, const core::rect<s32>* clip = 0) IRR_OVERRIDE;
//! get the type of this skin
virtual EGUI_SKIN_TYPE getType() const _IRR_OVERRIDE_;
virtual EGUI_SKIN_TYPE getType() const IRR_OVERRIDE;
//! Writes attributes of the skin
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_;
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the skin
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
private:
@@ -243,5 +243,3 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_
#endif