image

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

diff --git a/dev4/psychlops/core/graphic/image.cs b/dev4/psychlops/core/graphic/image.cs
index 4c775ae..f4c48d9 100644 (file)
--- a/dev4/psychlops/core/graphic/image.cs
+++ b/dev4/psychlops/core/graphic/image.cs
@@ -21,12 +21,23 @@ namespace Psychlops{
                public Rectangle self_rect;\r
                protected bool AsyncBool;\r
 \r
+               public Image(string uri)\r
+               {\r
+                       self_rect = new Rectangle();\r
+                       load__(uri);\r
+               }\r
+\r
                public Image(int wid, int hei)\r
                {\r
-                       AsyncBool = false;\r
+                       self_rect = new Rectangle(wid, hei);\r
                        initialize__(wid, hei);\r
+               }\r
+\r
+               public Image set(int wid, int hei)\r
+               {\r
                        self_rect = new Rectangle(wid, hei);\r
-                       while (!AsyncBool) { }\r
+                       initialize__(wid, hei);\r
+                       return this;\r
                }\r
 \r
                public Figure shift(Point p)\r
@@ -53,26 +64,23 @@ namespace Psychlops{
                public void field(System.Func<int, int, System.Windows.Media.Color> func)\r
                {\r
                        field__(func);\r
-                       //buffer.ForEach(func);\r
                }\r
                public void field(System.Func<int, int, System.Windows.Media.Color, System.Windows.Media.Color> func)\r
                {\r
                        field__(func);\r
-                       //buffer.ForEach(func);\r
                }\r
                public void each(System.Func<int, int, System.Windows.Media.Color> func)\r
                {\r
                        field__(func);\r
-                       //buffer.ForEach(func);\r
                }\r
                public void each(System.Func<int, int, System.Windows.Media.Color, System.Windows.Media.Color> func)\r
                {\r
                        field__(func);\r
-                       //buffer.ForEach(func);\r
                }\r
 \r
-               public void load()\r
+               public void load(string uri)\r
                {\r
+                       load__(uri);\r
                }\r
 \r
                public void draw()\r