summaryrefslogtreecommitdiffstats
path: root/src/math
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-08-11 17:17:04 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-08-11 17:17:04 +0200
commit7f80ca297154809523cd533edf1842ab1ae391aa (patch)
tree08eb658d2dad62ac683e55dc89cc97bc898fd95c /src/math
parent63257034c946d40fb3ecc73a9ee3dc9d1e0a1e34 (diff)
downloadcolobot-7f80ca297154809523cd533edf1842ab1ae391aa.tar.gz
colobot-7f80ca297154809523cd533edf1842ab1ae391aa.tar.bz2
colobot-7f80ca297154809523cd533edf1842ab1ae391aa.zip
Render mode setting, refactoring
- finished SetState in CEngine - refactored Size and IntSize back to Point and IntPoint - other minor changes in CEngine
Diffstat (limited to 'src/math')
-rw-r--r--src/math/intsize.h70
-rw-r--r--src/math/size.h75
2 files changed, 0 insertions, 145 deletions
diff --git a/src/math/intsize.h b/src/math/intsize.h
deleted file mode 100644
index c88f09b..0000000
--- a/src/math/intsize.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// * 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
-
-#include "math/intpoint.h"
-
-
-// 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;
- }
-
- //! Converts Point to Size
- inline static Math::IntSize FromIntPoint(Math::IntPoint p)
- {
- return Math::IntSize(p.x, p.y);
- }
-}; // struct Size
-
-
-/* @} */ // end of group
-
-}; // namespace Math
diff --git a/src/math/size.h b/src/math/size.h
deleted file mode 100644
index 03cffaa..0000000
--- a/src/math/size.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// * 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
-
-#include "math/point.h"
-
-
-// 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;
- }
-
- //! Converts Point to Size
- inline static Math::Size FromPoint(Math::Point p)
- {
- return Math::Size(p.x, p.y);
- }
-}; // struct Size
-
-
-/* @} */ // end of group
-
-}; // namespace Math