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

API BREAKER: Replacing defines in irrTypes.h which are conflicting with c++ reserved identifier rules.

Browse Source 
C++ has undefined behavior for identifiers starting with __ or with _ followed by an uppercase letter.
We still have many more (in IrrCompileConfig.h and in all header-guards), will likely replace those later as well.
As a workaround for users which might use irrlicht defines in their code, I've added the header irrLegacyDefines.h
Including that allows to continue using old defines for a while - or make it easier to have code which compiles 
with old and new Irrlicht library versions.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6251 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 12:55:10 +00:00
parent ee180dbd24
commit ffd7b63af0
289 changed files with 3401 additions and 3379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
source/Irrlicht/CIrrDeviceConsole.h
View File

@@ -47,53 +47,53 @@ namespace irr
virtual ~CIrrDeviceConsole();
//! runs the device. Returns false if device wants to be deleted
virtual bool run() _IRR_OVERRIDE_;
virtual bool run() IRR_OVERRIDE;
//! Cause the device to temporarily pause execution and let other processes to run
// This should bring down processor usage without major performance loss for Irrlicht
virtual void yield() _IRR_OVERRIDE_;
virtual void yield() IRR_OVERRIDE;
//! Pause execution and let other processes to run for a specified amount of time.
virtual void sleep(u32 timeMs, bool pauseTimer) _IRR_OVERRIDE_;
virtual void sleep(u32 timeMs, bool pauseTimer) IRR_OVERRIDE;
//! sets the caption of the window
virtual void setWindowCaption(const wchar_t* text) _IRR_OVERRIDE_;
virtual void setWindowCaption(const wchar_t* text) IRR_OVERRIDE;
//! returns if window is active. if not, nothing need to be drawn
virtual bool isWindowActive() const _IRR_OVERRIDE_;
virtual bool isWindowActive() const IRR_OVERRIDE;
//! returns if window has focus
virtual bool isWindowFocused() const _IRR_OVERRIDE_;
virtual bool isWindowFocused() const IRR_OVERRIDE;
//! returns if window is minimized
virtual bool isWindowMinimized() const _IRR_OVERRIDE_;
virtual bool isWindowMinimized() const IRR_OVERRIDE;
//! returns current window position (not supported for this device)
virtual core::position2di getWindowPosition() _IRR_OVERRIDE_
virtual core::position2di getWindowPosition() IRR_OVERRIDE
{
return core::position2di(-1, -1);
}
//! presents a surface in the client area
virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0) _IRR_OVERRIDE_;
virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0) IRR_OVERRIDE;
//! notifies the device that it should close itself
virtual void closeDevice() _IRR_OVERRIDE_;
virtual void closeDevice() IRR_OVERRIDE;
//! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false) _IRR_OVERRIDE_;
virtual void setResizable(bool resize=false) IRR_OVERRIDE;
//! Minimizes the window.
virtual void minimizeWindow() _IRR_OVERRIDE_;
virtual void minimizeWindow() IRR_OVERRIDE;
//! Maximizes the window.
virtual void maximizeWindow() _IRR_OVERRIDE_;
virtual void maximizeWindow() IRR_OVERRIDE;
//! Restores the window size.
virtual void restoreWindow() _IRR_OVERRIDE_;
virtual void restoreWindow() IRR_OVERRIDE;
//! Get the device type
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_
virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE
{
return EIDT_CONSOLE;
}
@@ -116,7 +116,7 @@ namespace irr
}
//! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible) _IRR_OVERRIDE_
virtual void setVisible(bool visible) IRR_OVERRIDE
{
if(visible != IsVisible)
{
@@ -126,19 +126,19 @@ namespace irr
}
//! Returns if the cursor is currently visible.
virtual bool isVisible() const _IRR_OVERRIDE_
virtual bool isVisible() const IRR_OVERRIDE
{
return IsVisible;
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_
virtual void setPosition(const core::position2d<f32> &pos) IRR_OVERRIDE
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_
virtual void setPosition(f32 x, f32 y) IRR_OVERRIDE
{
if (!UseReferenceRect)
setPosition((s32)(x*WindowSize.Width), (s32)(y*WindowSize.Height));
@@ -147,25 +147,25 @@ namespace irr
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_
virtual void setPosition(const core::position2d<s32> &pos) IRR_OVERRIDE
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_
virtual void setPosition(s32 x, s32 y) IRR_OVERRIDE
{
setInternalCursorPosition(core::position2di(x,y));
}
//! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition(bool updateCursor) _IRR_OVERRIDE_
virtual const core::position2d<s32>& getPosition(bool updateCursor) IRR_OVERRIDE
{
return CursorPos;
}
//! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition(bool updateCursor) _IRR_OVERRIDE_
virtual core::position2d<f32> getRelativePosition(bool updateCursor) IRR_OVERRIDE
{
if (!UseReferenceRect)
{
@@ -178,7 +178,7 @@ namespace irr
}
//! Sets an absolute reference rect for calculating the cursor position.
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_
virtual void setReferenceRect(core::rect<s32>* rect=0) IRR_OVERRIDE
{
if (rect)
{
@@ -256,7 +256,7 @@ namespace gui
//! Draws some text and clips it to the specified rectangle if wanted.
virtual void draw(const wchar_t* text, const core::rect<s32>& position,
video::SColor color, bool hcenter=false, bool vcenter=false,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_
const core::rect<s32>* clip=0) IRR_OVERRIDE
{
core::rect<s32> Area = clip ? *clip : position;
@@ -304,22 +304,22 @@ namespace gui
}
//! Calculates the dimension of some text.
virtual core::dimension2d<u32> getDimension(const wchar_t* text) const _IRR_OVERRIDE_
virtual core::dimension2d<u32> getDimension(const wchar_t* text) const IRR_OVERRIDE
{
return core::dimension2d<u32>(wcslen(text),1);
}
//! Calculates the index of the character in the text which is on a specific position.
virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const _IRR_OVERRIDE_ { return pixel_x; } _IRR_OVERRIDE_;
virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const IRR_OVERRIDE { return pixel_x; } IRR_OVERRIDE;
//! No kerning
virtual void setKerningWidth (s32 kerning) _IRR_OVERRIDE_ { }
virtual void setKerningHeight (s32 kerning) _IRR_OVERRIDE_ { }
virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const _IRR_OVERRIDE_ {return 0;}
virtual s32 getKerningHeight() const _IRR_OVERRIDE_ { return 0;}
virtual void setInvisibleCharacters( const wchar_t *s ) _IRR_OVERRIDE_ { }
virtual void setKerningWidth (s32 kerning) IRR_OVERRIDE { }
virtual void setKerningHeight (s32 kerning) IRR_OVERRIDE { }
virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const IRR_OVERRIDE {return 0;}
virtual s32 getKerningHeight() const IRR_OVERRIDE { return 0;}
virtual void setInvisibleCharacters( const wchar_t *s ) IRR_OVERRIDE { }
// I guess this is an OS specific font
virtual EGUI_FONT_TYPE getType() const _IRR_OVERRIDE_ { return EGFT_OS; }
virtual EGUI_FONT_TYPE getType() const IRR_OVERRIDE { return EGFT_OS; }
private:
CIrrDeviceConsole* Device;
core::stringw tempText;