--- a/src/proto2/Dimension.hh Sat Nov 08 21:25:56 2008 +0000
+++ b/src/proto2/Dimension.hh Sun Nov 09 20:40:46 2008 +0000
@@ -4,44 +4,44 @@
#include <iostream>
class Dimension {
- public:
- uint32_t width;
- uint32_t height;
+ public:
+ uint32_t width;
+ uint32_t height;
- Dimension (uint32_t width, uint32_t height) : width(width), height(height) { }
+ Dimension (uint32_t width, uint32_t height) : width(width), height(height) { }
};
class PositionDelta {
- public:
- uint32_t dx;
- uint32_t dy;
+ public:
+ uint32_t dx;
+ uint32_t dy;
- PositionDelta (uint32_t dx, uint32_t dy) : dx(dx), dy(dy) { }
+ PositionDelta (uint32_t dx, uint32_t dy) : dx(dx), dy(dy) { }
};
class Coordinate {
- public:
- uint32_t x;
- uint32_t y;
-
- Coordinate (uint32_t x, uint32_t y) : x(x), y(y) { }
-
- Coordinate &operator+= (const PositionDelta &d) {
- this->x += d.dx;
- this->y += d.dy;
+ public:
+ uint32_t x;
+ uint32_t y;
- return *this;
- }
+ Coordinate (uint32_t x, uint32_t y) : x(x), y(y) { }
- uint32_t scaledX() {
- // Scale the coordinate so that it
- // matches the pixel resolution
- return this->x/1;
- }
+ Coordinate &operator+= (const PositionDelta &d) {
+ this->x += d.dx;
+ this->y += d.dy;
- uint32_t scaledY() {
- return this->y/1;
- }
+ return *this;
+ }
+
+ uint32_t scaledX() {
+ // Scale the coordinate so that it
+ // matches the pixel resolution
+ return this->x/1;
+ }
+
+ uint32_t scaledY() {
+ return this->y/1;
+ }
};
std::ostream& operator<< (std::ostream &s, const Coordinate &c);