summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Riß <constantin.riss@dre.de>2009-12-03 22:10:37 +0100
committerConstantin Riß <constantin.riss@dre.de>2009-12-03 22:10:37 +0100
commit9581542002a57f72afcbaebfe1ae6fc3b4021400 (patch)
tree4bd6c74d98333e567610d66f09194f797fe0e10a
parentfabe45bc9a1ad186673cbaa1b574536c2cee2ac9 (diff)
downloadc3d-9581542002a57f72afcbaebfe1ae6fc3b4021400.tar
c3d-9581542002a57f72afcbaebfe1ae6fc3b4021400.zip
'Trapezocube' hinzugefügt.
-rw-r--r--CMakeLists.txt1
-rw-r--r--DisplayClass.cpp8
2 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8021c91..1f656ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ add_executable(c3d
main.cpp
Matrix.h
Triangle.h
+ Trapezocube.cpp Trapezocube.h
Vector.h
Vertex.h
)
diff --git a/DisplayClass.cpp b/DisplayClass.cpp
index 0822058..96ae6a4 100644
--- a/DisplayClass.cpp
+++ b/DisplayClass.cpp
@@ -1,7 +1,8 @@
#include "DisplayClass.h"
#include "Matrix.h"
#include "gl.h"
-#include <algorithm>
+#include <algorithm>
+#include "Trapezocube.h"
DisplayClass::DisplayClass() {
@@ -19,9 +20,10 @@ 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);
+// Cubehole cubeing(3.0, 1.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.5);
+ Trapezocube cubeing(2.0, 1.5, 3.0, 0.5, 0.0, 0.0, 0.0, 90);
static float angle = 0.0;
- angle += delta*0.05;
+ angle += delta*0.005;
if(angle >= 360)
angle -= 360;