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

83
source/Irrlicht/CIrrDeviceLinux.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_IRR_DEVICE_LINUX_H_INCLUDED__
#define __C_IRR_DEVICE_LINUX_H_INCLUDED__
#ifndef IRR_C_IRR_DEVICE_LINUX_H_INCLUDED
#define IRR_C_IRR_DEVICE_LINUX_H_INCLUDED
#include "IrrCompileConfig.h"
@@ -50,66 +50,66 @@ namespace irr
virtual ~CIrrDeviceLinux();
//! 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 color format of the window.
virtual video::ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_;
virtual video::ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE;
//! 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;
//! \return Returns a pointer to a list with all video modes
//! supported by the gfx adapter.
virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_;
virtual video::IVideoModeList* getVideoModeList() 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;
//! Resize the render window.
virtual void setWindowSize(const irr::core::dimension2d<u32>& size) _IRR_OVERRIDE_;
virtual void setWindowSize(const irr::core::dimension2d<u32>& size) 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 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.
virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) _IRR_OVERRIDE_;
virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) IRR_OVERRIDE;
//! Set the current Gamma Value for the Display
virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) _IRR_OVERRIDE_;
virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) IRR_OVERRIDE;
//! Get the current Gamma Value for the Display
virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) _IRR_OVERRIDE_;
virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) IRR_OVERRIDE;
//! gets text from the clipboard
//! \return Returns 0 if no string is in there.
@@ -120,10 +120,10 @@ namespace irr
virtual void copyToClipboard(const c8* text) const;
//! Remove all messages pending in the system message loop
virtual void clearSystemMessages() _IRR_OVERRIDE_;
virtual void clearSystemMessages() IRR_OVERRIDE;
//! Get the device type
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_
virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE
{
return EIDT_X11;
}
@@ -170,7 +170,7 @@ namespace irr
~CCursorControl();
//! 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)
return;
@@ -187,31 +187,31 @@ 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
{
setPosition((s32)(x*Device->Width), (s32)(y*Device->Height));
}
//! 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
{
#ifdef _IRR_COMPILE_WITH_X11_
@@ -276,7 +276,7 @@ namespace irr
}
//! 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
{
if ( updateCursor )
updateCursorPos();
@@ -284,7 +284,7 @@ namespace irr
}
//! 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 ( updateCursor )
updateCursorPos();
@@ -299,7 +299,7 @@ namespace irr
CursorPos.Y / (f32)ReferenceRect.getHeight());
}
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_
virtual void setReferenceRect(core::rect<s32>* rect=0) IRR_OVERRIDE
{
if (rect)
{
@@ -319,29 +319,29 @@ namespace irr
}
//! Sets the active cursor icon
virtual void setActiveIcon(gui::ECURSOR_ICON iconId) _IRR_OVERRIDE_;
virtual void setActiveIcon(gui::ECURSOR_ICON iconId) IRR_OVERRIDE;
//! Gets the currently active icon
virtual gui::ECURSOR_ICON getActiveIcon() const _IRR_OVERRIDE_
virtual gui::ECURSOR_ICON getActiveIcon() const IRR_OVERRIDE
{
return ActiveIcon;
}
//! Add a custom sprite as cursor icon.
virtual gui::ECURSOR_ICON addIcon(const gui::SCursorSprite& icon) _IRR_OVERRIDE_;
virtual gui::ECURSOR_ICON addIcon(const gui::SCursorSprite& icon) IRR_OVERRIDE;
//! replace the given cursor icon.
virtual void changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite& icon) _IRR_OVERRIDE_;
virtual void changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite& icon) IRR_OVERRIDE;
//! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
virtual core::dimension2di getSupportedIconSize() const _IRR_OVERRIDE_;
virtual core::dimension2di getSupportedIconSize() const IRR_OVERRIDE;
#ifdef _IRR_COMPILE_WITH_X11_
//! Set platform specific behavior flags.
virtual void setPlatformBehavior(gui::ECURSOR_PLATFORM_BEHAVIOR behavior) _IRR_OVERRIDE_ {PlatformBehavior = behavior; }
virtual void setPlatformBehavior(gui::ECURSOR_PLATFORM_BEHAVIOR behavior) IRR_OVERRIDE {PlatformBehavior = behavior; }
//! Return platform specific behavior.
virtual gui::ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const _IRR_OVERRIDE_ { return PlatformBehavior; }
virtual gui::ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const IRR_OVERRIDE { return PlatformBehavior; }
void update();
void clearCursors();
@@ -484,5 +484,4 @@ namespace irr
} // end namespace irr
#endif // _IRR_COMPILE_WITH_X11_DEVICE_
#endif // __C_IRR_DEVICE_LINUX_H_INCLUDED__
#endif // IRR_C_IRR_DEVICE_LINUX_H_INCLUDED