diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-29 15:09:53 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-29 15:09:53 +0200 |
commit | 7c5a3514dd6e907866bddcbb09b4d9cbd958dd8e (patch) | |
tree | 00aaece75d43bd35a3997bf4eacdfd103d29d5c7 /src/math | |
parent | 72c0188ec37c3783133baf6960d72cb3c9d12a6c (diff) | |
download | colobot-7c5a3514dd6e907866bddcbb09b4d9cbd958dd8e.tar.gz colobot-7c5a3514dd6e907866bddcbb09b4d9cbd958dd8e.tar.bz2 colobot-7c5a3514dd6e907866bddcbb09b4d9cbd958dd8e.zip |
Video mode changing
- added video mode querying & changing
- added joystick querying & changing
- cleaned up CApplication interface
Diffstat (limited to 'src/math')
-rw-r--r-- | src/math/intsize.h | 61 | ||||
-rw-r--r-- | src/math/size.h | 66 |
2 files changed, 127 insertions, 0 deletions
diff --git a/src/math/intsize.h b/src/math/intsize.h new file mode 100644 index 0000000..f4b2431 --- /dev/null +++ b/src/math/intsize.h @@ -0,0 +1,61 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +/** @defgroup MathIntSizeModule math/intsize.h + Contains the IntSize struct. + */ + +#pragma once + +// Math module namespace +namespace Math +{ + +/* @{ */ // start of group + +/** \struct IntSize math/size.h + \brief 2D size with integer dimensions */ +struct IntSize +{ + //! Width + int w; + //! Height + int h; + + //! Constructs a zero size: (0,0) + inline IntSize() + { + LoadZero(); + } + + //! Constructs a size from given dimensions: (w,h) + inline explicit IntSize(int w, int h) + { + this->w = w; + this->h = h; + } + + //! Sets the zero size: (0,0) + inline void LoadZero() + { + w = h = 0; + } +}; // struct Size + + +/* @} */ // end of group + +}; // namespace Math diff --git a/src/math/size.h b/src/math/size.h new file mode 100644 index 0000000..781b9a4 --- /dev/null +++ b/src/math/size.h @@ -0,0 +1,66 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +/** @defgroup MathSizeModule math/size.h + Contains the Size struct. + */ + +#pragma once + +// Math module namespace +namespace Math +{ + +/* @{ */ // start of group + +/** \struct Size math/size.h + \brief 2D size + + Represents a 2D size (w, h). + Is separate from Math::Point to avoid confusion. + + */ +struct Size +{ + //! Width + float w; + //! Height + float h; + + //! Constructs a zero size: (0,0) + inline Size() + { + LoadZero(); + } + + //! Constructs a size from given dimensions: (w,h) + inline explicit Size(float w, float h) + { + this->w = w; + this->h = h; + } + + //! Sets the zero size: (0,0) + inline void LoadZero() + { + w = h = 0.0f; + } +}; // struct Size + + +/* @} */ // end of group + +}; // namespace Math |