- fixed ini float values

Author: elect86

build.gradle

@@ -13,7 +13,7 @@ group = 'com.github.kotlin-graphics'
 
 buildscript {
 
-    ext.kotlinVersion = '1.2.0-beta-88'
+    ext.kotlinVersion = '1.2.0-rc-39'
 
     repositories {
         jcenter()   // shadow
@@ -32,9 +32,9 @@ dependencies {
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-    compile 'com.github.kotlin-graphics:uno-sdk:119fcddca6a96ad34b94a6dd97c01b03d3c4adc9'
+    compile 'com.github.kotlin-graphics:uno-sdk:54552477eee8c63156043e833389e13c65005c77'
 
-    testCompile 'com.github.elect86:kotlintest:43281b7e1b'
+    testCompile 'io.kotlintest:kotlintest:2.0.7'
 
     def joglVersion = '2.3.2'
     compile "org.jogamp.gluegen:gluegen-rt-main:$joglVersion"

imgui.ini

@@ -1,25 +1,20 @@
 [Debug]
 Pos=60,60
-Size=400.0,400.0
+Size=400,400
 Collapsed=0
 
 [ImGui Demo]
 Pos=647,22
-Size=550.0,680.0
+Size=550,680
 Collapsed=0
 
 [Style Editor]
 Pos=390,21
-Size=640.0,688.0
+Size=640,688
 Collapsed=0
 
 [Debug##Default]
 Pos=60,60
-Size=400.0,400.0
-Collapsed=0
-
-[Another Window]
-Pos=606,53
-Size=215.0,48.0
+Size=400,400
 Collapsed=0
 

src/main/kotlin/imgui/Context.kt

@@ -471,23 +471,23 @@ class Style {
      *  Tips: if you need to change your scale multiple times, prefer calling this on a freshly initialized Style
      *  structure rather than scaling multiple times (because floating point multiplications are lossy).    */
     fun scaleAllSizes(scaleFactor: Float) {
-        windowPadding *= scaleFactor
-        windowMinSize *= scaleFactor
+        windowPadding timesAssign  scaleFactor
+        windowMinSize timesAssign scaleFactor
         windowRounding *= scaleFactor
         childWindowRounding *= scaleFactor
-        framePadding *= scaleFactor
+        framePadding timesAssign scaleFactor
         frameRounding *= scaleFactor
-        itemSpacing *= scaleFactor
-        itemInnerSpacing *= scaleFactor
-        touchExtraPadding *= scaleFactor
+        itemSpacing timesAssign scaleFactor
+        itemInnerSpacing timesAssign scaleFactor
+        touchExtraPadding timesAssign scaleFactor
         indentSpacing *= scaleFactor
         columnsMinSpacing *= scaleFactor
         scrollbarSize *= scaleFactor
         scrollbarRounding *= scaleFactor
         grabMinSize *= scaleFactor
         grabRounding *= scaleFactor
-        displayWindowPadding *= scaleFactor
-        displaySafeAreaPadding *= scaleFactor
+        displayWindowPadding timesAssign scaleFactor
+        displaySafeAreaPadding timesAssign scaleFactor
     }
 }
 

src/main/kotlin/imgui/TextEditState.kt

@@ -1,6 +1,6 @@
 package imgui
 
-import gli.has
+import gli_.has
 import glm_.c
 import glm_.glm
 import imgui.internal.isSpace

src/main/kotlin/imgui/draw.kt

@@ -1,8 +1,9 @@
 package imgui
 
-import gli.hasnt
+import gli_.hasnt
 import glm_.BYTES
 import glm_.f
+import glm_.func.common.max
 import glm_.glm
 import glm_.i
 import glm_.vec2.Vec2
@@ -148,8 +149,8 @@ class DrawList {
             if (cr.z > current.z) cr.z = current.z
             if (cr.w > current.w) cr.w = current.w
         }
-        cr.z = glm.max(cr.x, cr.z)
-        cr.w = glm.max(cr.y, cr.w)
+        cr.z = cr.x max cr.z
+        cr.w = cr.y max cr.w
 
         _clipRectStack.push(cr)
         updateClipRect()
@@ -351,7 +352,7 @@ class DrawList {
 
             for (i1 in 0 until count) {
                 val i2 = if ((i1 + 1) == points.size) 0 else i1 + 1
-                var diff = points[i2] - points[i1]
+                val diff = points[i2] - points[i1]
                 diff *= diff.invLength(1f)
                 tempNormals[i1].x = diff.y
                 tempNormals[i1].y = -diff.x
@@ -373,7 +374,7 @@ class DrawList {
                     val idx2 = if ((i1 + 1) == points.size) _vtxCurrentIdx else idx1 + 3
 
                     // Average normals
-                    var dm = (tempNormals[i1] + tempNormals[i2]) * 0.5f
+                    val dm = (tempNormals[i1] + tempNormals[i2]) * 0.5f
                     val dmr2 = dm.x * dm.x + dm.y * dm.y
                     if (dmr2 > 0.000001f) {
                         var scale = 1f / dmr2
@@ -435,7 +436,7 @@ class DrawList {
                     val idx2 = if ((i1 + 1) == points.size) _vtxCurrentIdx else idx1 + 4
 
                     // Average normals
-                    var dm = (tempNormals[i1] + tempNormals[i2]) * 0.5f
+                    val dm = (tempNormals[i1] + tempNormals[i2]) * 0.5f
                     val dmr2 = dm.x * dm.x + dm.y * dm.y
                     if (dmr2 > 0.000001f) {
                         var scale = 1f / dmr2
@@ -501,7 +502,7 @@ class DrawList {
                 val i2 = if ((i1 + 1) == points.size) 0 else i1 + 1
                 val p1 = points[i1]
                 val p2 = points[i2]
-                var diff = p2 - p1
+                val diff = p2 - p1
                 diff *= diff.invLength(1f)
 
                 val d = diff * (thickness * 0.5f)
@@ -566,7 +567,7 @@ class DrawList {
             while (i1 < points.size) {
                 val p0 = points[i0]
                 val p1 = points[i1]
-                var diff = p1 - p0
+                val diff = p1 - p0
                 diff *= diff.invLength(1f)
                 tempNormals[i0].x = diff.y
                 tempNormals[i0].y = -diff.x
@@ -579,7 +580,7 @@ class DrawList {
                 // Average normals
                 val n0 = tempNormals[i0]
                 val n1 = tempNormals[i1]
-                var dm = (n0 + n1) * 0.5f
+                val dm = (n0 + n1) * 0.5f
                 val dmr2 = dm.x * dm.x + dm.y * dm.y
                 if (dmr2 > 0.000001f) {
                     var scale = 1f / dmr2

src/main/kotlin/imgui/font.kt

@@ -3,7 +3,6 @@ package imgui
 //import imgui.TrueType.packFontRangesGatherRects
 //import imgui.TrueType.packFontRangesRenderIntoRects
 //import imgui.TrueType.packSetOversampling
-import gli.wasInit
 import glm_.*
 import glm_.vec2.Vec2
 import glm_.vec2.Vec2i
@@ -825,7 +824,7 @@ class FontAtlas {
     }
 
     fun buildMultiplyCalcLookupTable(inBrightenFactor: Float) = CharArray(256, {
-        val value = (i * inBrightenFactor).i
+        val value = (it * inBrightenFactor).i
         (if (value > 255) 255 else (value and 0xFF)).c
     })
 
@@ -990,7 +989,7 @@ class Font {
 
     fun getCharAdvance(c: Char) = if (c < indexAdvanceX.size) indexAdvanceX[c.i] else fallbackAdvanceX
 
-    val isLoaded get() = wasInit { containerAtlas }
+    val isLoaded get() = ::containerAtlas.isInitialized
 
 
     /*  'maxWidth' stops rendering after a certain width (could be turned into a 2d size). FLT_MAX to disable.

src/main/kotlin/imgui/imgui/cursorLayout.kt

@@ -1,6 +1,6 @@
 package imgui.imgui
 
-import gli.hasnt
+import gli_.hasnt
 import glm_.glm
 import glm_.i
 import glm_.vec2.Vec2

src/main/kotlin/imgui/imgui/demoDebugInfo.kt

@@ -1,6 +1,6 @@
 package imgui.imgui
 
-import gli.has
+import gli_.has
 import glm_.*
 import glm_.vec2.Vec2
 import glm_.vec2.Vec2i

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

@@ -1,7 +1,7 @@
 package imgui.imgui
 
-import gli.has
-import gli.hasnt
+import gli_.has
+import gli_.hasnt
 import glm_.f
 import glm_.glm
 import glm_.i
@@ -901,7 +901,7 @@ interface imgui_internal {
 
         val thickness = glm.max(sz / 5f, 1f)
         val sz = sz - thickness * 0.5f
-        pos plus_ Vec2(thickness * 0.25f, thickness * 0.25f)
+        pos += thickness * 0.25f
 
         val third = sz / 3f
         val bx = pos.x + third

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

@@ -124,7 +124,7 @@ interface imgui_main {
             assert(g.movingWindow != null)
             assert(g.movingWindow!!.moveId == g.movingdWindowMoveId)
             if (IO.mouseDown[0]) {
-                g.movingWindow!!.rootWindow.posF plus_ IO.mouseDelta
+                g.movingWindow!!.rootWindow.posF plusAssign IO.mouseDelta
                 if (IO.mouseDelta notEqual 0f)
                     markIniSettingsDirty(g.movingWindow!!.rootWindow)
                 g.movingWindow.focus()
@@ -209,8 +209,8 @@ interface imgui_main {
                 window.fontWindowScale = newFontScale
 
                 val offset = window.size * (1.0f - scale) * (IO.mousePos - window.pos) / window.size
-                window.pos plus_ offset
-                window.posF plus_ offset
+                window.pos plusAssign offset
+                window.posF plusAssign offset
                 window.size times_ scale
                 window.sizeFull times_ scale
             } else if (!IO.keyCtrl && window.flags hasnt Wf.NoScrollWithMouse) {