zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed return value of a videomodelist method. missing linebreak in vector3d.h 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1375 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2008-06-13 13:34:05 +00:00
parent e0b7099b9f
commit 70e78d80c9
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/IVideoModeList.h
View File

@ -24,9 +24,6 @@ namespace video
{ {
public: public:
//! destructor
virtual ~IVideoModeList() {}
//! Gets amount of video modes in the list. //! Gets amount of video modes in the list.
/** \return Returns amount of video modes. */ /** \return Returns amount of video modes. */
virtual s32 getVideoModeCount() const = 0; virtual s32 getVideoModeCount() const = 0;
@ -43,7 +40,7 @@ namespace video
//! Get current desktop screen resolution. //! Get current desktop screen resolution.
/** \return Size of screen in pixels of the current desktop video mode. */ /** \return Size of screen in pixels of the current desktop video mode. */
virtual core::dimension2d<s32> getDesktopResolution() const = 0; virtual const core::dimension2d<s32>& getDesktopResolution() const = 0;
//! Get the pixel depth of a video mode in bits. //! Get the pixel depth of a video mode in bits.
/** \return Size of each pixel of the current desktop video mode in bits. */ /** \return Size of each pixel of the current desktop video mode in bits. */

2
include/vector3d.h
View File

@ -277,7 +277,7 @@ namespace core
typedef vector3d<s32> vector3di; typedef vector3d<s32> vector3di;
//! Function multiplying a scalar and a vector component-wise. //! Function multiplying a scalar and a vector component-wise.
template<class S, class T> template<class S, class T>
vector3d<T> operator*(const S scalar, const vector3d<T>& vector) { return vector*scalar; } vector3d<T> operator*(const S scalar, const vector3d<T>& vector) { return vector*scalar; }
} // end namespace core } // end namespace core

12
source/Irrlicht/CVideoModeList.cpp
View File

@ -21,13 +21,6 @@ CVideoModeList::CVideoModeList()
} }
//! destructor
CVideoModeList::~CVideoModeList()
{
}
void CVideoModeList::setDesktop(s32 desktopDepth, const core::dimension2d<s32>& desktopSize) void CVideoModeList::setDesktop(s32 desktopDepth, const core::dimension2d<s32>& desktopSize)
{ {
Desktop.depth = desktopDepth; Desktop.depth = desktopDepth;
@ -42,7 +35,6 @@ s32 CVideoModeList::getVideoModeCount() const
} }
//! Returns the screen size of a video mode in pixels. //! Returns the screen size of a video mode in pixels.
core::dimension2d<s32> CVideoModeList::getVideoModeResolution(s32 modeNumber) const core::dimension2d<s32> CVideoModeList::getVideoModeResolution(s32 modeNumber) const
{ {
@ -53,7 +45,6 @@ core::dimension2d<s32> CVideoModeList::getVideoModeResolution(s32 modeNumber) co
} }
//! Returns the pixel depth of a video mode in bits. //! Returns the pixel depth of a video mode in bits.
s32 CVideoModeList::getVideoModeDepth(s32 modeNumber) const s32 CVideoModeList::getVideoModeDepth(s32 modeNumber) const
{ {
@ -65,7 +56,7 @@ s32 CVideoModeList::getVideoModeDepth(s32 modeNumber) const
//! Returns current desktop screen resolution. //! Returns current desktop screen resolution.
core::dimension2d<s32> CVideoModeList::getDesktopResolution() const const core::dimension2d<s32>& CVideoModeList::getDesktopResolution() const
{ {
return Desktop.size; return Desktop.size;
} }
@ -78,7 +69,6 @@ s32 CVideoModeList::getDesktopDepth() const
} }
//! adds a new mode to the list //! adds a new mode to the list
void CVideoModeList::addMode(const core::dimension2d<s32>& size, s32 depth) void CVideoModeList::addMode(const core::dimension2d<s32>& size, s32 depth)
{ {

5
source/Irrlicht/CVideoModeList.h
View File

@ -21,9 +21,6 @@ namespace video
//! constructor //! constructor
CVideoModeList(); CVideoModeList();
//! destructor
virtual ~CVideoModeList();
//! Gets amount of video modes in the list. //! Gets amount of video modes in the list.
virtual s32 getVideoModeCount() const; virtual s32 getVideoModeCount() const;
@ -34,7 +31,7 @@ namespace video
virtual s32 getVideoModeDepth(s32 modeNumber) const; virtual s32 getVideoModeDepth(s32 modeNumber) const;
//! Returns current desktop screen resolution. //! Returns current desktop screen resolution.
virtual core::dimension2d<s32> getDesktopResolution() const; virtual const core::dimension2d<s32>& getDesktopResolution() const;
//! Returns the pixel depth of a video mode in bits. //! Returns the pixel depth of a video mode in bits.
virtual s32 getDesktopDepth() const; virtual s32 getDesktopDepth() const;