32

[psychlops/silverlight.git] / test3 / MainPage.xaml.cs

diff --git a/test3/MainPage.xaml.cs b/test3/MainPage.xaml.cs
index dcfdd2d..7aa4b92 100644 (file)
--- a/test3/MainPage.xaml.cs
+++ b/test3/MainPage.xaml.cs
@@ -4,7 +4,7 @@ namespace PsychlopsSilverlight3test
 {\r
        public partial class MainPage : System.Windows.Controls.UserControl\r
        {\r
-               System.Collections.Generic.IEnumerator<int> main_routine;\r
+               //System.Collections.Generic.IEnumerator<int> main_routine;\r
                public System.Windows.Controls.Image master;\r
                public PsychlopsMain main;\r
 #if DEBUG\r
@@ -14,7 +14,7 @@ namespace PsychlopsSilverlight3test
                {\r
                        InitializeComponent();\r
                        // Show fps counter\r
-                       //Canvas.default_buffer_frame = main_buffer;\r
+\r
                        Canvas.default_api_canvas = LayoutRoot;\r
                        Canvas.default_panel = this;\r
                        this.IsTabStop = true;\r
@@ -22,35 +22,35 @@ namespace PsychlopsSilverlight3test
                        this.MouseEnter += getFocusMouseEnter;\r
                        System.Windows.Application.Current.Host.Settings.MaxFrameRate = 60;\r
                        System.Windows.Application.Current.Host.Settings.EnableFrameRateCounter = true;\r
-                       System.Windows.Application.Current.Host.Settings.EnableCacheVisualization = true;\r
+                       System.Windows.Application.Current.Host.Settings.EnableCacheVisualization = false;\r
+                       //<param name="enableGPUAcceleration" value="true"/>\r
                        System.Windows.Media.CompositionTarget.Rendering += new System.EventHandler(CompositionTarget_Rendering);\r
                        //main_routine =  new System.ComponentModel.BackgroundWorker();\r
                        //main_routine.DoWork += new System.ComponentModel.DoWorkEventHandler(psychlops_main);\r
                        //main_routine.RunWorkerAsync();\r
 \r
                        main = new PsychlopsMain();\r
+                       Psychlops.Internal.Main.routine = new System.Threading.Thread(main.psychlops_main);\r
+                       Psychlops.Internal.Main.routine.Start();\r
                        //main.initialize();\r
-                       //main_routine = new System.Threading.Thread(ThreadTest2);\r
-                       //main_routine.Start();\r
-                       main_routine = main.psychlops_main();\r
-#if DEBUG\r
-                       DebugConsole = new System.Windows.Controls.TextBlock();\r
-                       TotalRoot.Children.Add(DebugConsole);\r
-#endif\r
+                       //main_routine = main.psychlops_main();\r
+\r
+                       Psychlops.Internal.Main.statusBar = AppStatusBar;\r
+                       Psychlops.Internal.Main.widgetStack = Controller;\r
+                       AppStatusBar.Text = System.Windows.Application.Current.Host.Settings.EnableGPUAcceleration.ToString();\r
                }\r
                protected void getFocusMouseEnter(object sender, System.Windows.Input.MouseEventArgs e) {\r
                        this.Focus();\r
                }\r
 \r
-               int nextIntervalFrame = 1;\r
                private void CompositionTarget_Rendering(object sender, System.EventArgs e)\r
                {\r
-                       nextIntervalFrame--;\r
-                       if (nextIntervalFrame<=0)\r
-                       {\r
-                               main_routine.MoveNext();\r
-                               nextIntervalFrame = main_routine.Current;\r
-                       }\r
+                       if (Main.canvas != null) Main.canvas.executeFlip();\r
+                       //if (nextIntervalFrame-- <= 0)\r
+                       //{\r
+                       //      main_routine.MoveNext();\r
+                       //      nextIntervalFrame = main_routine.Current;\r
+                       //}\r
                }\r
 \r
        }\r