.....................^^

1 files changed, 4 insertions, 46 deletions

diff --git a/DisplayClass.cpp b/DisplayClass.cpp
index 3294fac..86c167c 100644
--- a/DisplayClass.cpp
+++ b/DisplayClass.cpp
@@ -3,49 +3,7 @@
 DisplayClass::Renderer DisplayClass::render;
 
 DisplayClass::DisplayClass(int x, int y, int z) : angle(0) {
-  /*cubehole0 = Cubehole(3.0, 6.0, 3.0, 0.0, 0.0, 0.0, 2.5, 2.5,
-      vmml::vec4f(1.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.85, 0.06, 0.5));
-  cubehole1 = Cubehole(2.5, 6.0, 2.5, 0.0, 0.0, 0.0, 2.0, 2.0,
-      vmml::vec4f(0.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(0.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(0.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(0.0, 0.85, 0.06, 0.5));
-  cubehole2 = Cubehole(2.0, 6.0, 2.0, 0.0, 0.0, 0.0, 1.5, 1.5,
-      vmml::vec4f(1.0, 0.0, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.0, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.0, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.0, 0.06, 0.5));
-  cubehole3 = Cubehole(1.5, 6.0, 1.5, 0.0, 0.0, 0.0, 1.0, 1.0,
-      vmml::vec4f(1.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.85, 0.06, 0.5));
-  cubehole4 = Cubehole(1.0, 6.0, 1.0, 0.0, 0.0, 0.0, 0.5, 0.5,
-      vmml::vec4f(0.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(0.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(0.0, 0.85, 0.06, 0.5),
-      vmml::vec4f(0.0, 0.85, 0.06, 0.5));
-  cubehole5 = Cubehole(0.5, 6.0, 0.5, 0.0, 0.0, 0.0, 0.0, 0.0,
-      vmml::vec4f(1.0, 0.0, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.0, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.0, 0.06, 0.5),
-      vmml::vec4f(1.0, 0.0, 0.06, 0.5));
-
-  std::list<Triangle> triangles = cubehole0.getTriangles();
-  std::list<Triangle> t1 = cubehole1.getTriangles();
-  triangles.splice(triangles.end(), t1);
-  std::list<Triangle> t2 = cubehole2.getTriangles();
-  triangles.splice(triangles.end(), t2);
-  std::list<Triangle> t3 = cubehole3.getTriangles();
-  triangles.splice(triangles.end(), t3);
-  std::list<Triangle> t4 = cubehole4.getTriangles();
-  triangles.splice(triangles.end(), t4);
-  std::list<Triangle> t5 = cubehole5.getTriangles();
-  triangles.splice(triangles.end(), t5);*/
-
+  
 //  Temparray temp(20, x, y, z);
 //  triangles=temp.getTriangles();
 this->x=x;
@@ -58,7 +16,7 @@ DisplayClass::~DisplayClass() {
   //delete tree;
 }
 
-void DisplayClass::renderScene(unsigned long delta) {
+void DisplayClass::renderScene(unsigned long delta, std::bitset<256> keys) {
   angle += delta*0.025;
   if(angle >= 360)
     angle -= 360;
@@ -67,8 +25,8 @@ void DisplayClass::renderScene(unsigned long delta) {
   
   glLoadIdentity(); // Clean up matrix
   glTranslatef(0.0, -2.0, -20.0); // Then set up transformation
-  glRotatef(-10, 1.0, 0.0, 0.0);
-  glRotatef(angle, 0.0, 1.0, 0.0);
+  glRotatef(10, 1.0, 0.0, 0.0);
+//  glRotatef(angle, 0.0, 1.0, 0.0);
 //  glRotatef(angle*2, 1.0, 0.0, 0.0);
 //  glRotatef(angle*3, 0.0, 0.0, 1.0);
 //  glRotatef(-angle*5, 1.0, 1.0, 1.0);