Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Feature] Event Exception #163

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Feature] Event Exception #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c87bf72
[Feature] Event Exception
berinhardt Jun 19, 2019
22bfa7d
[FIX] Use correct base class
berinhardt Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion oxygine/src/oxygine/Event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ namespace oxygine
class Event
{
public:
enum { COMPLETE = sysEventID('C', 'M', 'P') };
enum {
COMPLETE = sysEventID('C', 'M', 'P'),
ERROR = sysEventID('E', 'R', 'R')
};

enum Phase
{
Expand Down
8 changes: 7 additions & 1 deletion oxygine/src/oxygine/EventDispatcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,13 @@ namespace oxygine
listenerbase& ls = copy[i];
event->currentTarget = this;
event->listenerID = ls.id;
ls.cb(event);
try{
ls.cb(event);
} catch (const oxygine::event_exception &ex) {
Event e(Event::ERROR);
e.userData = (void*) &ex;
dispatchEvent(&e);
}
if (event->stopsImmediatePropagation)
break;
}
Expand Down
5 changes: 5 additions & 0 deletions oxygine/src/oxygine/EventDispatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ namespace oxygine
#define EventID(str) EventIDc11(str)


class event_exception : public std::runtime_error {
public:
event_exception(const char* what) : std::runtime_error(what) { }
event_exception(const event_exception &other) : event_exception(other.what()) { }
};
DECLARE_SMART(EventDispatcher, spEventDispatcher);
class EventDispatcher: public Object
{
Expand Down