summaryrefslogtreecommitdiffstats
path: root/src/math/intsize.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-08-03 23:23:13 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-08-03 23:23:13 +0200
commit61bfb22f27f5216f989c023a5e39fad7e356d2d6 (patch)
tree9d7a8a760ace272739f651a2f4208326731a6fe7 /src/math/intsize.h
parent5e637ca0288ddd631ec33e1d620cd4a73bcdc2be (diff)
downloadcolobot-61bfb22f27f5216f989c023a5e39fad7e356d2d6.tar.gz
colobot-61bfb22f27f5216f989c023a5e39fad7e356d2d6.tar.bz2
colobot-61bfb22f27f5216f989c023a5e39fad7e356d2d6.zip
Basic font rendering
- added basic font rendering - minor refactoring & fixes
Diffstat (limited to 'src/math/intsize.h')
-rw-r--r--src/math/intsize.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/math/intsize.h b/src/math/intsize.h
index f4b2431..d53de85 100644
--- a/src/math/intsize.h
+++ b/src/math/intsize.h
@@ -20,6 +20,9 @@
#pragma once
+#include "math/intpoint.h"
+
+
// Math module namespace
namespace Math
{
@@ -31,9 +34,9 @@ namespace Math
struct IntSize
{
//! Width
- int w;
+ long w;
//! Height
- int h;
+ long h;
//! Constructs a zero size: (0,0)
inline IntSize()
@@ -42,7 +45,7 @@ struct IntSize
}
//! Constructs a size from given dimensions: (w,h)
- inline explicit IntSize(int w, int h)
+ inline explicit IntSize(long w, long h)
{
this->w = w;
this->h = h;
@@ -53,6 +56,12 @@ struct IntSize
{
w = h = 0;
}
+
+ //! Converts Point to Size
+ inline static Math::IntSize FromIntPoint(Math::IntPoint p)
+ {
+ return Math::IntSize(p.x, p.y);
+ }
}; // struct Size