From feba563611f39efe4f71cf09347d5aa9cd13ada6 Mon Sep 17 00:00:00 2001
From: pixel <pixel>
Date: Fri, 4 Apr 2003 15:06:29 +0000
Subject: Finished filling

---
 src/test.cc | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/test.cc b/src/test.cc
index 2d42107..729c972 100644
--- a/src/test.cc
+++ b/src/test.cc
@@ -23,9 +23,11 @@ virtual int startup() throw (GeneralException) {
     mogltk::glbase * gl = new mogltk::glbase();
     mogltk::glshape * sh = new mogltk::glshape();
     mogltk::glfont * font = new mogltk::glfont(&Input("font-2.bin"));
+
 //    mogltk::base * gl = new mogltk::base();
 //    mogltk::shape * sh = new mogltk::shape();
 //    mogltk::font * font = new mogltk::font(&Input("font-2.bin"));
+
     mogltk::Sprite * s = new mogltk::Sprite(&Input("cursor.rgba"), 25, 25);
     
     mogltk::engine::setcursorvisible(true);
@@ -35,6 +37,8 @@ virtual int startup() throw (GeneralException) {
     
     Color AlphaBlue(AQUA);
     AlphaBlue.A = 50;
+
+    mogltk::fill * f = sh->fcircle(320, 240, 50);
     
     while (!mogltk::engine::quitrequested()) {
 	sx1 = 320 + 320 * sin(0.983 * t + 3.15);
@@ -42,12 +46,12 @@ virtual int startup() throw (GeneralException) {
 	sy1 = 240 + 240 * sin(0.692 * t + 8.21);
 	sy2 = 240 + 240 * sin(1.029 * t + 2.42);
 
-	gl->Enter2DMode();
+//	gl->Enter2DMode();
 
-	sh->tbox(mytex, 50, 50, 561, 561, BLACK, RED, LIME, BLUE);
-	sh->box(400, 100, 450, 150, BLACK, RED, LIME, BLUE);    
+//	sh->tbox(mytex, 50, 50, 561, 561, BLACK, RED, LIME, BLUE);
+//	sh->box(400, 100, 450, 150, BLACK, RED, LIME, BLUE);    
 
-	sh->box(5, 5, 150, 80, CORNFLOWERBLUE, DEEPSKYBLUE, MIDNIGHTBLUE, NAVY);
+//	sh->box(5, 5, 150, 80, CORNFLOWERBLUE, DEEPSKYBLUE, MIDNIGHTBLUE, NAVY);
 	font->setshadow(1);
 	font->putcursor(10, 30);
 	font->setcolor(WHITE);
@@ -64,11 +68,12 @@ virtual int startup() throw (GeneralException) {
 	sh->button(200, 150, 300, 200, "Bouton");
 
 //	for (int j = 0; j < 100; j++) {
-	    sh->pcircle(320, 240, 50);
+	    sh->fdraw(f);
 //	}
 //	sh->arc(320, 240, 50, 0, 0);
 	
 	sh->box(MIN(sx1, sx2), MIN(sy1, sy2), MAX(sx1, sx2), MAX(sy1, sy2), AlphaBlue);
+	sh->obox(MIN(sx1, sx2), MIN(sy1, sy2), MAX(sx1, sx2), MAX(sy1, sy2), AlphaBlue);
 
 	font->putcursor(550, 400);
 	font->printf("FPS: %.2f\n", mogltk::engine::FPS());
@@ -78,7 +83,7 @@ virtual int startup() throw (GeneralException) {
 
 	s->draw(mogltk::engine::mouseX() - 8, mogltk::engine::mouseY() - 6);
 
-	gl->Leave2DMode();
+//	gl->Leave2DMode();
 
 
 	gl->Flip();
-- 
cgit v1.2.3