...

[phys/latlib.git] / culooks.cpp

diff --git a/culooks.cpp b/culooks.cpp
index cb5eda7ffde80f186a1600be00e50d32ba8aeac4..d189c867f8619cf5f4cfee8c71e19f9bafb1f8b6 100644 (file)
--- a/culooks.cpp
+++ b/culooks.cpp
@@ -2,10 +2,6 @@
 
 #include <vector>
 #include <GL/glut.h>
 
 #include <vector>
 #include <GL/glut.h>

-#include <GL/glx.h>
-#include <GL/gl.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>

 
 #include <iostream>
 #include <math.h>
 
 #include <iostream>
 #include <math.h>


@@ -17,164 +13,10 @@ int culooks::windowid = 0;
 
 using namespace std;
 
 
 using namespace std;
 

-namespace mygl 
-{
-  int rotcube[3];
-
-  culooks::window* getWin()
-  {
-    for (int iwin=0; iwin<culooks::Windows.size(); iwin++)
-      if ( culooks::Windows.at(iwin).first == glutGetWindow() ) {
-       return culooks::Windows.at(iwin).second;
-      }
-    //cerr << "Something terrible happened: Could not find window-id!" << endl;
-    exit(1);
-  }
-
-  static int getCubeFromPos(int x, int y)
-  {
-    culooks::window *Win = getWin();
-
-    int col = x / ((float)Win->w / Win->layout[0]);
-    int row = Win->layout[1] - y / ((float)Win->h / Win->layout[1]);
-
-    return col + row*Win->layout[0];
-  }
-
-
-  static void motionFunc(int x, int y)
-  {   
-    //cout << x << endl;
-    culooks::window *Win = getWin();
-   
-    Win->cubes.at(rotcube[0]).az += rotcube[1] - x;
-    Win->cubes.at(rotcube[0]).alt += rotcube[2] - y;
-
-    rotcube[1] = x;
-    rotcube[2] = y;
-   
-
-    glutPostRedisplay();
-  }
-
-  static void mouseFunc(int button, int state, int x, int y)
-  {
-    culooks::window *Win = getWin();
-
-    if (button == 0) {
-      rotcube[0] = getCubeFromPos(x,y);
-      rotcube[1] = x;
-      rotcube[2] = y;
-    }
-
-    if (button == 4) {
-      Win->cubes.at(getCubeFromPos(x,y)).zoom *= 1.1;
-      glutPostRedisplay();
-    }
-    else if (button == 3) {
-      Win->cubes.at(getCubeFromPos(x,y)).zoom *= 0.9;
-      glutPostRedisplay();
-    }
-  }
-
-
-  static void reshapeFunc(int w, int h)
-  {
-    culooks::window *Win = getWin();
-    
-    int neww;
-    int newh;
-
-    if ( w == Win->w ) {
-      newh = h;
-      neww = Win->aspect*h;
-    }
-    else if ( h == Win->h ) {
-      neww = w;
-      newh = w / Win->aspect;
-    }
-    else {
-      neww = ( pow(Win->aspect,2)*w + Win->aspect*h ) / ( pow(Win->aspect,2) + 1 );
-      newh = ( Win->aspect*w + h ) / ( pow(Win->aspect,2) + 1 );
-    }
-
-    glutReshapeWindow(neww,newh);
-    glViewport(0,0,neww,newh);
-
-    Win->w = neww;
-    Win->h = newh;
-  }
-
-  static void displayFunc()
-  {
-    //cout << ":" << glutGetWindow() << endl;
-
-    culooks::window *Win = getWin();
-    
-    glClearColor(0,0,0,0);
-    glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-    
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
-    
-    glScalef(1.0/Win->layout[0],1.0/Win->layout[1],1.0);
-    glTranslatef(-Win->layout[0]+1, -Win->layout[1]+1, 0);
-    
-    for (int icube=0; icube < Win->cubes.size(); icube++) {
-      //glScalef(1.0/Env->layout[0],1.0/Env->layout[1],1.0);
-      //glRotatef(2, 1, 0, 0);
-      Win->cubes.at(icube).draw();
-      if ((icube+1)%Win->layout[0] == 0) {
-       glTranslatef(-2*Win->layout[0]+2, 2, 0);
-      }
-      else {
-       glTranslatef(2, 0, 0);
-      }
-    }
-    
-    glutSwapBuffers();
-  }
- 
-  static void initWindow(int winid)
-  {
-    glutInitWindowSize(culooks::Windows[winid].second->w, culooks::Windows[winid].second->h);
-    glutInitWindowPosition(winid*100,winid*100);
-    glutCreateWindow( ("culooks / " + culooks::Windows[winid].second->name).c_str() );
-    
-    glutDisplayFunc(&mygl::displayFunc);
-    glutReshapeFunc(&mygl::reshapeFunc);
-    glutMotionFunc(&mygl::motionFunc);
-    glutMouseFunc(&mygl::mouseFunc);
-
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
-    glEnable( GL_BLEND );
-
-    culooks::Windows[winid].first = glutGetWindow();
-
-    culooks::Windows[winid].second->initialized = true;
-  }
-
-  static void idleFunc_master()
-  {
-    for (int iwin=0; iwin < culooks::Windows.size(); iwin++)
-      if (!culooks::Windows[iwin].second->initialized)
-       initWindow(iwin);
-  }
-
-  static void* glutThread(void *leer)
-  {
-    initWindow(0);
-    glutIdleFunc(&idleFunc_master);
-    glutMainLoop();
-  }
-};
-
-

 culooks::culooks (const char* name, const int& xcubes, const int& ycubes, const int& l, int *argc, char **argv)
 {
   window *Win = new window;
   int winsize[2];
 culooks::culooks (const char* name, const int& xcubes, const int& ycubes, const int& l, int *argc, char **argv)
 {
   window *Win = new window;
   int winsize[2];

-  wincontext wincon;

 
   if (windowid == 0) {
     glutInit(argc, argv);
 
   if (windowid == 0) {
     glutInit(argc, argv);


@@ -209,7 +51,7 @@ culooks::culooks (const char* name, const int& xcubes, const int& ycubes, const
   
   if (windowid == 0) {
     glXMakeCurrent(0,0,0);
   
   if (windowid == 0) {
     glXMakeCurrent(0,0,0);

-    pthread_create(&glThreadId, 0, &mygl::glutThread, NULL);
+    pthread_create(&glThreadId, 0, &drawing::glutThread, NULL);

   }
 
   mywid = windowid;
   }
 
   mywid = windowid;