123

[psychlops/silverlight.git] / dev4 / psychlops / core / graphic / module.cs

diff --git a/dev4/psychlops/core/graphic/module.cs b/dev4/psychlops/core/graphic/module.cs
index 7afeeaf..6fc1f15 100644 (file)
--- a/dev4/psychlops/core/graphic/module.cs
+++ b/dev4/psychlops/core/graphic/module.cs
@@ -8,32 +8,19 @@ namespace Psychlops
        public partial struct Point\r
        {\r
                public double x, y, z;\r
-               public Point(double dx, double dy, double dz)\r
+               public Point(double dx, double dy, double dz = 0.0)\r
                {\r
                        x = dx;\r
                        y = dy;\r
                        z = dz;\r
                }\r
-               public Point(double dx, double dy)\r
-               {\r
-                       x = dx;\r
-                       y = dy;\r
-                       z = 0.0;\r
-               }\r
-               public Point set(double dx, double dy, double dz)\r
+               public Point set(double dx, double dy, double dz = 0.0)\r
                {\r
                        x = dx;\r
                        y = dy;\r
                        z = dz;\r
                        return this;\r
                }\r
-               public Point set(double dx, double dy)\r
-               {\r
-                       x = dx;\r
-                       y = dy;\r
-                       z = 0.0;\r
-                       return this;\r
-               }\r
 \r
                public static Point operator +(Point lhs, Point rhs)\r
                {\r
@@ -58,14 +45,7 @@ namespace Psychlops
                        r = g = b = lum;\r
                        a = 1.0;\r
                }\r
-               public Color(double red, double green, double blue)\r
-               {\r
-                       r = red;\r
-                       g = green;\r
-                       b = blue;\r
-                       a = 1.0;\r
-               }\r
-               public Color(double red, double green, double blue, double alpha)\r
+               public Color(double red, double green, double blue, double alpha = 1.0)\r
                {\r
                        r = red;\r
                        g = green;\r
@@ -77,14 +57,7 @@ namespace Psychlops
                        r = g = b = lum;\r
                        a = 1.0;\r
                }\r
-               public void set(double red, double green, double blue)\r
-               {\r
-                       r = red;\r
-                       g = green;\r
-                       b = blue;\r
-                       a = 1.0;\r
-               }\r
-               public void set(double red, double green, double blue, double alpha)\r
+               public void set(double red, double green, double blue, double alpha = 1.0)\r
                {\r
                        r = red;\r
                        g = green;\r
@@ -146,17 +119,17 @@ namespace Psychlops
                        target.datum = p;\r
                        return target.datum;\r
                }\r
-               public static Figure shift(this Figure target, double x, double y)\r
+               public static Figure shift(this Figure target, double x, double y, double z = 0.0)\r
                {\r
-                       return target.shift(new Point(x, y));\r
+                       return target.shift(new Point(x, y, z));\r
                }\r
                public static Figure centering(this Figure target)\r
                {\r
                        return target.centering(Main.drawable.getCenter());\r
                }\r
-               public static Figure centering(this Figure target, double x, double y)\r
+               public static Figure centering(this Figure target, double x, double y, double z = 0.0)\r
                {\r
-                       return target.centering(new Point(x, y));\r
+                       return target.centering(new Point(x, y, z));\r
                }\r
        }\r
 \r