summaryrefslogtreecommitdiffstats
path: root/DisplayClass.cpp
diff options
context:
space:
mode:
authorConstantin Riß <constantin.riss@dre.de>2009-12-03 18:43:00 +0100
committerConstantin Riß <constantin.riss@dre.de>2009-12-03 18:43:00 +0100
commitfabe45bc9a1ad186673cbaa1b574536c2cee2ac9 (patch)
treeebc117d257190213f93a6dc48a3ccc78ac1bed85 /DisplayClass.cpp
parent8c8948a6fc78aa769ac4ceeb0a1e6d0471376ef1 (diff)
downloadc3d-fabe45bc9a1ad186673cbaa1b574536c2cee2ac9.tar
c3d-fabe45bc9a1ad186673cbaa1b574536c2cee2ac9.zip
Einen Quader mit einem Loch in der Mitte geaddet.
Diffstat (limited to 'DisplayClass.cpp')
-rw-r--r--DisplayClass.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/DisplayClass.cpp b/DisplayClass.cpp
index 3a43569..0822058 100644
--- a/DisplayClass.cpp
+++ b/DisplayClass.cpp
@@ -5,7 +5,7 @@
DisplayClass::DisplayClass() {
- static const float pos[5] = {0.0, 1.0, 3.0, 6.0, 10.0};
+ static const float pos[5] = {-3.0, -2.0, 0.0, 2.0, 3.0};
for(int i = 0; i < 5; ++i) {
for(int j = 0; j < 5; ++j) {
@@ -19,6 +19,7 @@ DisplayClass::DisplayClass() {
void DisplayClass::renderScene(unsigned long delta)
{
+ Cubehole cubeing(1.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.5, 0.5);
static float angle = 0.0;
angle += delta*0.05;
if(angle >= 360)
@@ -32,7 +33,7 @@ void DisplayClass::renderScene(unsigned long delta)
std::list<Triangle> triangles;
glLoadIdentity(); // Clean up matrix
- glTranslatef(0.0, 0.0, -40.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);
@@ -40,15 +41,17 @@ void DisplayClass::renderScene(unsigned long delta)
glRotatef(-angle*5, 1.0, 1.0, 1.0);
m.store(); // Save current transformation
- for(int i = 0; i < 5; ++i) {
+ /*for(int i = 0; i < 5; ++i) {
for(int j = 0; j < 5; ++j) {
for(int k = 0; k < 5; ++k) {
std::list<Triangle> ct = cubes[i][j][k].getTriangles(m);
triangles.splice(triangles.end(), ct);
}
}
- }
-
+ }*/
+ std::list<Triangle> ct = cubeing.getTriangles(m);
+ triangles.splice(triangles.end(), ct);
+
glLoadIdentity();
glBegin(GL_TRIANGLES);