From f9158592e1478b2013afc7041d9ed041cf2d2f4a Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 13 Jan 2014 19:47:58 +1000 Subject: Update Irrlicht to 1.8.1. Include actual change markers this time. lol --- .../irrlicht-1.8/source/Irrlicht/CIrrDeviceSDL.h | 235 --------------------- 1 file changed, 235 deletions(-) delete mode 100644 libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceSDL.h (limited to 'libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceSDL.h') diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceSDL.h b/libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceSDL.h deleted file mode 100644 index f614a87..0000000 --- a/libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceSDL.h +++ /dev/null @@ -1,235 +0,0 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h -// This device code is based on the original SDL device implementation -// contributed by Shane Parker (sirshane). - -#ifndef __C_IRR_DEVICE_SDL_H_INCLUDED__ -#define __C_IRR_DEVICE_SDL_H_INCLUDED__ - -#include "IrrCompileConfig.h" - -#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_ - -#include "IrrlichtDevice.h" -#include "CIrrDeviceStub.h" -#include "IImagePresenter.h" -#include "ICursorControl.h" - -#include -#include - -namespace irr -{ - - class CIrrDeviceSDL : public CIrrDeviceStub, video::IImagePresenter - { - public: - - //! constructor - CIrrDeviceSDL(const SIrrlichtCreationParameters& param); - - //! destructor - virtual ~CIrrDeviceSDL(); - - //! runs the device. Returns false if device wants to be deleted - virtual bool run(); - - //! pause execution temporarily - virtual void yield(); - - //! pause execution for a specified time - virtual void sleep(u32 timeMs, bool pauseTimer); - - //! sets the caption of the window - virtual void setWindowCaption(const wchar_t* text); - - //! returns if window is active. if not, nothing need to be drawn - virtual bool isWindowActive() const; - - //! returns if window has focus. - bool isWindowFocused() const; - - //! returns if window is minimized. - bool isWindowMinimized() const; - - //! returns color format of the window. - video::ECOLOR_FORMAT getColorFormat() const; - - //! presents a surface in the client area - virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0); - - //! notifies the device that it should close itself - virtual void closeDevice(); - - //! \return Returns a pointer to a list with all video modes supported - video::IVideoModeList* getVideoModeList(); - - //! Sets if the window should be resizable in windowed mode. - virtual void setResizable(bool resize=false); - - //! Minimizes the window. - virtual void minimizeWindow(); - - //! Maximizes the window. - virtual void maximizeWindow(); - - //! Restores the window size. - virtual void restoreWindow(); - - //! Activate any joysticks, and generate events for them. - virtual bool activateJoysticks(core::array & joystickInfo); - - //! Set the current Gamma Value for the Display - virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ); - - //! Get the current Gamma Value for the Display - virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ); - - //! Get the device type - virtual E_DEVICE_TYPE getType() const - { - return EIDT_SDL; - } - - //! Implementation of the linux cursor control - class CCursorControl : public gui::ICursorControl - { - public: - - CCursorControl(CIrrDeviceSDL* dev) - : Device(dev), IsVisible(true) - { - } - - //! Changes the visible state of the mouse cursor. - virtual void setVisible(bool visible) - { - IsVisible = visible; - if ( visible ) - SDL_ShowCursor( SDL_ENABLE ); - else - SDL_ShowCursor( SDL_DISABLE ); - } - - //! Returns if the cursor is currently visible. - virtual bool isVisible() const - { - return IsVisible; - } - - //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) - { - setPosition(pos.X, pos.Y); - } - - //! Sets the new position of the cursor. - virtual void setPosition(f32 x, f32 y) - { - setPosition((s32)(x*Device->Width), (s32)(y*Device->Height)); - } - - //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) - { - setPosition(pos.X, pos.Y); - } - - //! Sets the new position of the cursor. - virtual void setPosition(s32 x, s32 y) - { - SDL_WarpMouse( x, y ); - } - - //! Returns the current position of the mouse cursor. - virtual const core::position2d& getPosition() - { - updateCursorPos(); - return CursorPos; - } - - //! Returns the current position of the mouse cursor. - virtual core::position2d getRelativePosition() - { - updateCursorPos(); - return core::position2d(CursorPos.X / (f32)Device->Width, - CursorPos.Y / (f32)Device->Height); - } - - virtual void setReferenceRect(core::rect* rect=0) - { - } - - private: - - void updateCursorPos() - { - CursorPos.X = Device->MouseX; - CursorPos.Y = Device->MouseY; - - if (CursorPos.X < 0) - CursorPos.X = 0; - if (CursorPos.X > (s32)Device->Width) - CursorPos.X = Device->Width; - if (CursorPos.Y < 0) - CursorPos.Y = 0; - if (CursorPos.Y > (s32)Device->Height) - CursorPos.Y = Device->Height; - } - - CIrrDeviceSDL* Device; - core::position2d CursorPos; - bool IsVisible; - }; - - private: - - //! create the driver - void createDriver(); - - bool createWindow(); - - void createKeyMap(); - - SDL_Surface* Screen; - int SDL_Flags; -#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) - core::array Joysticks; -#endif - - s32 MouseX, MouseY; - u32 MouseButtonStates; - - u32 Width, Height; - - bool Resizable; - bool WindowHasFocus; - bool WindowMinimized; - - struct SKeyMap - { - SKeyMap() {} - SKeyMap(s32 x11, s32 win32) - : SDLKey(x11), Win32Key(win32) - { - } - - s32 SDLKey; - s32 Win32Key; - - bool operator<(const SKeyMap& o) const - { - return SDLKey KeyMap; - SDL_SysWMinfo Info; - }; - -} // end namespace irr - -#endif // _IRR_COMPILE_WITH_SDL_DEVICE_ -#endif // __C_IRR_DEVICE_SDL_H_INCLUDED__ - -- cgit v1.1