X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test3%2FMainPage.xaml.cs;h=7aa4b92e753551fe4e05e67d5f02a0a982e3d361;hb=e05ab8e68d381f8f5c9a2ddb7c63b89a7bb6371a;hp=8bb50a00615992205ccdf23a115536a48ed228e2;hpb=0d510ea424330e5e8c71dbc4576611e5f256d956;p=psychlops%2Fsilverlight.git diff --git a/test3/MainPage.xaml.cs b/test3/MainPage.xaml.cs index 8bb50a0..7aa4b92 100644 --- a/test3/MainPage.xaml.cs +++ b/test3/MainPage.xaml.cs @@ -14,7 +14,7 @@ namespace PsychlopsSilverlight3test { InitializeComponent(); // Show fps counter - //Canvas.default_buffer_frame = main_buffer; + Canvas.default_api_canvas = LayoutRoot; Canvas.default_panel = this; this.IsTabStop = true; @@ -22,21 +22,22 @@ namespace PsychlopsSilverlight3test this.MouseEnter += getFocusMouseEnter; System.Windows.Application.Current.Host.Settings.MaxFrameRate = 60; System.Windows.Application.Current.Host.Settings.EnableFrameRateCounter = true; - System.Windows.Application.Current.Host.Settings.EnableCacheVisualization = true; + System.Windows.Application.Current.Host.Settings.EnableCacheVisualization = false; + // System.Windows.Media.CompositionTarget.Rendering += new System.EventHandler(CompositionTarget_Rendering); //main_routine = new System.ComponentModel.BackgroundWorker(); //main_routine.DoWork += new System.ComponentModel.DoWorkEventHandler(psychlops_main); //main_routine.RunWorkerAsync(); main = new PsychlopsMain(); - //main.initialize(); Psychlops.Internal.Main.routine = new System.Threading.Thread(main.psychlops_main); Psychlops.Internal.Main.routine.Start(); + //main.initialize(); //main_routine = main.psychlops_main(); -#if DEBUG - DebugConsole = new System.Windows.Controls.TextBlock(); - TotalRoot.Children.Add(DebugConsole); -#endif + + Psychlops.Internal.Main.statusBar = AppStatusBar; + Psychlops.Internal.Main.widgetStack = Controller; + AppStatusBar.Text = System.Windows.Application.Current.Host.Settings.EnableGPUAcceleration.ToString(); } protected void getFocusMouseEnter(object sender, System.Windows.Input.MouseEventArgs e) { this.Focus();