diff options
| author | Constantin Riß <constantin.riss@dre.de> | 2010-02-10 22:30:18 +0100 |
|---|---|---|
| committer | Constantin Riß <constantin.riss@dre.de> | 2010-02-10 22:30:18 +0100 |
| commit | 22b2912bbdd637c1a206b30f7d02c8e560ff9850 (patch) | |
| tree | 33889a87dc0bce5e5380d0d88b95c9fb623b7685 /DisplayClass.h | |
| parent | 897a54945c4a9112ee5c97e2eb8937adc57f17fe (diff) | |
| download | c3d-22b2912bbdd637c1a206b30f7d02c8e560ff9850.tar c3d-22b2912bbdd637c1a206b30f7d02c8e560ff9850.zip | |
veränderungen
Diffstat (limited to 'DisplayClass.h')
| -rw-r--r-- | DisplayClass.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/DisplayClass.h b/DisplayClass.h index 5b646ed..ee245af 100644 --- a/DisplayClass.h +++ b/DisplayClass.h @@ -1,12 +1,10 @@ #ifndef _DISPLAYCLASS_H_ #define _DISPLAYCLASS_H_ -//#include "Cubehole.h" -//#include "Temparray.h" #include "BSPTree.h" #include "gl.h" #include "House.h" -#include <bitset> +#include "Keys.h" class DisplayClass { @@ -14,7 +12,7 @@ class DisplayClass DisplayClass(int x, int y, int z); virtual ~DisplayClass(); - void renderScene(unsigned long delta, std::bitset<256>& keys); + void renderScene(unsigned long delta, const Keyset &keys); private: struct Renderer { @@ -25,11 +23,12 @@ class DisplayClass static Renderer render; - float angle; + float angleY, angleX; + float distance, distanceh; int x, y, z; //Cubehole cubehole0, cubehole1, cubehole2, cubehole3, cubehole4, cubehole5; std::list<Triangle> triangles; - void keyhandler(std::bitset<256>& keys); + void handleKeys(unsigned long delta, const Keyset &keys); //BSPTree *tree; }; #endif /*_DISPLAYCLASS_H_*/ |