Merge remote-tracking branch 'origin/master'

elect86 · elect86 · commit 8f2a75e9c146 · 2018-04-10T08:19:22.000+02:00
diff --git a/src/main/kotlin/uno/glfw/GlfwWindow.kt b/src/main/kotlin/uno/glfw/GlfwWindow.kt
@@ -72,7 +72,7 @@ class GlfwWindow(val handle: Long) {
         }
         set(value) = glfwSetWindowSize(handle, value.x, value.y)
 
-    val aspect get() = size.x / size.y.f
+    val aspect get() = size.aspect
 //        set(value) = glfwSetWindowAspectRatio(handle, (value * 1_000).i, 1_000)
 
     var aspectRatio = Vec2i()

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class GlfwWindow(val handle: Long) {`
`72`	`72`	`}`
`73`	`73`	`set(value) = glfwSetWindowSize(handle, value.x, value.y)`
`74`	`74`
`75`		`- val aspect get() = size.x / size.y.f`
	`75`	`+ val aspect get() = size.aspect`
`76`	`76`	`// set(value) = glfwSetWindowAspectRatio(handle, (value * 1_000).i, 1_000)`
`77`	`77`
`78`	`78`	`var aspectRatio = Vec2i()`