===================================================================
RCS file: /home/cvs/OpenXM/src/oxmgraph/graph.c,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -p -r1.1 -r1.5
--- OpenXM/src/oxmgraph/graph.c	2009/02/08 04:56:59	1.1
+++ OpenXM/src/oxmgraph/graph.c	2009/03/18 02:35:00	1.5
@@ -5,11 +5,12 @@ License: This software is distributed under the 2-clua
 (http://en.wikipedia.org/wiki/BSD_licenses)
 */
 
-#ifdef MAC_OS_X
+#if defined (_MSC_VER)
+#include <windows.h>
+#endif
+#if defined(__APPLE__)
 #include <GLUT/glut.h>
 #else
-#include<GL/gl.h>
-#include<GL/glu.h>
 #include<GL/glut.h>
 #endif
 
@@ -152,19 +153,26 @@ GLboolean lightSwitch = GL_FALSE;
 GLboolean textureSwitch = GL_FALSE;
 GLboolean blendSwitch = GL_FALSE;
 
-/* for bitfont */
-int str_position = 500;
-
 void makeTexture(void)
 {
   FILE *fp; 
-  int x, z; 
+  int x, z;
+  char *oxhome;
+  char fname[1024];
 
   /* texture file open (file name is "inobuta.tga")*/
-  if((fp=fopen("inobuta.tga", "rb"))==NULL){
-    fprintf(stderr, "texture file cannot be open\n");
-    return;
+  oxhome = getenv("OpenXM_HOME");
+  if (oxhome != NULL) {
+	sprintf(fname,"%s/share/oxmgraph/inobuta.tga",oxhome);
+  }else{
+	sprintf(fname,"/usr/local/share/oxmgraph/inobuta.tgz");
   }
+  if((fp=fopen(fname, "rb"))==NULL){
+	if ((fp = fopen("inobuta.tgz","rb")) == NULL) {
+	  fprintf(stderr, "texture file cannot be open\n");
+	  return;
+	}
+  }
   fseek(fp, 18, SEEK_SET);
   for (x=0; x<TEX_HEIGHT; x++) {
     for (z=0; z<TEX_WIDTH; z++) {
@@ -248,7 +256,12 @@ static void graph(void)
 	glEnd();
 	
 	if ( exNet ) {
-	  glColor3f(0.0,0.0,0.0);
+	  glColor3f(1.0,1.0,1.0);
+	  if(!blendSwitch) {
+	    glDisable(GL_LIGHTING);
+	    glDisable(GL_TEXTURE_2D);
+	    glColor3f(0.0,0.0,0.0);
+	  }
 	  glBegin(GL_LINE_LOOP);
 	    glVertex3f(x, y, polynomial(x,y));
 	    glVertex3f(x+DIV, y, polynomial(x+DIV, y));
@@ -259,6 +272,10 @@ static void graph(void)
 	    glVertex3f(x, y, polynomial(x, y));
 	    glVertex3f(x+DIV, y+DIV, polynomial(x+DIV, y+DIV));
 	  glEnd();
+	  if(lightSwitch)
+	    glEnable(GL_LIGHTING);
+	  if(textureSwitch) 
+	    glEnable(GL_TEXTURE_2D); 
       	}
       }
     }
@@ -314,12 +331,21 @@ void triangle(void)
 	glEnd();
 
 	if( exNet ) {
-	glColor3f(0.0,0.0,0.0);
-	glBegin(GL_LINE_LOOP);
-	  glVertex3f(triangles[j][0],triangles[j][1],triangles[j][2]);
-	  glVertex3f(triangles[j][3],triangles[j][4],triangles[j][5]);
-	  glVertex3f(triangles[j][6],triangles[j][7],triangles[j][8]);
-	glEnd();
+	  glColor3f(1.0,1.0,1.0);
+	  if(!blendSwitch) {
+	    glDisable(GL_LIGHTING);
+	    glDisable(GL_TEXTURE_2D);
+	    glColor3f(0.0,0.0,0.0);
+	  }
+	  glBegin(GL_LINE_LOOP);
+	    glVertex3f(triangles[j][0],triangles[j][1],triangles[j][2]);
+	    glVertex3f(triangles[j][3],triangles[j][4],triangles[j][5]);
+	    glVertex3f(triangles[j][6],triangles[j][7],triangles[j][8]);
+	  glEnd();
+	  if(lightSwitch)
+	    glEnable(GL_LIGHTING);
+	  if(textureSwitch) 
+	    glEnable(GL_TEXTURE_2D); 
 	}
       }
   }
@@ -390,7 +416,6 @@ static void box(void)
 static void axis(void)
 {
   double i;
-  /*  glLineWidth(2.0); */
   glBegin(GL_LINES);
   glColor3f(1.0, 0.0, 0.0);
   glVertex3f(-size, 0, 0);  glVertex3f(size, 0, 0);
@@ -415,10 +440,6 @@ static void axis(void)
   glRasterPos3i(0,0,size+1);
   glBitmap (10, 12, 0.0, 0.0, 11.0, 0.0, raster_Z);
 
-  /*  glColor3f(1.0, 1.0, 1.0);
-  glRasterPos3i(5,1,0);
-  glBitmap (10, 12, 0.0, 0.0, 11.0, 0.0, raster_5);*/
-
   glColor3f(1.0, 1.0, 1.0);
   glRasterPos3i(5,1,0);
   glBitmap (10, 22, 0.0, 0.0, 11.0, 0.0, raster_$);
@@ -474,12 +495,10 @@ static void recalcGraph(void)
   triangle();
   glEndList();
 
-  /* Axis and Box */
-  /*  theWhole = glGenLists(1);
-      glNewList(theWhole, GL_COMPILE); */
-      glCallList(theAxis);
-      glCallList(theBox);
-      /*  glEndList(); */
+
+  glCallList(theAxis);
+  glCallList(theBox);
+
   newGraph = 0;
 }
 
@@ -491,7 +510,7 @@ static void init(void)
   glClearColor(0.2, 0.2, 0.2, 0.0);
   glShadeModel(GL_FLAT);
   glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
-  /*  
+  /* 
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, model_ambient);
   */
   glMatrixMode(GL_PROJECTION);
@@ -570,7 +589,6 @@ void display(void)
 
 void reshape(int w, int h)
 {
-  str_position = h;
   glViewport(0,0, (GLsizei)w, (GLsizei)h);
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
@@ -695,6 +713,7 @@ void controlExpression(int value)
     glDisable(GL_LIGHTING);
     glDisable(GL_TEXTURE_2D);  
     newModel = 1;
+    newGraph = 1;
     glutPostRedisplay();
     break;
   case 2:
@@ -703,6 +722,7 @@ void controlExpression(int value)
     glEnable(GL_LIGHTING);
     glDisable(GL_TEXTURE_2D);
     newModel = 1;
+    newGraph = 1;
     glutPostRedisplay();
     break;
   case 3:
@@ -711,6 +731,7 @@ void controlExpression(int value)
     glEnable(GL_TEXTURE_2D);
     glDisable(GL_LIGHTING);
     newModel = 1;
+    newGraph = 1;
     glutPostRedisplay();
    break;
   case 4:
@@ -723,6 +744,7 @@ void controlExpression(int value)
       glDisable(GL_BLEND);
       glEnable(GL_DEPTH_TEST);
     }
+    newGraph = 1;
     break;
   case 5:
     exAxis = !exAxis;
@@ -825,6 +847,7 @@ int main(int argc, char** argv)
     triSwitch = 0;
     exTex = 1;
     exSample = 0;
+    printf("$=5.0, @=5.0\n"); 
   }
   else if (argc != 2) {
     fprintf(stderr,"Usage: graph filename\n");
@@ -914,7 +937,7 @@ int main(int argc, char** argv)
   glutInit(&argc, argv);
   glutInitDisplayMode(GLUT_SINGLE | GLUT_RGB | GLUT_DOUBLE |
 		      GLUT_DEPTH | GLUT_MULTISAMPLE);
-#ifdef MAC_OS_X
+#if defined(__APPLE__)
   glutInitWindowSize(512, 512);
 #else
   glutInitWindowSize(500, 500);
@@ -964,16 +987,7 @@ int main(int argc, char** argv)
   
   glEnable(GL_LIGHT0); 
   glEnable(GL_LIGHT1);
-  /*
-  glEnable(GL_STENCIL_TEST);
-  glEnable(GL_AUTO_NORMAL);
-  */
-  /* 
-  glEnable(GL_LIGHT2);
-    glEnable(GL_LIGHT3);
-  glEnable(GL_LIGHT4);
-  glEnable(GL_LIGHT5);
-  */
+
   glutMainLoop();
   return 0;
 }