Merge branch 'master' of git://git.gamezock.de/c3d

Conflicts:
	Cubehole.cpp
	Cubehole.h
	DisplayClass.cpp
	Trapezocube.cpp

1 files changed, 9 insertions, 18 deletions

diff --git a/DisplayClass.cpp b/DisplayClass.cpp
index cf7a0f9..6d9fdee 100644
--- a/DisplayClass.cpp
+++ b/DisplayClass.cpp
@@ -5,16 +5,12 @@
 
 DisplayClass::Renderer DisplayClass::renderer;
 
-
 DisplayClass::DisplayClass() {
-  cubeing[0] = Trapezocube(11.0, 10.0, 10.0, 0.5, 0.0, 0.0, 1.75, 0);
-  cubeing[1] = Trapezocube(10.0, 9.0, 9.0, 0.5, 0.0, 0.0, 2.25, 90);
-  cubeing[2] = Trapezocube(9.0, 8.0, 8.0, 0.5, 0.0, 0.0, 2.75, 180);
-  cubeing[3] = Trapezocube(8.0, 7.0, 7.0, 0.5, 0.0, 0.0, 3.25, 270);
-  cubeing[4] = Trapezocube(7.0, 6.0, 6.0, 0.5, 0.0, 0.0, 3.75, 0);
-  cubeing[5] = Trapezocube(6.0, 5.0, 5.0, 0.5, 0.0, 0.0, 4.25, 90);
-  cubeing[6] = Trapezocube(5.0, 4.0, 4.0, 0.5, 0.0, 0.0, 4.75, 180);
-  cubeing[7] = Trapezocube(4.0, 3.0, 3.0, 0.5, 0.0, 0.0, 5.25, 270);
+  cubehole = Cubehole(3.0, 1.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.5,
+      vmml::vec4f(1.0, 0.0, 0.0),
+      vmml::vec4f(0.0, 1.0, 0.0),
+      vmml::vec4f(0.0, 0.0, 1.0),
+      vmml::vec4f(1.0, 0.85, 0.06));
 }
 
 void DisplayClass::renderScene(unsigned long delta)
@@ -27,20 +23,15 @@ void DisplayClass::renderScene(unsigned long delta)
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   
   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);
   
   glRotatef(-angle*5, 1.0, 1.0, 1.0);
   
-  std::list<Triangle> triangles;
-
-  for(int i = 0; i < 8; ++i) {
-    std::list<Triangle> t = cubeing[i].getTriangles();
-    triangles.splice(triangles.end(), t);
-  }
-
+  std::list<Triangle> triangles = cubehole.getTriangles();
+  
   BSPTree tree(triangles);
 
   vmml::mat4f transform, inverseTransform;
@@ -48,7 +39,7 @@ void DisplayClass::renderScene(unsigned long delta)
 
   transform.inverse(inverseTransform);
 
-  vmml::vec3f viewPoint = inverseTransform*vmml::vec3f(0, 0, 0);
+  vmml::vec3f viewPoint = inverseTransform*vmml::vec3f::ZERO;
 
   glBegin(GL_TRIANGLES);
   tree.visit(renderer, viewPoint);