View difference between Paste ID: WytnktWB and gKQwtKC8

 #ifndef _KEYSTATE_H_
 #define _KEYSTATE_H_
 
 #include "PaulMath.h"
 #include "GL/glfw.h"
 
-class KeyState
+static class KeyState
 {
 
 private:
-	KeyState(void)	{ keys = new BitSet(GLFW_KEY_LAST); keysState = new BitSet(GLFW_KEY_LAST); }
+		struct Keys
-	~KeyState(void)	{ delete keys; delete keysState; }
+
 			BitSet * m_keyVal;
-	//call this every frame
+			BitSet * m_keyState;
-	void Update()
+		};
 
-		for(int i = 0; i < GLFW_KEY_LAST; ++i)
+	static Keys * s_inst;
 
-			//update keys
+
-			if(!(*keysState)[i] && !(*keys)[i])
+
-			{
+	KeyState(void)
-				if(glfwGetKey(i))	keys->SetBit(i);
+
-			}
+		s_inst = new Keys;
-			else	keys->ClearBit(i);
+		s_inst->m_keyVal = new BitSet(GLFW_KEY_LAST);
-			//update states
+		s_inst->m_keyState = new BitSet(GLFW_KEY_LAST);
-			if(glfwGetKey(i))	keysState->SetBit(i);
+		glfwSetKeyCallback(KeyState::UpdateSingle);
-			else				keysState->ClearBit(i);
+
 
 	~KeyState(void)	{ delete s_inst->m_keyVal; delete s_inst->m_keyState; glfwSetKeyCallback(NULL); }
 
-	bool GetKey(int key){ return (*keys)[key]; }
+	static void GLFWCALL UpdateSingle(int key, int val)
 	{
 		//update values
-	//bitset arrays via pointers (we have to do it this way)
+		if(!(*(s_inst->m_keyState))[key] && !(*(s_inst->m_keyVal))[key])
-	BitSet * keys;
+
-	BitSet * keysState;
+			if(glfwGetKey(key))
 				s_inst->m_keyVal->SetBit(key);
 		}
 		else
 			s_inst->m_keyVal->ClearBit(key);
 
 		//update states
 		if(glfwGetKey(key))
 			s_inst->m_keyState->SetBit(key);
 		else
 			s_inst->m_keyState->ClearBit(key);
 	}
 
 	//for getting a key
 	bool GetKey(const int key) const { return (*(s_inst->m_keyVal))[key]; }
 
 };
 
 KeyState::Keys* KeyState::s_inst = NULL;
 
 #endif