Skip to content

Commit c02b150

Browse files
committed
v1.62.2
Kotlin 1.2.51 Gradle 4.9 Shadow 2.0.4
1 parent 93fb809 commit c02b150

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ group = 'com.github.kotlin-graphics'
1313

1414
buildscript {
1515

16-
ext.kotlinVersion = '1.2.50'
16+
ext.kotlinVersion = '1.2.51'
1717

1818
repositories {
1919
jcenter() // shadow
@@ -24,7 +24,7 @@ buildscript {
2424

2525
dependencies {
2626
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
27-
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.3'
27+
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
2828
classpath "org.junit.platform:junit-platform-gradle-plugin:1.1.0"
2929
}
3030
}
@@ -33,7 +33,7 @@ dependencies {
3333

3434
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
3535

36-
implementation 'com.github.kotlin-graphics:uno-sdk:048413b'
36+
implementation 'com.github.kotlin-graphics:uno-sdk:6d0cd14'
3737

3838
testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.0.6'
3939

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

src/main/kotlin/imgui/font.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ class FontAtlas {
395395
// Internals
396396

397397
fun calcCustomRectUV(rect: CustomRect, outUvMin: Vec2, outUvMax: Vec2) {
398-
assert(texSize greaterThan 0) { "Font atlas needs to be built before we can calculate UV coordinates" }
398+
assert(texSize allGreaterThan 0) { "Font atlas needs to be built before we can calculate UV coordinates" }
399399
assert(rect.isPacked) { "Make sure the rectangle has been packed" }
400400
outUvMin.put(rect.x.f * texUvScale.x, rect.y.f * texUvScale.y)
401401
outUvMax.put((rect.x + rect.width).f * texUvScale.x, (rect.y + rect.height).f * texUvScale.y)

src/main/kotlin/imgui/imgui.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ object ImGui :
7575

7676
imgui_internal {
7777

78-
val beta = 1
78+
val beta = 2
7979
val version = "1.62.$beta"
8080
}
8181

src/main/kotlin/imgui/imgui/inputs.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ interface imgui_inputs {
102102
}
103103

104104
/** We typically use ImVec2(-FLT_MAX,-FLT_MAX) to denote an invalid mouse position */
105-
fun isMousePosValid(mousePos: Vec2? = null) = (mousePos ?: io.mousePos) greaterThan MOUSE_INVALID
105+
fun isMousePosValid(mousePos: Vec2? = null) = (mousePos ?: io.mousePos) allGreaterThan MOUSE_INVALID
106106

107107
/** shortcut to io.mousePos provided by user, to be consistent with other calls */
108108
val mousePos get() = io.mousePos

src/main/kotlin/imgui/imgui/internal.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2404,7 +2404,7 @@ interface imgui_internal {
24042404
editState.click(mouseX, mouseY)
24052405
editState.cursorAnimReset()
24062406
}
2407-
} else if (io.mouseDown[0] && !editState.selectedAllMouseLock && io.mouseDelta notEqual 0f) {
2407+
} else if (io.mouseDown[0] && !editState.selectedAllMouseLock && io.mouseDelta anyNotEqual 0f) {
24082408
editState.state.selectStart = editState.state.cursor
24092409
editState.state.selectEnd = editState.locateCoord(mouseX, mouseY)
24102410
editState.cursorFollow = true

src/main/kotlin/imgui/imgui/window.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ interface imgui_window {
357357
if (flags hasnt Wf.ChildWindow)
358358
/* Ignore zero-sized display explicitly to avoid losing positions if a window manager reports zero-sized
359359
window when initializing or minimizing. */
360-
if (!windowPosSetByApi && window.autoFitFrames.x <= 0 && window.autoFitFrames.y <= 0 && io.displaySize greaterThan 0) {
360+
if (!windowPosSetByApi && window.autoFitFrames.x <= 0 && window.autoFitFrames.y <= 0 && io.displaySize allGreaterThan 0) {
361361
val padding = glm.max(style.displayWindowPadding, style.displaySafeAreaPadding)
362362
window.pos = glm.max(window.pos + window.size, padding) - window.size
363363
window.pos.x = glm.min(window.pos.x, (io.displaySize.x - padding.x).f)
@@ -684,7 +684,7 @@ interface imgui_window {
684684
assert(flags has Wf.NoTitleBar)
685685
window.collapsed = parentWindow?.collapsed == true
686686

687-
if (flags hasnt Wf.AlwaysAutoResize && window.autoFitFrames lessThanEqual 0)
687+
if (flags hasnt Wf.AlwaysAutoResize && window.autoFitFrames allLessThanEqual 0)
688688
window.collapsed = window.collapsed || (window.outerRectClipped.min.x >= window.outerRectClipped.max.x
689689
|| window.outerRectClipped.min.y >= window.outerRectClipped.max.y)
690690

src/main/kotlin/imgui/impl/JoglGL3.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ object JoglGL3 {
273273
/** Avoid rendering when minimized, scale coordinates for retina displays
274274
* (screen coordinates != framebuffer coordinates) */
275275
val fbSize = io.displaySize * io.displayFramebufferScale
276-
if (fbSize equal 0) return
276+
if (fbSize anyLessThanEqual 0) return
277277
drawData scaleClipRects io.displayFramebufferScale
278278

279279
// Backup GL state

src/main/kotlin/imgui/impl/JoglVrGL3.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ object JoglVrGL3 {
275275
/** Avoid rendering when minimized, scale coordinates for retina displays
276276
* (screen coordinates != framebuffer coordinates) */
277277
val fbSize = io.displaySize * io.displayFramebufferScale
278-
if (fbSize equal 0) return
278+
if (fbSize anyLessThanEqual 0) return
279279
drawData scaleClipRects io.displayFramebufferScale
280280

281281
// Backup GL state

src/main/kotlin/imgui/impl/LwjglGL3.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ object LwjglGL3 {
340340
/** Avoid rendering when minimized, scale coordinates for retina displays
341341
* (screen coordinates != framebuffer coordinates) */
342342
val fbSize = io.displaySize * io.displayFramebufferScale
343-
if (fbSize equal 0) return
343+
if (fbSize anyLessThanEqual 0) return
344344
drawData scaleClipRects io.displayFramebufferScale
345345

346346
// Backup GL state

0 commit comments

Comments
 (0)