BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Change _IRR_OVERRIDE to IRR_OVERRIDE also on OSX headers.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6256 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2021-08-27 19:19:09 +00:00
parent b691098fae
commit 377e9c59df
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
source/Irrlicht/CIrrDeviceOSX.h
View File

@ -47,60 +47,60 @@ namespace irr
virtual ~CIrrDeviceMacOSX(); virtual ~CIrrDeviceMacOSX();
//! runs the device. Returns false if device wants to be deleted //! 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 //! 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 // 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. //! 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 //! 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 //! returns if window is active. if not, nothing need to be drawn
virtual bool isWindowActive() const _IRR_OVERRIDE_; virtual bool isWindowActive() const IRR_OVERRIDE;
//! Checks if the Irrlicht window has focus //! Checks if the Irrlicht window has focus
virtual bool isWindowFocused() const _IRR_OVERRIDE_; virtual bool isWindowFocused() const IRR_OVERRIDE;
//! Checks if the Irrlicht window is minimized //! Checks if the Irrlicht window is minimized
virtual bool isWindowMinimized() const _IRR_OVERRIDE_; virtual bool isWindowMinimized() const IRR_OVERRIDE;
//! presents a surface in the client area //! 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 //! 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. //! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize) _IRR_OVERRIDE_; virtual void setResizable(bool resize) IRR_OVERRIDE;
//! Returns true if the window is resizable, false if not //! Returns true if the window is resizable, false if not
virtual bool isResizable() const; virtual bool isResizable() const;
//! Minimizes the window if possible //! Minimizes the window if possible
virtual void minimizeWindow() _IRR_OVERRIDE_; virtual void minimizeWindow() IRR_OVERRIDE;
//! Maximizes the window if possible. //! Maximizes the window if possible.
virtual void maximizeWindow() _IRR_OVERRIDE_; virtual void maximizeWindow() IRR_OVERRIDE;
//! Restore the window to normal size if possible. //! Restore the window to normal size if possible.
virtual void restoreWindow() _IRR_OVERRIDE_; virtual void restoreWindow() IRR_OVERRIDE;
//! Get the position of this window on screen //! Get the position of this window on screen
virtual core::position2di getWindowPosition() _IRR_OVERRIDE_; virtual core::position2di getWindowPosition() IRR_OVERRIDE;
//! Activate any joysticks, and generate events for them. //! Activate any joysticks, and generate events for them.
virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) _IRR_OVERRIDE_; virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) IRR_OVERRIDE;
//! \return Returns a pointer to a list with all video modes //! \return Returns a pointer to a list with all video modes
//! supported by the gfx adapter. //! supported by the gfx adapter.
virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_; virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE;
//! Get the device type //! Get the device type
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE
{ {
return EIDT_OSX; return EIDT_OSX;
} }
@ -131,39 +131,39 @@ namespace irr
} }
//! Changes the visible state of the mouse cursor. //! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible) _IRR_OVERRIDE_ virtual void setVisible(bool visible) IRR_OVERRIDE
{ {
IsVisible = visible; IsVisible = visible;
Device->setCursorVisible(visible); Device->setCursorVisible(visible);
} }
//! Returns if the cursor is currently visible. //! Returns if the cursor is currently visible.
virtual bool isVisible() const _IRR_OVERRIDE_ virtual bool isVisible() const IRR_OVERRIDE
{ {
return IsVisible; return IsVisible;
} }
//! Sets the new position of the cursor. //! 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); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! 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
{ {
setPosition((s32)(x*WindowSize.Width), (s32)(y*WindowSize.Height)); setPosition((s32)(x*WindowSize.Width), (s32)(y*WindowSize.Height));
} }
//! Sets the new position of the cursor. //! 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
{ {
if (CursorPos.X != pos.X || CursorPos.Y != pos.Y) if (CursorPos.X != pos.X || CursorPos.Y != pos.Y)
setPosition(pos.X, pos.Y); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! 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
{ {
if (UseReferenceRect) if (UseReferenceRect)
{ {
@ -176,13 +176,13 @@ namespace irr
} }
//! Returns the current position of the mouse cursor. //! 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; return CursorPos;
} }
//! Returns the current position of the mouse cursor. //! 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) if (!UseReferenceRect)
{ {
@ -195,7 +195,7 @@ namespace irr
} }
//! Sets an absolute reference rect for calculating the cursor position. //! 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) if (rect)
{ {

16
source/Irrlicht/CNSOGLManager.h
View File

@ -31,31 +31,31 @@ namespace video
~CNSOGLManager(); ~CNSOGLManager();
// Initialize // Initialize
bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_; bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) IRR_OVERRIDE;
// Terminate // Terminate
void terminate() _IRR_OVERRIDE_; void terminate() IRR_OVERRIDE;
// Create surface. // Create surface.
bool generateSurface() _IRR_OVERRIDE_; bool generateSurface() IRR_OVERRIDE;
// Destroy surface. // Destroy surface.
void destroySurface() _IRR_OVERRIDE_; void destroySurface() IRR_OVERRIDE;
// Create context. // Create context.
bool generateContext() _IRR_OVERRIDE_; bool generateContext() IRR_OVERRIDE;
// Destroy EGL context. // Destroy EGL context.
void destroyContext() _IRR_OVERRIDE_; void destroyContext() IRR_OVERRIDE;
//! Get current context //! Get current context
const SExposedVideoData& getContext() const; const SExposedVideoData& getContext() const;
//! Change render context, disable old and activate new defined by videoData //! Change render context, disable old and activate new defined by videoData
bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_; bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) IRR_OVERRIDE;
// Swap buffers. // Swap buffers.
bool swapBuffers() _IRR_OVERRIDE_; bool swapBuffers() IRR_OVERRIDE;
private: private:
SIrrlichtCreationParameters Params; SIrrlichtCreationParameters Params;