X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test4%2FMainPage.xaml.cs;h=a125451311ae46e74e9bd51ae4ee47673ed55730;hb=0518057c18438b6b749a3845c8eeeb5402ee893b;hp=7aa4b92e753551fe4e05e67d5f02a0a982e3d361;hpb=cb8916a7a5cd929f57b3f9edd99209680db90546;p=psychlops%2Fsilverlight.git

diff --git a/test4/MainPage.xaml.cs b/test4/MainPage.xaml.cs
index 7aa4b92..a125451 100644
--- a/test4/MainPage.xaml.cs
+++ b/test4/MainPage.xaml.cs
@@ -1,15 +1,22 @@
 using Psychlops;
+using System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Media3D;
 
-namespace PsychlopsSilverlight3test
+
+namespace PsychlopsSilverlight4test
 {
 	public partial class MainPage : System.Windows.Controls.UserControl
 	{
 		//System.Collections.Generic.IEnumerator<int> main_routine;
 		public System.Windows.Controls.Image master;
-		public PsychlopsMain main;
+		public PsychlopsSilverlightApp.PsychlopsMain main;
 #if DEBUG
 		public System.Windows.Controls.TextBlock DebugConsole;
 #endif
+		System.Windows.Controls.Image img;
 		public MainPage()
 		{
 			InitializeComponent();
@@ -23,28 +30,44 @@ namespace PsychlopsSilverlight3test
 			System.Windows.Application.Current.Host.Settings.MaxFrameRate = 60;
 			System.Windows.Application.Current.Host.Settings.EnableFrameRateCounter = true;
 			System.Windows.Application.Current.Host.Settings.EnableCacheVisualization = false;
+			//System.Windows.Application.Current.Host.Settings.EnableGPUAcceleration = false;
 			//<param name="enableGPUAcceleration" value="true"/>
 			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 = new PsychlopsSilverlightApp.PsychlopsMain();
+//			Psychlops.AppState.statusBar.
 			Psychlops.Internal.Main.routine = new System.Threading.Thread(main.psychlops_main);
 			Psychlops.Internal.Main.routine.Start();
 			//main.initialize();
 			//main_routine = main.psychlops_main();
 
 			Psychlops.Internal.Main.statusBar = AppStatusBar;
-			Psychlops.Internal.Main.widgetStack = Controller;
-			AppStatusBar.Text = System.Windows.Application.Current.Host.Settings.EnableGPUAcceleration.ToString();
+			Psychlops.Internal.Main.layoutRoot = LayoutRoot;
+			//Psychlops.Internal.Main.widgetStack = Controller;
+			AppStatusBar.Text = "Now starting Psychlops environment... please wait a minute";
+
+
+//eff__ = new Psychlops.Shader.GaborProgram();
+//rect__ = new System.Windows.Shapes.Rectangle();
+//rect__.Width = 200;
+//rect__.Height = 200;
+//rect__.Effect = eff__;
+//rect__.Fill = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Colors.Blue);
 		}
 		protected void getFocusMouseEnter(object sender, System.Windows.Input.MouseEventArgs e) {
 			this.Focus();
+//if(!b) { LayoutRoot.Children.Add(rect__); b = true; }
 		}
+//System.Windows.Shapes.Rectangle rect__;
+//Psychlops.Shader.GaborProgram eff__;
+//bool b = false;
 
 		private void CompositionTarget_Rendering(object sender, System.EventArgs e)
 		{
+			//Controller.Children.Clear();
 			if (Main.canvas != null) Main.canvas.executeFlip();
 			//if (nextIntervalFrame-- <= 0)
 			//{
@@ -54,5 +77,8 @@ namespace PsychlopsSilverlight3test
 		}
 
 	}
+
+
+
 }