diff options
author | Constantin Riß <constantin.riss@dre.de> | 2010-01-16 22:57:50 +0100 |
---|---|---|
committer | Constantin Riß <constantin.riss@dre.de> | 2010-01-16 22:57:50 +0100 |
commit | f382c18643d16bf6656e508d611817aaf0c29704 (patch) | |
tree | 2063914afb33989ec416e427d5c608eeba7f3282 /DisplayClass.cpp | |
parent | ac9295f8f9ec5efa475fa8f2a56b3d975d6acc01 (diff) | |
download | c3d-f382c18643d16bf6656e508d611817aaf0c29704.tar c3d-f382c18643d16bf6656e508d611817aaf0c29704.zip |
Bisschen geändert.
Diffstat (limited to 'DisplayClass.cpp')
-rw-r--r-- | DisplayClass.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/DisplayClass.cpp b/DisplayClass.cpp index 0a833c9..d5d6b50 100644 --- a/DisplayClass.cpp +++ b/DisplayClass.cpp @@ -2,9 +2,9 @@ #include "gl.h" -DisplayClass::Renderer DisplayClass::renderer; +DisplayClass::Renderer DisplayClass::render; -DisplayClass::DisplayClass() : angle(0) { +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), @@ -48,14 +48,14 @@ DisplayClass::DisplayClass() : angle(0) { std::list<Triangle> t5 = cubehole5.getTriangles(); triangles.splice(triangles.end(), t5);*/ - Temparray temp(20, 5, 5, 5); - std::list<Triangle> triangles=temp.getTriangles(); + Temparray temp(20, x, y, z); + triangles=temp.getTriangles(); - tree = new BSPTree(triangles); + //tree = new BSPTree(triangles); } DisplayClass::~DisplayClass() { - delete tree; + //delete tree; } void DisplayClass::renderScene(unsigned long delta) { @@ -72,15 +72,20 @@ void DisplayClass::renderScene(unsigned long delta) { glRotatef(angle*3, 0.0, 0.0, 1.0); glRotatef(-angle*5, 1.0, 1.0, 1.0); - vmml::mat4f transform, inverseTransform; - glGetFloatv(GL_MODELVIEW_MATRIX, transform.array); + //vmml::mat4f transform, inverseTransform; + //glGetFloatv(GL_MODELVIEW_MATRIX, transform.array); - transform.inverse(inverseTransform); + //transform.inverse(inverseTransform); - vmml::vec3f viewPoint = inverseTransform*vmml::vec3f::ZERO; + //vmml::vec3f viewPoint = inverseTransform*vmml::vec3f::ZERO; glBegin(GL_TRIANGLES); - tree->visit(renderer, viewPoint); + //tree->visit(render, viewPoint); + + for(std::list<Triangle>::iterator t = triangles.begin(); t != triangles.end(); ++t) { + render(*t); + } + glEnd(); glFlush(); |