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 --- .../source/Irrlicht/CIrrDeviceConsole.h | 330 --------------------- 1 file changed, 330 deletions(-) delete mode 100644 libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceConsole.h (limited to 'libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceConsole.h') diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceConsole.h b/libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceConsole.h deleted file mode 100644 index 79d7e15..0000000 --- a/libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceConsole.h +++ /dev/null @@ -1,330 +0,0 @@ -// Copyright (C) 2009-2012 Gaz Davidson -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h - -#ifndef __C_IRR_DEVICE_CONSOLE_H_INCLUDED__ -#define __C_IRR_DEVICE_CONSOLE_H_INCLUDED__ - -#include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_ - -//#define _IRR_USE_CONSOLE_FONT_ - -#include "SIrrCreationParameters.h" -#include "CIrrDeviceStub.h" -#include "IImagePresenter.h" -// for console font -#include "IGUIFont.h" - -#ifdef _IRR_WINDOWS_API_ -#define WIN32_LEAN_AND_MEAN -#if !defined(_IRR_XBOX_PLATFORM_) - #include -#endif -#if(_WIN32_WINNT >= 0x0500) -#define _IRR_WINDOWS_NT_CONSOLE_ -#endif -#else -#include -#endif - -// for now we assume all other terminal types are VT100 -#ifndef _IRR_WINDOWS_NT_CONSOLE_ -#define _IRR_VT100_CONSOLE_ -#endif - -namespace irr -{ - - class CIrrDeviceConsole : public CIrrDeviceStub, video::IImagePresenter - { - public: - - //! constructor - CIrrDeviceConsole(const SIrrlichtCreationParameters& params); - - //! destructor - virtual ~CIrrDeviceConsole(); - - //! runs the device. Returns false if device wants to be deleted - virtual bool 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 - virtual void yield(); - - //! Pause execution and let other processes to run for a specified amount of 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 - virtual bool isWindowFocused() const; - - //! returns if window is minimized - virtual bool isWindowMinimized() 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(); - - //! 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(); - - //! Get the device type - virtual E_DEVICE_TYPE getType() const - { - return EIDT_CONSOLE; - } - - void addPostPresentText(s16 X, s16 Y, const wchar_t *text); - - //! Implementation of the win32 console mouse cursor - class CCursorControl : public gui::ICursorControl - { - public: - - CCursorControl(const core::dimension2d& wsize) - : WindowSize(wsize), InvWindowSize(0.0f, 0.0f), IsVisible(true), UseReferenceRect(false) - { - if (WindowSize.Width!=0) - InvWindowSize.Width = 1.0f / WindowSize.Width; - - if (WindowSize.Height!=0) - InvWindowSize.Height = 1.0f / WindowSize.Height; - } - - //! Changes the visible state of the mouse cursor. - virtual void setVisible(bool visible) - { - if(visible != IsVisible) - { - IsVisible = visible; - setPosition(CursorPos.X, CursorPos.Y); - } - } - - //! 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) - { - if (!UseReferenceRect) - setPosition((s32)(x*WindowSize.Width), (s32)(y*WindowSize.Height)); - else - setPosition((s32)(x*ReferenceRect.getWidth()), (s32)(y*ReferenceRect.getHeight())); - } - - //! 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) - { - setInternalCursorPosition(core::position2di(x,y)); - } - - //! Returns the current position of the mouse cursor. - virtual const core::position2d& getPosition() - { - return CursorPos; - } - - //! Returns the current position of the mouse cursor. - virtual core::position2d getRelativePosition() - { - if (!UseReferenceRect) - { - return core::position2d(CursorPos.X * InvWindowSize.Width, - CursorPos.Y * InvWindowSize.Height); - } - - return core::position2d(CursorPos.X / (f32)ReferenceRect.getWidth(), - CursorPos.Y / (f32)ReferenceRect.getHeight()); - } - - //! Sets an absolute reference rect for calculating the cursor position. - virtual void setReferenceRect(core::rect* rect=0) - { - if (rect) - { - ReferenceRect = *rect; - UseReferenceRect = true; - - // prevent division through zero and uneven sizes - - if (!ReferenceRect.getHeight() || ReferenceRect.getHeight()%2) - ReferenceRect.LowerRightCorner.Y += 1; - - if (!ReferenceRect.getWidth() || ReferenceRect.getWidth()%2) - ReferenceRect.LowerRightCorner.X += 1; - } - else - UseReferenceRect = false; - } - - - //! Updates the internal cursor position - void setInternalCursorPosition(const core::position2di &pos) - { - CursorPos = pos; - - if (UseReferenceRect) - CursorPos -= ReferenceRect.UpperLeftCorner; - } - - private: - - core::position2d CursorPos; - core::dimension2d WindowSize; - core::dimension2d InvWindowSize; - bool IsVisible, - UseReferenceRect; - core::rect ReferenceRect; - }; - - private: - - //! Set the position of the text caret - void setTextCursorPos(s16 x, s16 y); - - // text to be added after drawing the screen - struct SPostPresentText - { - core::position2d Pos; - core::stringc Text; - }; - - bool IsWindowFocused; - - core::array OutputBuffer; - gui::IGUIFont *ConsoleFont; - core::array Text; - - FILE *OutFile; - -#ifdef _IRR_WINDOWS_NT_CONSOLE_ - HANDLE WindowsSTDIn, WindowsSTDOut; - u32 MouseButtonStates; -#endif - }; - -#ifdef _IRR_USE_CONSOLE_FONT_ - -namespace gui -{ - class CGUIConsoleFont : public IGUIFont - { - public: - - CGUIConsoleFont(CIrrDeviceConsole* device) : Device(device) { } - - //! Draws some text and clips it to the specified rectangle if wanted. - virtual void draw(const wchar_t* text, const core::rect& position, - video::SColor color, bool hcenter=false, bool vcenter=false, - const core::rect* clip=0) - { - core::rect Area = clip ? *clip : position; - - if (Area.UpperLeftCorner.X < 0) - Area.UpperLeftCorner.X = 0; - - if (Area.UpperLeftCorner.Y < 0) - Area.UpperLeftCorner.Y = 0; - - core::position2d pos; - - // centre vertically - pos.Y = vcenter ? (position.UpperLeftCorner.Y + position.LowerRightCorner.Y) / 2 : position.UpperLeftCorner.Y; - - // nothing to display? - if (pos.Y < Area.UpperLeftCorner.Y || pos.Y > Area.LowerRightCorner.Y) - return; - - tempText = text; - - // centre horizontally - pos.X = hcenter ? position.getCenter().X - ( tempText.size() / 2) : position.UpperLeftCorner.X; - - // clip - u32 xlclip = 0, - xrclip = 0; - - // get right clip - if (pos.X + (s32)tempText.size() > Area.LowerRightCorner.X) - xrclip = Area.LowerRightCorner.X - pos.X; - - // get left clip - if (pos.X < Area.UpperLeftCorner.X) - xlclip = Area.UpperLeftCorner.X - pos.X; - - // totally clipped? - if ((s32)tempText.size() - xlclip - xrclip < 0) - return; - - // null terminate the string - if (xrclip > 0) - tempText[xrclip] = L'\0'; - - Device->addPostPresentText(pos.X + xlclip, pos.Y, &(tempText.c_str()[xlclip])); - } - - //! Calculates the dimension of some text. - virtual core::dimension2d getDimension(const wchar_t* text) const - { - return core::dimension2d(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 { return pixel_x; }; - - //! No kerning - virtual void setKerningWidth (s32 kerning) { } - virtual void setKerningHeight (s32 kerning) { } - virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const {return 0;} - virtual s32 getKerningHeight() const { return 0;} - virtual void setInvisibleCharacters( const wchar_t *s ) { } - // I guess this is an OS specific font - virtual EGUI_FONT_TYPE getType() const { return EGFT_OS; } - private: - CIrrDeviceConsole* Device; - core::stringw tempText; - }; - -} // end namespace gui - -#endif // _IRR_USE_CONSOLE_FONT_ - -} // end namespace irr - -#endif // _IRR_COMPILE_WITH_CONSOLE_DEVICE_ -#endif // __C_IRR_DEVICE_CONSOLE_H_INCLUDED__ - -- cgit v1.1