From 3b534c013dd072d0296ebaac434e8c943ab88c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Ri=C3=9F?= <constantin.riss@dre.de>
Date: Wed, 9 Dec 2009 15:59:14 +0100
Subject: =?UTF-8?q?Beleuchtung=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DisplayClass.cpp | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

(limited to 'DisplayClass.cpp')

diff --git a/DisplayClass.cpp b/DisplayClass.cpp
index 2741fce..35083d9 100644
--- a/DisplayClass.cpp
+++ b/DisplayClass.cpp
@@ -1,7 +1,7 @@
 #include "DisplayClass.h"
 #include "Matrix.h"
 #include "gl.h"
-#include <algorithm>
+//#include <algorithm>
 #include "Trapezocube.h"
 
 
@@ -20,28 +20,35 @@ 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 cubeing(2.0, 1.5, 3.0, 0.5, 0.0, 0.0, 0.0, 90);
+  //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);
   static float angle = 0.0;
-  angle += delta*0.05;
+  angle += delta*0.025;
   if(angle >= 360)
     angle -= 360;
 
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   
-  Matrix p(GL_PROJECTION_MATRIX);
-  Matrix m;
+  //atrix p(GL_PROJECTION_MATRIX);
+  //Matrix m;
   
   std::list<Triangle> triangles;
 
   glLoadIdentity(); // Clean up matrix
-  glTranslatef(0.0, 0.0, -10.0); // Then set up transformation
+  glTranslatef(0.0, 0.0, -30.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);
   
   glRotatef(-angle*5, 1.0, 1.0, 1.0);
-  m.store(); // Save current transformation
+  //m.store(); // Save current transformation
   
   /*for(int i = 0; i < 5; ++i) {
     for(int j = 0; j < 5; ++j) {
@@ -51,10 +58,24 @@ void DisplayClass::renderScene(unsigned long delta)
       }
     }
   }*/
-  std::list<Triangle> ct = cubeing.getTriangles(m);
-  triangles.splice(triangles.end(), ct);
+  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();
+  //glLoadIdentity();
 
   glBegin(GL_TRIANGLES);
   for(std::list<Triangle>::reverse_iterator t = triangles.rbegin(); t != triangles.rend(); ++t) {
-- 
cgit v1.2.3