View difference between Paste ID: Dzb0NG6y and WytnktWB

 #ifndef _KEYSTATE_H_
 #define _KEYSTATE_H_
 
 #include "PaulMath.h"
 #include "GL/glfw.h"
 
 static class KeyState
 {
 private:
 	//arrays
-		struct Keys
+	static BitSet * m_keyVal;
-		{
+	static BitSet * m_keyState;
-			BitSet * m_keyVal;
+
-			BitSet * m_keyState;
+	//key update
-		};
+
 	{
-	static Keys * s_inst;
+		//update value
 		if(!(*(m_keyState))[key] && val)
 			m_keyVal->SetBit(key);
-	//constructs and destructs,
+
-	KeyState(void)
+		//update state
 		if(val)
-		s_inst = new Keys;
+			m_keyState->SetBit(key);
-		s_inst->m_keyVal = new BitSet(GLFW_KEY_LAST);
+
-		s_inst->m_keyState = new BitSet(GLFW_KEY_LAST);
+			m_keyState->ClearBit(key);
-		glfwSetKeyCallback(KeyState::UpdateSingle);
+
 
 public:
-	~KeyState(void)	{ delete s_inst->m_keyVal; delete s_inst->m_keyState; glfwSetKeyCallback(NULL); }
+	//construct
 	KeyState(void)
 	{
 		m_keyVal = new BitSet(GLFW_KEY_LAST);
-		//update values
+		m_keyState = new BitSet(GLFW_KEY_LAST);
-		if(!(*(s_inst->m_keyState))[key] && !(*(s_inst->m_keyVal))[key])
+
-		{
+	//destruct
-			if(glfwGetKey(key))
+	~KeyState(void)
-				s_inst->m_keyVal->SetBit(key);
+
-		}
+		delete m_keyVal;
 		delete m_keyState;
-			s_inst->m_keyVal->ClearBit(key);
+		glfwSetKeyCallback(NULL);
 	}
-		//update states
+
-		if(glfwGetKey(key))
+	//needed to be done after GL init, so it works correctly
-			s_inst->m_keyState->SetBit(key);
+	void InitCallBack() { glfwSetKeyCallback(KeyState::UpdateSingle); }
 
-			s_inst->m_keyState->ClearBit(key);
+	//call at end of every cycle to get desired logic
 	void Clear() { m_keyVal->ClearAllBits(); }
 
 	//for getting a key
-	bool GetKey(const int key) const { return (*(s_inst->m_keyVal))[key]; }
+	bool GetKey(const int key) const { return (*(m_keyVal))[key]; }
 
-};
+}KeyState;
 
-KeyState::Keys* KeyState::s_inst = NULL;
+//without these we get linker errors,
 BitSet * KeyState::m_keyVal = NULL;
 BitSet * KeyState::m_keyState = NULL;
 
 #endif