@@ -16,12 +16,12 @@ import uno.buffer.intBufferBig
1616 * Created by GBarbieri on 24.04.2017.
1717 */
1818
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
2525
2626class GlfwWindow (val handle : Long ) {
2727
@@ -141,7 +141,7 @@ class GlfwWindow(val handle: Long) {
141141 }
142142 */
143143
144- var framebufferSizeCallback: framebufferSizeCallbackT ? = null
144+ var framebufferSizeCallback: FramebufferSizeCallbackT ? = null
145145 set(value) {
146146 glfwSetFramebufferSizeCallback(handle, value?.let { GLFWFramebufferSizeCallbackI { _, width, height -> it(Vec2i (width, height)) } })?.free()
147147 field = value
@@ -176,7 +176,7 @@ class GlfwWindow(val handle: Long) {
176176 glfwSetCursorPosCallback(handle, callback)?.free()
177177 }*/
178178
179- var cursorPosCallback: cursorPosCallbackT ? = null
179+ var cursorPosCallback: CursorPosCallbackT ? = null
180180 set(value) {
181181 glfwSetCursorPosCallback(handle, value?.let { GLFWCursorPosCallbackI { _, xPos, yPos -> it(Vec2d (xPos, yPos)) } })?.free()
182182 field = value
@@ -203,7 +203,7 @@ class GlfwWindow(val handle: Long) {
203203 glfwSetScrollCallback(handle, callback)?.free()
204204 }*/
205205
206- var scrollCallback: scrollCallbackT ? = null
206+ var scrollCallback: ScrollCallbackT ? = null
207207 set(value) {
208208 glfwSetScrollCallback(handle, value?.let { GLFWScrollCallbackI { _, xOffset, yOffset -> it(Vec2d (xOffset, yOffset)) } })?.free()
209209 field = value
@@ -225,7 +225,7 @@ class GlfwWindow(val handle: Long) {
225225 glfwSetMouseButtonCallback(handle, callback)?.free()
226226 }*/
227227
228- var mouseButtonCallback: mouseButtonCallbackT ? = null
228+ var mouseButtonCallback: MouseButtonCallbackT ? = null
229229 set(value) {
230230 glfwSetMouseButtonCallback(handle, value?.let { GLFWMouseButtonCallbackI { _, button, action, mods -> it(button, action, mods) } })?.free()
231231 field = value
@@ -247,7 +247,7 @@ class GlfwWindow(val handle: Long) {
247247 glfwSetKeyCallback(handle, callback)?.free()
248248 }*/
249249
250- var keyCallback: keyCallbackT ? = null
250+ var keyCallback: KeyCallbackT ? = null
251251 set(value) {
252252 glfwSetKeyCallback(handle, value?.let { GLFWKeyCallbackI { _, key, scancode, action, mods -> it(key, scancode, action, mods) } })?.free()
253253 field = value
@@ -269,7 +269,7 @@ class GlfwWindow(val handle: Long) {
269269 glfwSetCharCallback(handle, callback)?.free()
270270 }*/
271271
272- var charCallback: charCallbackT ? = null
272+ var charCallback: CharCallbackT ? = null
273273 set(value) {
274274 glfwSetCharCallback(handle, value?.let { GLFWCharCallbackI { _, codepoint -> it(codepoint) } })?.free()
275275 field = value
0 commit comments