🚧 up to Mar 22

increased available id to 1024

Author: elect86

imgui.ini

@@ -1,10 +1,10 @@
-[Window][ImGui Demo]
-Pos=650,20
-Size=550,680
-Collapsed=0
-
 [Window][Debug##Default]
 Pos=60,60
 Size=400,400
 Collapsed=0
 
+[Window][ImGui Demo]
+Pos=650,20
+Size=550,680
+Collapsed=0
+

src/main/kotlin/imgui/Ref.kt

@@ -42,7 +42,7 @@ object Ref {
     var bPtr = 0
     var cPtr = 0
 
-    val size = 500
+    val size = 1024
 
     val ints = IntArray(size)
     val floats = FloatArray(size)

src/main/kotlin/imgui/TextEditState.kt

@@ -76,7 +76,7 @@ class TextEditState {
     fun getChar(idx: Int) = text[idx]
     fun getWidth(lineStartIdx: Int, charIdx: Int): Float {
         val c = text[lineStartIdx + charIdx]
-        return if (c == '\n') -1f else g.font.getCharAdvance_s(c) * (g.fontSize / g.font.fontSize)
+        return if (c == '\n') -1f else g.font.getCharAdvance_ssaaaaaaa(c) * (g.fontSize / g.font.fontSize)
     }
 
     fun keyToText(key: Int) = if (key >= 0x10000) 0 else key

src/main/kotlin/imgui/font.kt

@@ -1053,7 +1053,7 @@ class Font {
     fun findGlyphNoFallback(c: Int) = indexLookup.getOrNull(c)?.let { glyphs[it] }
 
     //    IMGUI_API void              SetFallbackChar(ImWchar c);
-    fun getCharAdvance_s(c: Char) = if (c < indexAdvanceX.size) indexAdvanceX[c.i] else fallbackAdvanceX
+    fun getCharAdvance_ssaaaaaaa(c: Char) = if (c < indexAdvanceX.size) indexAdvanceX[c.i] else fallbackAdvanceX
 
     val isLoaded get() = ::containerAtlas.isInitialized
 

src/main/kotlin/imgui/imgui/demo/widgets.kt

@@ -41,6 +41,7 @@ import imgui.ImGui.fontSize
 import imgui.ImGui.image
 import imgui.ImGui.imageButton
 import imgui.ImGui.indent
+import imgui.ImGui.inputDouble
 import imgui.ImGui.inputFloat
 import imgui.ImGui.inputFloat2
 import imgui.ImGui.inputFloat3
@@ -132,6 +133,7 @@ object widgets {
     var str0 = "Hello, world!".toCharArray()
     var i0 = 123
     var f0 = 0.001f
+    var d0 = 999999.000001
     val vec4a = floatArrayOf(0.1f, 0.2f, 0.3f, 0.44f)
     var i1 = 50
     var i2 = 42
@@ -317,6 +319,10 @@ object widgets {
 
                     inputFloat("input float", ::f0, 0.01f, 1f)
 
+                    // NB: You can use the %e notation as well.
+                    inputDouble("input double", ::d0, 0.01, 1.0, "%.6f")
+                    sameLine(); showHelpMarker("You can input value using the scientific notation,\n  e.g. \"1e+8\" becomes \"100000000\".\n")
+
                     inputFloat3("input float3", vec4a)
                 }
                 run {

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

@@ -1720,14 +1720,14 @@ interface imgui_internal {
 
     fun inputTextEx(label: String, buf: CharArray, sizeArg: Vec2, flags: InputTextFlags
             /*, ImGuiTextEditCallback callback = NULL, void* user_data = NULL*/): Boolean {
-        println(label)
+
         val window = currentWindow
         if (window.skipItems) return false
 
         // Can't use both together (they both use up/down keys)
-        assert((flags has Itf.CallbackHistory) xor (flags has Itf.Multiline))
+        assert(!((flags has Itf.CallbackHistory) && (flags has Itf.Multiline)))
         // Can't use both together (they both use tab key)
-        assert((flags has Itf.CallbackCompletion) xor (flags has Itf.AllowTabInput))
+        assert(!((flags has Itf.CallbackCompletion) && (flags has Itf.AllowTabInput)))
 
         val isMultiline = flags has Itf.Multiline
         val isEditable = flags hasnt Itf.ReadOnly
@@ -2269,7 +2269,7 @@ interface imgui_internal {
                             inputTextCalcTextSizeW(text, p, textSelectedEnd, it, stopOnNewLine = true).also { p = it() }
                         }
                         // So we can see selected empty lines
-                        if (rectSize.x <= 0f) rectSize.x = (g.font.getCharAdvance_s(' ') * 0.5f).i.f
+                        if (rectSize.x <= 0f) rectSize.x = (g.font.getCharAdvance_ssaaaaaaa(' ') * 0.5f).i.f
                         val rect = Rect(rectPos + Vec2(0f, bgOffYUp - g.fontSize), rectPos + Vec2(rectSize.x, bgOffYDn))
                         val clipRect_ = Rect(clipRect)
                         rect.clipWith(clipRect_)

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

@@ -437,7 +437,7 @@ interface imgui_main {
             if (!it.active || it.flags hasnt Wf.ChildWindow)  // if a child is active its parent will add it
                 it.addToSortedBuffer()
         }
-        assert(g.windows.size == g.windowsSortBuffer.size)  // we done something wrong
+//        TODO assert(g.windows.size == g.windowsSortBuffer.size)  // we done something wrong
         g.windows.clear()
         g.windows.addAll(g.windowsSortBuffer)
 

src/main/kotlin/imgui/imgui/widgets inputKeyboard.kt

@@ -47,21 +47,21 @@ interface imgui_widgetsInputKeyboard {
 
     fun inputFloat(label: String, v: KMutableProperty0<Float>, step: Float = 0f, stepFast: Float = 0f,
                    decimalPrecision: Int = -1, extraFlags: InputTextFlags = 0): Boolean {
+        val flags = extraFlags or Itf.CharsScientific
         /*  Ideally we'd have a minimum decimal precision of 1 to visually denote that this is a float,
             while hiding non-significant digits? %f doesn't have a minimum of 1         */
         val fmt = "%${if (decimalPrecision < 0) "" else ".$decimalPrecision"}f"
         return inputScalarEx(label, DataType.Float, v as KMutableProperty0<Number>, step.takeIf { it > 0f },
-                stepFast.takeIf { it > 0f }, fmt, extraFlags)
+                stepFast.takeIf { it > 0f }, fmt, flags)
     }
 
     fun inputDouble(label: String, v: KMutableProperty0<Double>, step: Double = 0.0, stepFast: Double = 0.0,
-                    decimalPrecision: Int = -1, extraFlags: InputTextFlags = 0): Boolean {
-
+                    dispalyFormat: String = "%.6f", extraFlags: InputTextFlags = 0): Boolean {
+        val flags = extraFlags or Itf.CharsScientific
         /*  Ideally we'd have a minimum decimal precision of 1 to visually denote that this is a float,
             while hiding non-significant digits? %f doesn't have a minimum of 1         */
-        val fmt = "%${if (decimalPrecision < 0) "" else ".$decimalPrecision"}f"
-        return inputScalarEx(label, DataType.Float, v as KMutableProperty0<Number>, step.takeIf { it > 0.0 },
-                stepFast.takeIf { it > 0.0 }, fmt, extraFlags)
+        return inputScalarEx(label, DataType.Double, v as KMutableProperty0<Number>, step.takeIf { it > 0.0 },
+                stepFast.takeIf { it > 0.0 }, dispalyFormat, flags)
     }
 
     fun inputFloat2(label: String, v: FloatArray, decimalPrecision: Int = -1, extraFlags: InputTextFlags = 0) =

src/main/kotlin/imgui/static funcs.kt

@@ -352,9 +352,6 @@ fun inputTextFilterCharacter(char: KMutableProperty0<Char>, flags: InputTextFlag
     /*  Filter private Unicode range. I don't imagine anybody would want to input them. GLFW on OSX seems to send
         private characters for special keys like arrow keys.     */
     if (c >= 0xE000 && c <= 0xF8FF) return false
-
-    println(char())
-
     if (flags has (Itf.CharsDecimal or Itf.CharsHexadecimal or Itf.CharsUppercase or Itf.CharsNoBlank or Itf.CharsScientific)) {
 
         if (flags has Itf.CharsDecimal)
@@ -431,8 +428,8 @@ fun inputTextCalcTextSizeW(text: CharArray, textBegin: Int, textEnd: Int, remain
             continue
         }
         if (c == '\r') continue
-
-        val charWidth: Float = font.getCharAdvance_s(c) * scale
+        // renaming ::getCharAdvance continuously every build because of bug, https://youtrack.jetbrains.com/issue/KT-19612
+        val charWidth: Float = font.getCharAdvance_ssaaaaaaa(c) * scale
         lineWidth += charWidth
     }
 
@@ -466,8 +463,8 @@ fun inputTextCalcTextSizeW(text: CharArray, textBegin: Int, textEnd: Int, remain
 fun KMutableProperty0<Number>.format(dataType: DataType, displayFormat: String, buf: CharArray): CharArray {
     val value: Number = when (dataType) {
         DataType.Int -> this()
-        DataType.Float -> Float.fromBits(this() as Int)
-        DataType.Double -> Double.fromBits(this() as Long)
+        DataType.Float -> this() as Float
+        DataType.Double -> this() as Double
         else -> throw Error()
     }
     return displayFormat.format(style.locale, value).toCharArray(buf)
@@ -589,7 +586,7 @@ fun dataTypeApplyOpFromText(buf: CharArray, initialValueBuf: CharArray, dataType
             DataType.Float -> {
                 // For floats we have to ignore format with precision (e.g. "%.2f") because sscanf doesn't take them in TODO not true in java
 //                val scalarFormat = scalarFormat ?: "%f"
-                var v = glm.intBitsToFloat(data() as Int)
+                var v = data() as Float
                 val oldV = v
                 var a = 0f
                 try {
@@ -612,13 +609,13 @@ fun dataTypeApplyOpFromText(buf: CharArray, initialValueBuf: CharArray, dataType
                     }
                     else -> a   // Assign constant
                 }
-                data.set(glm.floatBitsToInt(v))
+                data.set(v)
                 oldV != v
             }
             DataType.Double -> {
                 // For floats we have to ignore format with precision (e.g. "%.2f") because sscanf doesn't take them in TODO not true in java
 //                val scalarFormat = scalarFormat ?: "%f"
-                var v = Double.fromBits(data() as Long)
+                var v = data() as Double
                 val oldV = v
                 var a = 0.0
                 try {
@@ -641,7 +638,7 @@ fun dataTypeApplyOpFromText(buf: CharArray, initialValueBuf: CharArray, dataType
                     }
                     else -> a   // Assign constant
                 }
-                data.set(glm.doubleBitsToLong(v))
+                data.set(v)
                 oldV != v
             }
             else -> false