mitchellhansen/voxel-raycaster
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Events are now passing correctly, small bug with held keys that needs fixing

Browse Source
This commit is contained in:
MitchellHansen
2017-01-14 15:15:59 -08:00
parent 0e1e9af37c
commit 10e3ba43fa
8 changed files with 216 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Camera.h
View File

@@ -35,7 +35,7 @@ public:
sf::Vector2f get_direction();
void update(VrEventPublisher* p, vr::Event e) override;
void recieve_event(VrEventPublisher* p, std::unique_ptr<vr::Event> event) override;
private:

105
include/Event.hpp
View File

@@ -16,8 +16,9 @@ namespace vr {
// A result of getting rid of the union and extracting
// event types into individual classes is the fact that
// there is going to be a lot of repeat code i.e the
// difference between KeyPressed and KeyReleased
// there is going to be a lot of repeat code i.e
// KeyPressed, KeyHeld, and KeyReleased all hold the same
// data, it's just their names that are different
class Event {
public:
@@ -30,15 +31,18 @@ namespace vr {
GainedFocus,
TextEntered,
KeyPressed,
KeyHeld,
KeyReleased,
MouseWheelMoved,
MouseWheelScrolled,
MouseButtonPressed,
MouseButtonHeld,
MouseButtonReleased,
MouseMoved,
MouseEntered,
MouseLeft,
JoystickButtonPressed,
JoystickButtonHeld,
JoystickButtonReleased,
JoystickMoved,
JoystickConnected,
@@ -48,6 +52,7 @@ namespace vr {
TouchEnded,
SensorChanged,
NetworkJoystickButtonPressed,
NetworkJoystickButtonHeld,
NetworkJoystickButtonReleased,
NetworkJoystickMoved,
NetworkJoystickConnected,
@@ -72,8 +77,8 @@ namespace vr {
public:
Resized(unsigned int width, unsigned int height) :
width(width), height(height), Event(vr::Event::EventType::Resized) {};
unsigned int width;
unsigned int height;
unsigned int width;
unsigned int height;
};
class LostFocus : public Event {
@@ -105,6 +110,18 @@ namespace vr {
bool system;
};
class KeyHeld : public Event {
public:
KeyHeld(sf::Keyboard::Key code, bool alt, bool control, bool shift, bool system) :
code(code), alt(alt), control(control), shift(shift), system(system), Event(vr::Event::EventType::KeyHeld) {};
sf::Keyboard::Key code;
bool alt;
bool control;
bool shift;
bool system;
};
class KeyReleased : public Event {
public:
KeyReleased(sf::Keyboard::Key code, bool alt, bool control, bool shift, bool system) :
@@ -144,6 +161,16 @@ namespace vr {
int y;
};
class MouseButtonHeld : public Event {
public:
MouseButtonHeld(sf::Mouse::Button button, int x, int y) :
button(button), x(x), y(y), Event(vr::Event::EventType::MouseButtonHeld) {};
sf::Mouse::Button button;
int x;
int y;
};
class MouseButtonReleased : public Event {
public:
MouseButtonReleased(sf::Mouse::Button button, int x, int y) :
@@ -159,8 +186,8 @@ namespace vr {
MouseMoved(int x, int y) :
x(x), y(y), Event(vr::Event::EventType::MouseMoved) {};
int x;
int y;
int x;
int y;
};
class MouseEntered : public Event {
@@ -168,8 +195,8 @@ namespace vr {
MouseEntered(int x, int y) :
x(x), y(y), Event(vr::Event::EventType::MouseEntered) {};
int x;
int y;
int x;
int y;
};
class MouseLeft : public Event {
@@ -177,8 +204,8 @@ namespace vr {
MouseLeft(int x, int y) :
x(x), y(y), Event(vr::Event::EventType::MouseLeft) {};
int x;
int y;
int x;
int y;
};
class JoystickButtonPressed : public Event {
@@ -186,8 +213,17 @@ namespace vr {
JoystickButtonPressed(unsigned int joystickId, unsigned int button) :
joystickId(joystickId), button(button), Event(vr::Event::EventType::JoystickButtonPressed) {};
unsigned int joystickId;
unsigned int button;
unsigned int joystickId;
unsigned int button;
};
class JoystickButtonHeld : public Event {
public:
JoystickButtonHeld(unsigned int joystickId, unsigned int button) :
joystickId(joystickId), button(button), Event(vr::Event::EventType::JoystickButtonHeld) {};
unsigned int joystickId;
unsigned int button;
};
class JoystickButtonReleased : public Event {
@@ -195,8 +231,8 @@ namespace vr {
JoystickButtonReleased(unsigned int joystickId, unsigned int button) :
joystickId(joystickId), button(button), Event(vr::Event::EventType::JoystickButtonReleased) {};
unsigned int joystickId;
unsigned int button;
unsigned int joystickId;
unsigned int button;
};
class JoystickMoved : public Event {
@@ -214,7 +250,7 @@ namespace vr {
JoystickConnected(unsigned int joystickId) :
joystickId(joystickId), Event(vr::Event::EventType::JoystickConnected) {};
unsigned int joystickId;
unsigned int joystickId;
};
class JoystickDisconnected : public Event {
@@ -222,17 +258,17 @@ namespace vr {
JoystickDisconnected(unsigned int joystickId) :
joystickId(joystickId), Event(vr::Event::EventType::JoystickDisconnected) {};
unsigned int joystickId;
unsigned int joystickId;
};
class TouchBegan : public Event {
public:
TouchBegan(unsigned int finger, int x, int y) :
finger(finger), x(x), y(y), Event(vr::Event::EventType::TouchBegan) {};
unsigned int finger;
int x;
int y;
unsigned int finger;
int x;
int y;
};
class TouchMoved : public Event {
@@ -240,9 +276,9 @@ namespace vr {
TouchMoved(unsigned int finger, int x, int y) :
finger(finger), x(x), y(y), Event(vr::Event::EventType::TouchMoved) {};
unsigned int finger;
int x;
int y;
unsigned int finger;
int x;
int y;
};
class TouchEnded : public Event {
@@ -250,9 +286,9 @@ namespace vr {
TouchEnded(unsigned int finger, int x, int y) :
finger(finger), x(x), y(y), Event(vr::Event::EventType::TouchEnded) {};
unsigned int finger;
int x;
int y;
unsigned int finger;
int x;
int y;
};
class SensorChanged : public Event {
@@ -260,10 +296,10 @@ namespace vr {
SensorChanged(sf::Sensor::Type type, float x, float y, float z) :
type(type), x(x), y(y), z(z), Event(vr::Event::EventType::SensorChanged) {};
sf::Sensor::Type type;
float x;
float y;
float z;
sf::Sensor::Type type;
float x;
float y;
float z;
};
// I'm moving this to it's own event type because
@@ -280,6 +316,15 @@ namespace vr {
unsigned int button;
};
class NetworkJoystickButtonHeld : public Event {
public:
NetworkJoystickButtonHeld(unsigned int joystickId, unsigned int button) :
joystickId(joystickId), button(button), Event(vr::Event::EventType::NetworkJoystickButtonHeld) {};
unsigned int joystickId;
unsigned int button;
};
class NetworkJoystickButtonReleased : public Event {
public:
NetworkJoystickButtonReleased(unsigned int joystickId, unsigned int button) :

18
include/Input.h
View File

@@ -18,7 +18,7 @@ public:
void consume_sf_events(sf::RenderWindow *window);
void consume_vr_events();
void set_flags();
void handle_held_keys();
void dispatch_events();
private:
@@ -38,3 +38,19 @@ private:
std::list<std::unique_ptr<vr::Event>> event_queue;
};
class WindowHandler : public VrEventSubscriber {
public:
WindowHandler(sf::RenderWindow *window) : window_ref(window) { };
virtual void recieve_event(VrEventPublisher* p, std::unique_ptr<vr::Event> event) override {
if (event.get()->type == vr::Event::Closed) {
window_ref->close();
}
};
private:
sf::RenderWindow* window_ref;
};

9
include/Pub_Sub.h
View File

@@ -2,6 +2,7 @@
#include <SFML/Graphics.hpp>
#include <iostream>
#include "Event.hpp"
#include <memory>
class VrEventPublisher;
@@ -9,9 +10,9 @@ class VrEventPublisher;
class VrEventSubscriber {
public:
virtual ~VrEventSubscriber() {};
virtual void update(VrEventPublisher* p, vr::Event e) = 0;
void subscribe(VrEventPublisher* publisher, vr::Event::EventType type);
void subscribe(VrEventPublisher* publisher, std::vector<vr::Event::EventType> type);
virtual void recieve_event(VrEventPublisher* publisher, std::unique_ptr<vr::Event> event) = 0;
void subscribe_to_publisher(VrEventPublisher* publisher, vr::Event::EventType type);
void subscribe_to_publisher(VrEventPublisher* publisher, std::vector<vr::Event::EventType> type);
protected:
std::vector<vr::Event::EventType> subscribed_event_types;
};
@@ -24,7 +25,7 @@ public:
virtual void subscribe(VrEventSubscriber *subscriber, vr::Event::EventType type);
virtual void subscribe(VrEventSubscriber *subscriber, std::vector<vr::Event::EventType> type);
virtual void unsubscribe(VrEventSubscriber *s, vr::Event::EventType c);
virtual void notify(vr::Event e);
virtual void notify_subscribers(std::unique_ptr<vr::Event> event);
private:
std::map<vr::Event::EventType, std::vector<VrEventSubscriber*>> subscribers;