Graph3D.pas

Configuration/GlobalAssemblyInfo.cs

@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "3";
 	public const string Build = "5";
-	public const string Revision = "1639";
+	public const string Revision = "1640";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

Configuration/Version.defs

@@ -1,4 +1,4 @@
-%COREVERSION%=5
-%REVISION%=1639
 %MINOR%=3
+%REVISION%=1640
+%COREVERSION%=5
 %MAJOR%=3

ReleaseGenerators/PascalABCNET_version.nsh

@@ -1 +1 @@
-!define VERSION '3.3.5.1639'
+!define VERSION '3.3.5.1640'

TestSuite/CompilationSamples/graph3d.pas

@@ -767,15 +767,6 @@ type
         d();
     end;
     
-    procedure BeginT;
-    begin
-      sb := CreateStoryboard;
-      InitAnim(sb);
-      ApplyAllDecorators;
-      sb.Completed += procedure (o, e) -> sb.Children.Clear;
-      sb.Begin;
-    end;
-    
     procedure InitAnimWait(sb: StoryBoard; waittime: real); virtual;
     begin
     end;
@@ -870,9 +861,34 @@ type
       Result := Self;
     end;
     
+  private
+    procedure BeginT;
+    begin
+      sb := CreateStoryboard;
+      InitAnim(sb);
+      ApplyAllDecorators;
+      sb.Completed += procedure (o, e) -> sb.Children.Clear;
+      sb.Begin;
+    end;
+    procedure RemoveT := begin
+      sb.Pause;
+      sb := new Storyboard;
+    end;
+    procedure ChangeT(a: MyAnimation);
+    begin
+      sb := CreateStoryboard;
+      Print(a.sb);
+      foreach var d in a.sb.Children do
+        sb.Children.Add(d);
+      Print(2);
+    end;
+  public 
     procedure &Begin; virtual := Invoke(BeginT);
-    procedure Pause := sb.Pause;
-    procedure Resume := sb.Resume;
+    procedure Remove := Invoke(RemoveT);
+    procedure Change(a: MyAnimation) := Invoke(ChangeT,a);
+    procedure Pause := if sb<>nil then sb.Pause;
+    procedure Resume := if sb<>nil then sb.Resume;
+
     function Duration: real; virtual := seconds;
     function &Then(second: MyAnimation): MyAnimation;
     function Forever: MyAnimation; virtual := Self;
@@ -880,6 +896,16 @@ type
     function AccelerationRatio(acceleration: real; deceleration: real := 0): MyAnimation; virtual := Self;
   end;
   
+  EmptyAnimation = class(MyAnimation)
+  public
+    constructor(wait: real);
+    begin
+      Self.Seconds := wait;
+    end;
+    procedure InitAnim(sb: StoryBoard); virtual := InitAnimWait(sb, Seconds);
+  end;
+  
+  
   Double1AnimationBase = class(MyAnimation)
   private 
     v: real;
@@ -1279,6 +1305,8 @@ function operator*(a, b: MyAnimation): MyAnimation; extensionmethod := Animate.G
 
 function MyAnimation.&Then(second: MyAnimation): MyAnimation := Self + second;
 
+function EmptyAnim(sec: real) := EmptyAnimation.Create(sec);
+
 //------------------------------ End Animation -------------------------------
 
 

bin/Lib/Graph3D.pas

@@ -40,6 +40,7 @@ type
   TupleInt3 = (integer, integer, integer);
   TupleReal3 = (real, real, real);
   Point3D = Point3D;
+  Point = System.Windows.Point;
   
   {MyWindow = class(GWindow)
   public