X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win32gl%2Ftest%2Fcompilenew.cpp;h=28faba3404b0d76c08d9a3bc78159944cbe627de;hb=e77ebcd1edec379c18fefacdf9d91d140950f0a8;hp=445b6a5821f6c3c05049c9bc385f341a9bd478b2;hpb=29f119a6078d76e066a5b775c7669bced4013af1;p=psychlops%2Fcpp.git

diff --git a/win32gl/test/compilenew.cpp b/win32gl/test/compilenew.cpp
index 445b6a5..28faba3 100644
--- a/win32gl/test/compilenew.cpp
+++ b/win32gl/test/compilenew.cpp
@@ -11,6 +11,52 @@ using namespace Psychlops;    // Initially developed with Psychlops Win32 1.5.3
 
 ///+ Stimulus drawing function
 //// A function for stimulus drawing (main body)
+
+
+void psychlops_main() {
+	Canvas cnvs(Canvas::window);
+
+	Letters let(L"flower_png24.png");
+	let.fill = Color::white;
+
+	Psychlops::Ellipse rect(100,100);
+	rect.fill = Color::red;
+
+	Devices::GenericParallelPort trigger("USB_PARALLEL", 1+8);
+
+	int t=0;
+
+	while(!Keyboard::esc.pushed()) {
+		t++;
+		Display::clear(); //Clear window
+
+		//if(t%100 == 0)
+		//	rs = CreateProcess("C:\\Windows\\System32\\print.exe",(LPTSTR)" /D:LPT1 D:\\Users\\hskwk\\Desktop\\zzz.txt",NULL,NULL,FALSE,NORMAL_PRIORITY_CLASS,NULL,NULL,&si,&pi);
+
+		if(t%120==0) trigger.trigger();
+		rect.draw();
+
+		Display::flip(); // Flip frame buffers
+	}
+}
+///- Stimulus drawing function
+
+
+
+#if 0
+
+// Motion with glass patterns.
+// Ross, J., Badcock, D. R., and Hayes, A. (2000)
+// Coherent global motion in the absence of coherent velocity signals.
+// Current Biology, 10, 679-682.
+///+ Prefix
+//// Include Psychlops Package
+#include <psychlops.h>
+using namespace Psychlops;    // Initially developed with Psychlops Win32 1.5.3 / 20110311
+///- Prefix
+
+///+ Stimulus drawing function
+//// A function for stimulus drawing (main body)
 void psychlops_main() {
 
 	Canvas cnvs(Canvas::window);
@@ -41,7 +87,6 @@ void psychlops_main() {
 ///- Stimulus drawing function
 
 
-#if 0
 
 #include <psychlops.h>
 using namespace Psychlops;