diff doodle/tk/geometry.d @ 132:bc5baa585b32

Updated to dmd 2.060
author David Bryant <bagnose@gmail.com>
date Thu, 02 Aug 2012 15:32:43 +0930
parents a274d16ab6ce
children 752676232e4b
line wrap: on
line diff
--- a/doodle/tk/geometry.d	Thu Jan 12 18:20:58 2012 +1030
+++ b/doodle/tk/geometry.d	Thu Aug 02 15:32:43 2012 +0930
@@ -45,8 +45,8 @@
         return std.string.format("(%f, %f)", _x, _y);
     }
 
-    double x() const { return _x; }
-    double y() const { return _y; }
+    @property double x() const { return _x; }
+    @property double y() const { return _y; }
 
     private {
         double _x = 0.0, _y = 0.0;
@@ -93,7 +93,7 @@
         return Vector(_x / d, _y / d);
     }
 
-    double length() const {
+    @property double length() const {
         return sqrt(_x * _x + _y * _y);
     }
 
@@ -101,8 +101,8 @@
         return std.string.format("[%f, %f]", _x, _y);
     }
 
-    double x() const { return _x; }
-    double y() const { return _y; }
+    @property double x() const { return _x; }
+    @property double y() const { return _y; }
 
     private {
         double _x = 0.0, _y = 0.0;
@@ -144,25 +144,25 @@
         this(corner1.x, corner1.y, corner.x - corner1.x, corner.y - corner1.y);
     }
 
-    double x0() const { return _position.x; }
-    double y0() const { return _position.y; }
-    double w()  const { return _size.x; }
-    double h()  const { return _size.y; }
-    double x1() const { return x0 + w; }
-    double y1() const { return y0 + h; }
+    @property double x0() const { return _position.x; }
+    @property double y0() const { return _position.y; }
+    @property double w()  const { return _size.x; }
+    @property double h()  const { return _size.y; }
+    @property double x1() const { return x0 + w; }
+    @property double y1() const { return y0 + h; }
 
     alias position corner0;
-    Point position() const { return _position; }
+    @property Point position() const { return _position; }
 
-    Vector size() const { return _size; }
+    @property Vector size() const { return _size; }
 
-    Point corner1() const { return _position + _size; }
+    @property Point corner1() const { return _position + _size; }
 
-    bool valid() const { return _size.x > 0.0 && _size.y > 0.0; }
+    @property bool valid() const { return _size.x > 0.0 && _size.y > 0.0; }
 
-    bool invalid() const { return !valid(); }
+    @property bool invalid() const { return !valid(); }
 
-    double area() const { return _size.x * _size.y; }
+    @property double area() const { return _size.x * _size.y; }
 
     // Intersection
     Rectangle opAnd(in Rectangle r) const {
@@ -209,7 +209,7 @@
 
     //
 
-    Point centre() const { return _position + _size / 2.0; }
+    @property Point centre() const { return _position + _size / 2.0; }
 
     string toString() {
         return std.string.format("{%s, %s}", _position, _size);
@@ -335,8 +335,8 @@
         assert(_gradient.length > 1e-6);        // FIXME as above
     }
 
-    Point point() const { return _point; }
-    Vector gradient() const { return _gradient; }
+    @property Point point() const { return _point; }
+    @property Vector gradient() const { return _gradient; }
 
     string toString() {
         return std.string.format("{%s %s}", _point, _gradient);
@@ -380,8 +380,8 @@
         _end = b;
     }
 
-    Point begin() const { return _begin; }
-    Point end() const { return _end; }
+    @property Point begin() const { return _begin; }
+    @property Point end() const { return _end; }
 
     string toString() {
         return std.string.format("{%s %s}", _begin, _end);