From 22b2912bbdd637c1a206b30f7d02c8e560ff9850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Ri=C3=9F?= <constantin.riss@dre.de>
Date: Wed, 10 Feb 2010 22:30:18 +0100
Subject: =?UTF-8?q?ver=C3=A4nderungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DisplayClass.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'DisplayClass.h')

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_*/
-- 
cgit v1.2.3