From d3fb66b4dd23d21de81a5419dd74dd29a0ecdf32 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 8 Dec 1998 21:04:40 +0000
Subject: OpenGL patches from Bill.

git-svn-id: file:///fltk/svn/fltk/trunk@152 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 test/checkers.cxx | 12 ++++++------
 test/glpuzzle.cxx |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/test/checkers.cxx b/test/checkers.cxx
index c4355099c..6ccffa84c 100644
--- a/test/checkers.cxx
+++ b/test/checkers.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: checkers.cxx,v 1.7 1998/12/02 17:35:59 mike Exp $"
+// "$Id: checkers.cxx,v 1.8 1998/12/08 21:04:39 mike Exp $"
 //
 // Checkers game for the Fast Light Tool Kit (FLTK).
 //
@@ -921,10 +921,10 @@ void draw_piece(int which, int x, int y) {
   case WHITEKING: which = 3; break;
   default: return;
   }
-  fl_color(0, 1, 0); bm[which][0]->draw(x, y);
-  fl_color(200, 100, 200); bm[which][1]->draw(x, y);
-  fl_color(100, 100, 200); bm[which][2]->draw(x, y);
-  fl_color(200, 200, 100); bm[which][3]->draw(x, y);
+  fl_color(FL_BLACK); bm[which][0]->draw(x, y);
+  fl_color(FL_INACTIVE_COLOR); bm[which][1]->draw(x, y);
+  fl_color(FL_SELECTION_COLOR); bm[which][2]->draw(x, y);
+  fl_color(FL_WHITE); bm[which][3]->draw(x, y);
 }
 
 //----------------------------------------------------------------
@@ -1366,5 +1366,5 @@ int main(int argc, char **argv) {
 }
 
 //
-// End of "$Id: checkers.cxx,v 1.7 1998/12/02 17:35:59 mike Exp $".
+// End of "$Id: checkers.cxx,v 1.8 1998/12/08 21:04:39 mike Exp $".
 //
diff --git a/test/glpuzzle.cxx b/test/glpuzzle.cxx
index f62fa1b8a..1ccfde39f 100644
--- a/test/glpuzzle.cxx
+++ b/test/glpuzzle.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: glpuzzle.cxx,v 1.3 1998/10/21 14:21:28 mike Exp $"
+// "$Id: glpuzzle.cxx,v 1.4 1998/12/08 21:04:40 mike Exp $"
 //
 // OpenGL puzzle demo for the Fast Light Tool Kit (FLTK).
 //
@@ -474,7 +474,7 @@ redraw(void)
 {
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
-  gluPerspective(45, 1.0, 0.1, 100.0);
+  gluPerspective(45, viewport[2]*1.0/viewport[3], 0.1, 100.0);
 
   drawAll();
 
@@ -793,7 +793,7 @@ selectPiece(int mousex, int mousey)
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   gluPickMatrix(mousex, H - mousey, 4, 4, viewport);
-  gluPerspective(45, 1.0, 0.1, 100.0);
+  gluPerspective(45, viewport[2]*1.0/viewport[3], 0.1, 100.0);
 
   drawAll();
 
@@ -1479,5 +1479,5 @@ main(int argc, char **argv)
 #endif // added for fltk's distribution
 
 //
-// End of "$Id: glpuzzle.cxx,v 1.3 1998/10/21 14:21:28 mike Exp $".
+// End of "$Id: glpuzzle.cxx,v 1.4 1998/12/08 21:04:40 mike Exp $".
 //
-- 
cgit v1.2.3