Cubehole angefangen zu ändern.

1 files changed, 5 insertions, 27 deletions

diff --git a/DisplayClass.cpp b/DisplayClass.cpp
index cefa6ae..b0a4a8d 100644
--- a/DisplayClass.cpp
+++ b/DisplayClass.cpp
@@ -21,15 +21,7 @@ DisplayClass::DisplayClass() {
 
 void DisplayClass::renderScene(unsigned long delta)
 {
-  //Cubehole cubeing(3.0, 1.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.5);
-  Trapezocube cubeing1(11.0, 10.0, 10.0, 0.5, 0.0, 0.0, 1.75, 0);
-  Trapezocube cubeing2(10.0, 9.0, 9.0, 0.5, 0.0, 0.0, 2.25, 90);
-  Trapezocube cubeing3(9.0, 8.0, 8.0, 0.5, 0.0, 0.0, 2.75, 180);
-  Trapezocube cubeing4(8.0, 7.0, 7.0, 0.5, 0.0, 0.0, 3.25, 270);
-  Trapezocube cubeing5(7.0, 6.0, 6.0, 0.5, 0.0, 0.0, 3.75, 0);
-  Trapezocube cubeing6(6.0, 5.0, 5.0, 0.5, 0.0, 0.0, 4.25, 90);
-  Trapezocube cubeing7(5.0, 4.0, 4.0, 0.5, 0.0, 0.0, 4.75, 180);
-  Trapezocube cubeing8(4.0, 3.0, 3.0, 0.5, 0.0, 0.0, 5.25, 270);
+  Cubehole cubeing(3.0, 1.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.5, Color(1.0, 0.0, 0.0), Color(0.0, 1.0, 0.0), Color(0.0, 0.0, 1.0), Color(1.0, 0.85, 0.06));
   static float angle = 0.0;
   angle += delta*0.025;
   if(angle >= 360)
@@ -43,7 +35,7 @@ void DisplayClass::renderScene(unsigned long delta)
   std::list<Triangle> triangles;
 
   glLoadIdentity(); // Clean up matrix
-  glTranslatef(0.0, 0.0, -30.0); // Then set up transformation
+  glTranslatef(0.0, 0.0, -10.0); // Then set up transformation
   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);
@@ -59,25 +51,11 @@ void DisplayClass::renderScene(unsigned long delta)
       }
     }
   }*/
-  std::list<Triangle> ct1 = cubeing1.getTriangles();
-  triangles.splice(triangles.end(), ct1);
-  std::list<Triangle> ct2 = cubeing2.getTriangles();
-  triangles.splice(triangles.end(), ct2);
-  std::list<Triangle> ct3 = cubeing3.getTriangles();
-  triangles.splice(triangles.end(), ct3);
-  std::list<Triangle> ct4 = cubeing4.getTriangles();
-  triangles.splice(triangles.end(), ct4);
-  std::list<Triangle> ct5 = cubeing5.getTriangles();
-  triangles.splice(triangles.end(), ct5);
-  std::list<Triangle> ct6 = cubeing6.getTriangles();
-  triangles.splice(triangles.end(), ct6);
-  std::list<Triangle> ct7 = cubeing7.getTriangles();
-  triangles.splice(triangles.end(), ct7);
-  std::list<Triangle> ct8 = cubeing8.getTriangles();
-  triangles.splice(triangles.end(), ct8);
-
   //glLoadIdentity();
 
+  std::list<Triangle> ct = cubeing.getTriangles();
+  triangles.splice(triangles.end(), ct);
+
   glBegin(GL_TRIANGLES);
   for(std::list<Triangle>::reverse_iterator t = triangles.rbegin(); t != triangles.rend(); ++t) {
     t->render();