ObjGameKit  Diff

Differences From Artifact [8d48ecf372]:

To Artifact [7219e86adc]:


59
60
61
62
63
64
65
66
67
68










69
70
71
72
73
74
75
76
77










78
79
80
81
82
83
84
85
86










87
88
89
90
91
92
93
94
95










96
97
98
99
100
101
102
103
104
105










106
107
108
109
110
111
112
113
114
115










116
117
118
119
120
121
122
59
60
61
62
63
64
65



66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81



82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97



98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113



114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130



131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147



148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164







-
-
-
+
+
+
+
+
+
+
+
+
+






-
-
-
+
+
+
+
+
+
+
+
+
+






-
-
-
+
+
+
+
+
+
+
+
+
+






-
-
-
+
+
+
+
+
+
+
+
+
+







-
-
-
+
+
+
+
+
+
+
+
+
+







-
-
-
+
+
+
+
+
+
+
+
+
+








	while (al_get_next_event(eventQueue, allegroEvent)) {
		switch (allegroEvent->type) {
		case ALLEGRO_EVENT_DISPLAY_CLOSE:
			object_setClass(event, [OGKCloseEvent class]);

			if ([delegate respondsToSelector:
			    @selector(displayWasClosed:)])
				[delegate displayWasClosed:
				    (OGKCloseEvent*)event];
			    @selector(display:wasClosed:)]) {
				OGKDisplay *display = [OGKDisplay
				    OGK_displayForAllegroDisplay:
				    allegroEvent->display.source];
				OGKCloseEvent *closeEvent =
				    (OGKCloseEvent*)event;

				[delegate display: display
					wasClosed: closeEvent];
			}

			break;
		case ALLEGRO_EVENT_KEY_DOWN:
			object_setClass(event, [OGKKeyPressEvent class]);

			if ([delegate respondsToSelector:
			    @selector(keyWasPressed:)])
				[delegate keyWasPressed:
				    (OGKKeyPressEvent*)event];
			    @selector(keyWasPressed:display:)]) {
				OGKDisplay *display = [OGKDisplay
				    OGK_displayForAllegroDisplay:
				    allegroEvent->keyboard.display];
				OGKKeyPressEvent *keyPressEvent =
				    (OGKKeyPressEvent*)event;

				[delegate keyWasPressed: keyPressEvent
						display: display];
			}

			break;
		case ALLEGRO_EVENT_KEY_UP:
			object_setClass(event, [OGKKeyReleaseEvent class]);

			if ([delegate respondsToSelector:
			    @selector(keyWasReleased:)])
				[delegate keyWasReleased:
				    (OGKKeyReleaseEvent*)event];
			    @selector(keyWasReleased:display:)]) {
				OGKDisplay *display = [OGKDisplay
				    OGK_displayForAllegroDisplay:
				    allegroEvent->keyboard.display];
				OGKKeyReleaseEvent *keyReleaseEvent =
				    (OGKKeyReleaseEvent*)event;

				[delegate keyWasReleased: keyReleaseEvent
						 display: display];
			}

			break;
		case ALLEGRO_EVENT_MOUSE_AXES:
			object_setClass(event, [OGKMouseMovedEvent class]);

			if ([delegate respondsToSelector:
			    @selector(mouseWasMoved:)])
				[delegate mouseWasMoved:
				    (OGKMouseMovedEvent*)event];
			    @selector(mouseWasMoved:display:)]) {
				OGKDisplay *display = [OGKDisplay
				    OGK_displayForAllegroDisplay:
				    allegroEvent->mouse.display];
				OGKMouseMovedEvent *mouseMovedEvent =
				    (OGKMouseMovedEvent*)event;

				[delegate mouseWasMoved: mouseMovedEvent
						display: display];
			}

			break;
		case ALLEGRO_EVENT_MOUSE_BUTTON_DOWN:
			object_setClass(event,
			    [OGKMouseButtonPressedEvent class]);

			if ([delegate respondsToSelector:
			    @selector(mouseButtonWasPressed:)])
				[delegate mouseButtonWasPressed:
				    (OGKMouseButtonPressedEvent*)event];
			    @selector(mouseButtonWasPressed:display:)]) {
				OGKDisplay *display = [OGKDisplay
				    OGK_displayForAllegroDisplay:
				    allegroEvent->mouse.display];
				OGKMouseButtonPressedEvent *pressedEvent =
				    (OGKMouseButtonPressedEvent*)event;

				[delegate mouseButtonWasPressed: pressedEvent
							display: display];
			}

			break;
		case ALLEGRO_EVENT_MOUSE_BUTTON_UP:
			object_setClass(event,
			    [OGKMouseButtonReleasedEvent class]);

			if ([delegate respondsToSelector:
			    @selector(mouseButtonWasReleased:)])
				[delegate mouseButtonWasReleased:
				    (OGKMouseButtonReleasedEvent*)event];
			    @selector(mouseButtonWasReleased:display:)]) {
				OGKDisplay *display = [OGKDisplay
				    OGK_displayForAllegroDisplay:
				    allegroEvent->mouse.display];
				OGKMouseButtonReleasedEvent *releasedEvent =
				    (OGKMouseButtonReleasedEvent*)event;

				[delegate mouseButtonWasReleased: releasedEvent
							 display: display];
			}

			break;
		}
	}
}

- (void)registerDisplay: (OGKDisplay*)display