@@ -16,12 +16,12 @@ import uno.buffer.intBufferBig
16
16
* Created by GBarbieri on 24.04.2017.
17
17
*/
18
18
19
- typealias framebufferSizeCallbackT = (Vec2i ) -> Unit
20
- typealias cursorPosCallbackT = (Vec2d ) -> Unit
21
- typealias scrollCallbackT = (Vec2d ) -> Unit
22
- typealias mouseButtonCallbackT = (Int , Int , Int ) -> Unit
23
- typealias keyCallbackT = (Int , Int , Int , Int ) -> Unit
24
- typealias charCallbackT = (Int ) -> Unit
19
+ typealias FramebufferSizeCallbackT = (Vec2i ) -> Unit
20
+ typealias CursorPosCallbackT = (Vec2d ) -> Unit
21
+ typealias ScrollCallbackT = (Vec2d ) -> Unit
22
+ typealias MouseButtonCallbackT = (Int , Int , Int ) -> Unit
23
+ typealias KeyCallbackT = (Int , Int , Int , Int ) -> Unit
24
+ typealias CharCallbackT = (Int ) -> Unit
25
25
26
26
class GlfwWindow (val handle : Long ) {
27
27
@@ -141,7 +141,7 @@ class GlfwWindow(val handle: Long) {
141
141
}
142
142
*/
143
143
144
- var framebufferSizeCallback: framebufferSizeCallbackT ? = null
144
+ var framebufferSizeCallback: FramebufferSizeCallbackT ? = null
145
145
set(value) {
146
146
glfwSetFramebufferSizeCallback(handle, value?.let { GLFWFramebufferSizeCallbackI { _, width, height -> it(Vec2i (width, height)) } })?.free()
147
147
field = value
@@ -176,7 +176,7 @@ class GlfwWindow(val handle: Long) {
176
176
glfwSetCursorPosCallback(handle, callback)?.free()
177
177
}*/
178
178
179
- var cursorPosCallback: cursorPosCallbackT ? = null
179
+ var cursorPosCallback: CursorPosCallbackT ? = null
180
180
set(value) {
181
181
glfwSetCursorPosCallback(handle, value?.let { GLFWCursorPosCallbackI { _, xPos, yPos -> it(Vec2d (xPos, yPos)) } })?.free()
182
182
field = value
@@ -203,7 +203,7 @@ class GlfwWindow(val handle: Long) {
203
203
glfwSetScrollCallback(handle, callback)?.free()
204
204
}*/
205
205
206
- var scrollCallback: scrollCallbackT ? = null
206
+ var scrollCallback: ScrollCallbackT ? = null
207
207
set(value) {
208
208
glfwSetScrollCallback(handle, value?.let { GLFWScrollCallbackI { _, xOffset, yOffset -> it(Vec2d (xOffset, yOffset)) } })?.free()
209
209
field = value
@@ -225,7 +225,7 @@ class GlfwWindow(val handle: Long) {
225
225
glfwSetMouseButtonCallback(handle, callback)?.free()
226
226
}*/
227
227
228
- var mouseButtonCallback: mouseButtonCallbackT ? = null
228
+ var mouseButtonCallback: MouseButtonCallbackT ? = null
229
229
set(value) {
230
230
glfwSetMouseButtonCallback(handle, value?.let { GLFWMouseButtonCallbackI { _, button, action, mods -> it(button, action, mods) } })?.free()
231
231
field = value
@@ -247,7 +247,7 @@ class GlfwWindow(val handle: Long) {
247
247
glfwSetKeyCallback(handle, callback)?.free()
248
248
}*/
249
249
250
- var keyCallback: keyCallbackT ? = null
250
+ var keyCallback: KeyCallbackT ? = null
251
251
set(value) {
252
252
glfwSetKeyCallback(handle, value?.let { GLFWKeyCallbackI { _, key, scancode, action, mods -> it(key, scancode, action, mods) } })?.free()
253
253
field = value
@@ -269,7 +269,7 @@ class GlfwWindow(val handle: Long) {
269
269
glfwSetCharCallback(handle, callback)?.free()
270
270
}*/
271
271
272
- var charCallback: charCallbackT ? = null
272
+ var charCallback: CharCallbackT ? = null
273
273
set(value) {
274
274
glfwSetCharCallback(handle, value?.let { GLFWCharCallbackI { _, codepoint -> it(codepoint) } })?.free()
275
275
field = value
0 commit comments