...

diff --git a/culooks.h b/culooks.h
index 32e36a814872ca585ec9f7ad7ecec9de6889dc76..1705ab57ddefbffb9f70233ba3aeb41b2d0fcc75 100644 (file)
--- a/culooks.h
+++ b/culooks.h
@@ -10,12 +10,27 @@
 #include <X11/Xutil.h>
 #include <string>
 
 #include <X11/Xutil.h>
 #include <string>
 

-#include "culooks_cube.h"
-

 using namespace std;
 
 class culooks
 {
 using namespace std;
 
 class culooks
 {

+ private:
+  class cube {
+  public:
+    cube(int l);
+    void draw();
+    int id;
+    float az, alt;
+    float zoom;
+  private:
+    void drawAll();
+    void drawBox();
+    static int allid;
+    float *plaq;
+    float *link;
+    int l;
+  };
+

  public:
   struct window {
     int layout[2];
  public:
   struct window {
     int layout[2];


@@ -41,7 +56,6 @@ class culooks
   static pthread_t glThreadId;
   static int windowid;
   int mywid;
   static pthread_t glThreadId;
   static int windowid;
   int mywid;

-  

 };
 
 #endif
 };
 
 #endif

diff --git a/culooks_cube.cpp b/culooks_cube.cpp
index 2498fefbcc626cc273a4a8bb3784c3c3c85e5cb6..29976e40aebab8c744be606d7ba94b07f2ab2956 100644 (file)
--- a/culooks_cube.cpp
+++ b/culooks_cube.cpp
@@ -1,10 +1,10 @@
-#include "culooks_cube.h"
+#include "culooks.h"

 
 #include <GL/glut.h>
 
 
 #include <GL/glut.h>
 

-int cube::allid = 0;
+int culooks::cube::allid = 0;

 
 

-void cube::draw()
+void culooks::cube::draw()

 {
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
 {
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();


@@ -18,7 +18,7 @@ void cube::draw()
   glPopMatrix();
 }
 
   glPopMatrix();
 }
 

-void cube::drawAll()
+void culooks::cube::drawAll()

 {
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
 {
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();


@@ -79,7 +79,7 @@ void cube::drawAll()
   glPopMatrix();
 }
 
   glPopMatrix();
 }
 

-cube::cube(int _l)
+culooks::cube::cube(int _l)

 {
   l = _l;
   link = new float[l*l*l*3 * 4];
 {
   l = _l;
   link = new float[l*l*l*3 * 4];

diff --git a/culooks_cube.h b/culooks_cube.h
deleted file mode 100644 (file)
index aeaa754..0000000
--- a/culooks_cube.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CULOOKS_CUBE_H
-#define CULOOKS_CUBE_H
-
-class cube {
- public:
-  cube(int l);
-  void draw();
-  int id;
-  float az, alt;
-  float zoom;
- private:
-  void drawAll();
-  void drawBox();
-  static int allid;
-  float *plaq;
-  float *link;
-  int l;
-};
-
-#endif