summaryrefslogtreecommitdiffstats
path: root/DisplayClass.cpp
diff options
context:
space:
mode:
authorConstantin Riß <constantin.riss@dre.de>2010-01-07 17:06:32 +0100
committerConstantin Riß <constantin.riss@dre.de>2010-01-07 17:06:32 +0100
commitfd1179672c60358ee6caf538d686dab264a84582 (patch)
tree6d5d2e674ffcfc3bd87aaf7ab46a5d35f6113e28 /DisplayClass.cpp
parent85f21b7ff3c227c73e8182b0480b6cbf8cb3f28d (diff)
downloadc3d-fd1179672c60358ee6caf538d686dab264a84582.tar
c3d-fd1179672c60358ee6caf538d686dab264a84582.zip
Dynamische Arrays geändert([a][b][c][d] zu [a*b*c*d])
Diffstat (limited to 'DisplayClass.cpp')
-rw-r--r--DisplayClass.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/DisplayClass.cpp b/DisplayClass.cpp
index af71dcc..0a833c9 100644
--- a/DisplayClass.cpp
+++ b/DisplayClass.cpp
@@ -5,7 +5,7 @@
DisplayClass::Renderer DisplayClass::renderer;
DisplayClass::DisplayClass() : angle(0) {
- cubehole0 = Cubehole(3.0, 6.0, 3.0, 0.0, 0.0, 0.0, 2.5, 2.5,
+ /*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),
@@ -46,7 +46,10 @@ DisplayClass::DisplayClass() : angle(0) {
std::list<Triangle> t4 = cubehole4.getTriangles();
triangles.splice(triangles.end(), t4);
std::list<Triangle> t5 = cubehole5.getTriangles();
- triangles.splice(triangles.end(), t5);
+ triangles.splice(triangles.end(), t5);*/
+
+ Temparray temp(20, 5, 5, 5);
+ std::list<Triangle> triangles=temp.getTriangles();
tree = new BSPTree(triangles);
}