Added popEvent and empty filterEvent

This commit is contained in:
Thomas Edvalson
2014-05-04 00:01:03 -04:00
parent ae4d356dbf
commit 680ee05ae0
3 changed files with 16 additions and 32 deletions
+2
View File
@@ -105,6 +105,8 @@ private:
////////////////////////////////////////////////////////////
void processEvents();
bool filterEvent(const Event& event);
std::queue<Event> m_events; ///< Queue of available events
// JoystickState m_joystickStates[Joystick::Count]; ///< Previous state of the joysticks
Vector3f m_sensorValue[Sensor::Count]; ///< Previous value of the sensors
-30
View File
@@ -1,30 +0,0 @@
#include <cpp3ds/Window/Event.hpp>
namespace cpp3ds {
////////////////////////////////////////////////////////////
bool pollEvent(Event& event) {
// if (m_impl && m_impl->popEvent(event, false))
// {
// return filterEvent(event);
// }
// else
// {
return false;
// }
}
////////////////////////////////////////////////////////////
bool waitEvent(Event& event) {
// if (m_impl && m_impl->popEvent(event, true))
// {
// return filterEvent(event);
// }
// else
// {
return false;
// }
}
}
+14 -2
View File
@@ -4,11 +4,19 @@
namespace cpp3ds {
bool EventManager::pollEvent(Event& event) {
return false;
if (popEvent(event, false)) {
return filterEvent(event);
} else {
return false;
}
}
bool EventManager::waitEvent(Event& event) {
return false;
if (popEvent(event, true)) {
return filterEvent(event);
} else {
return false;
}
}
void EventManager::setJoystickThreshold(float threshold) {
@@ -19,6 +27,10 @@ void EventManager::pushEvent(const Event& event) {
//
}
bool EventManager::filterEvent(const Event& event) {
return true;
}
////////////////////////////////////////////////////////////
void EventManager::processEvents() {
//