summaryrefslogtreecommitdiffstats
path: root/DisplayClass.cpp
diff options
context:
space:
mode:
authorConstantin Riß <constantin.riss@dre.de>2009-12-10 22:59:23 +0100
committerConstantin Riß <constantin.riss@dre.de>2009-12-10 22:59:23 +0100
commit74d4f23ef8e05180ea764a3b50aadb3dfa5292bd (patch)
tree338f6067f5422692c35f40b5bb760df8ded03949 /DisplayClass.cpp
parent2b8bc4d3b606a1cfe77e3bfe374f6d395556e402 (diff)
downloadc3d-74d4f23ef8e05180ea764a3b50aadb3dfa5292bd.tar
c3d-74d4f23ef8e05180ea764a3b50aadb3dfa5292bd.zip
Blend deaktiviert.
Diffstat (limited to 'DisplayClass.cpp')
-rw-r--r--DisplayClass.cpp27
1 files changed, 24 insertions, 3 deletions
diff --git a/DisplayClass.cpp b/DisplayClass.cpp
index b278812..b47fc48 100644
--- a/DisplayClass.cpp
+++ b/DisplayClass.cpp
@@ -6,17 +6,32 @@
DisplayClass::Renderer DisplayClass::renderer;
DisplayClass::DisplayClass() {
- cubehole0 = Cubehole(3.0, 6.0, 3.0, 0.0, 0.0, 0.0, 2.0, 2.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),
vmml::vec4f(1.0, 0.85, 0.06, 0.5),
vmml::vec4f(1.0, 0.85, 0.06, 0.5));
- cubehole1 = Cubehole(2.0, 6.0, 2.0, 0.0, 0.0, 0.0, 1.0, 1.0,
+ cubehole1 = Cubehole(2.5, 6.0, 2.5, 0.0, 0.0, 0.0, 2.0, 2.0,
vmml::vec4f(0.0, 0.85, 0.06, 0.5),
vmml::vec4f(0.0, 0.85, 0.06, 0.5),
vmml::vec4f(0.0, 0.85, 0.06, 0.5),
vmml::vec4f(0.0, 0.85, 0.06, 0.5));
- cubehole2 = Cubehole(1.0, 6.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0,
+ cubehole2 = Cubehole(2.0, 6.0, 2.0, 0.0, 0.0, 0.0, 1.5, 1.5,
+ vmml::vec4f(1.0, 0.0, 0.06, 0.5),
+ vmml::vec4f(1.0, 0.0, 0.06, 0.5),
+ vmml::vec4f(1.0, 0.0, 0.06, 0.5),
+ vmml::vec4f(1.0, 0.0, 0.06, 0.5));
+ cubehole3 = Cubehole(1.5, 6.0, 1.5, 0.0, 0.0, 0.0, 1.0, 1.0,
+ vmml::vec4f(1.0, 0.85, 0.06, 0.5),
+ vmml::vec4f(1.0, 0.85, 0.06, 0.5),
+ vmml::vec4f(1.0, 0.85, 0.06, 0.5),
+ vmml::vec4f(1.0, 0.85, 0.06, 0.5));
+ cubehole4 = Cubehole(1.0, 6.0, 1.0, 0.0, 0.0, 0.0, 0.5, 0.5,
+ vmml::vec4f(0.0, 0.85, 0.06, 0.5),
+ vmml::vec4f(0.0, 0.85, 0.06, 0.5),
+ vmml::vec4f(0.0, 0.85, 0.06, 0.5),
+ vmml::vec4f(0.0, 0.85, 0.06, 0.5));
+ cubehole5 = Cubehole(0.5, 6.0, 0.5, 0.0, 0.0, 0.0, 0.0, 0.0,
vmml::vec4f(1.0, 0.0, 0.06, 0.5),
vmml::vec4f(1.0, 0.0, 0.06, 0.5),
vmml::vec4f(1.0, 0.0, 0.06, 0.5),
@@ -45,6 +60,12 @@ void DisplayClass::renderScene(unsigned long delta)
triangles.splice(triangles.end(), t1);
std::list<Triangle> t2 = cubehole2.getTriangles();
triangles.splice(triangles.end(), t2);
+ std::list<Triangle> t3 = cubehole3.getTriangles();
+ triangles.splice(triangles.end(), t3);
+ std::list<Triangle> t4 = cubehole4.getTriangles();
+ triangles.splice(triangles.end(), t4);
+ std::list<Triangle> t5 = cubehole5.getTriangles();
+ triangles.splice(triangles.end(), t5);
BSPTree tree(triangles);