🚧 up Feb 18

Author: elect86

imgui.ini

@@ -1,3 +1,8 @@
+[Window][Another Window]
+Pos=60,60
+Size=197,71
+Collapsed=0
+
 [Window][Debug##Default]
 Pos=60,60
 Size=400,400

src/main/kotlin/imgui/Context.kt

@@ -84,10 +84,6 @@ class Context(sharedFontAtlas: FontAtlas? = null) {
     /** Track the window we clicked on (in order to preserve focus).
      *  The actually window that is moved is generally MovingWindow.rootWindow.  */
     var movingWindow: Window? = null
-    /** .ini Settings   */
-    val settings = ArrayList<WindowSettings>()
-    /** Save .ini Settings on disk when time reaches zero   */
-    var settingsDirtyTimer = 0f
     /** Stack for PushStyleColor()/PopStyleColor()  */
     var colorModifiers = Stack<ColMod>()
     /** Stack for PushStyleVar()/PopStyleVar()  */
@@ -265,6 +261,15 @@ class Context(sharedFontAtlas: FontAtlas? = null) {
     var imeInProgress = false
     var imeLastKey = 0
 
+    //------------------------------------------------------------------
+    // Settings
+    //------------------------------------------------------------------
+
+    var settingsLoaded = false
+    /** Save .ini Settings on disk when time reaches zero   */
+    var settingsDirtyTimer = 0f
+    /** .ini Settings for Window  */
+    val settingsWindows = ArrayList<WindowSettings>()
 
     //------------------------------------------------------------------
     // Logging
@@ -306,6 +311,12 @@ class Context(sharedFontAtlas: FontAtlas? = null) {
         All those functions are not reliant on the current context. */
     init {
         if (gImGui == null) setCurrent()
+
+        // ~initialize(ctx)
+        assert(!g.initialized && !g.settingsLoaded)
+        g.logClipboard = StringBuilder()
+
+        g.initialized = true
     }
 
     /** This function is merely here to free heap allocations.     */
@@ -321,7 +332,8 @@ class Context(sharedFontAtlas: FontAtlas? = null) {
 
         saveIniSettingsToDisk(io.iniFilename)
 
-        for (window in g.windows) window.clear()
+        // Clear everything else
+        g.windows.forEach { it.clear() }
         g.windows.clear()
         g.windowsSortBuffer.clear()
         g.currentWindow = null
@@ -332,7 +344,7 @@ class Context(sharedFontAtlas: FontAtlas? = null) {
         g.hoveredRootWindow = null
         g.activeIdWindow = null
         g.movingWindow = null
-        g.settings.clear()
+        g.settingsWindows.clear()
         g.colorModifiers.clear()
         g.styleModifiers.clear()
         g.fontStack.clear()
@@ -433,11 +445,6 @@ class IO(sharedFontAtlas: FontAtlas?) {
     // User Functions
     //------------------------------------------------------------------
 
-    /** Rendering function, will be called in Render().
-     *  Alternatively you can keep this to NULL and call GetDrawData() after Render() to get the same pointer.
-     *  See example applications if you are unsure of how to implement this.    */
-    var renderDrawListsFn: ((DrawData) -> Unit)? = null
-
     // Optional: access OS clipboard
     // (default to use native Win32 clipboard on Windows, otherwise uses a private clipboard. Override to access OS clipboard on other architectures)
     var getClipboardTextFn: ((userData: Any) -> Unit)? = null
@@ -467,7 +474,7 @@ class IO(sharedFontAtlas: FontAtlas?) {
     val mouseDown = BooleanArray(5)
     /** Mouse wheel: 1 unit scrolls about 5 lines text. */
     var mouseWheel = 0f
-    /** Mouse wheel (Horizontal). Most users don't have a mouse with an horizontal wheel, may not be filled by all back ends.   */
+    /** Mouse wheel (Horizontal). Most users don't have a mouse with an horizontal wheel, may not be filled by all back-ends.   */
     var mouseWheelH = 0f
     /** Request ImGui to draw a mouse cursor for you (if you are on a platform without a mouse cursor). */
     var mouseDrawCursor = false

src/main/kotlin/imgui/draw.kt

@@ -1023,7 +1023,7 @@ class DrawList(sharedData: DrawListSharedData?) {
     val currentClipRect get() = if (_clipRectStack.isNotEmpty()) _clipRectStack.last()!! else _data.clipRectFullscreen
     val currentTextureId get() = if (_textureIdStack.isNotEmpty()) _textureIdStack.last()!! else null
 
-    infix fun addTo(renderList: ArrayList<DrawList>) {
+    infix fun addTo(outList: ArrayList<DrawList>) {
 
         if (cmdBuffer.empty()) return
 
@@ -1057,7 +1057,7 @@ class DrawList(sharedData: DrawListSharedData?) {
                 beginChild()/endChild() before reaching the 64K limit to split your draw commands in multiple draw lists.*/
 //        assert(_vtxCurrentIdx <= (1L shl (Int.BYTES * 8))) // Too many vertices in same Im See comment above.
 
-        renderList += this
+        outList += this
         io.metricsRenderVertices += vtxBuffer.size
         io.metricsRenderIndices += idxBuffer.size
     }

src/main/kotlin/imgui/enums.kt

@@ -396,7 +396,7 @@ enum class NavInput {
     fun isPressed(mode: InputReadMode) = getNavInputAmount(this, mode) > 0f
 }
 
-/** [BETA] Gamepad/Keyboard directional navigation options  */
+/** [BETA] Gamepad/Keyboard directional navigation flags, stored in io.NavFlags  */
 enum class NavFlags {
     /** Master keyboard navigation enable flag. ::newFrame() will automatically fill io.navInputs[] based on io.keyDown[].    */
     EnableKeyboard,
@@ -609,7 +609,7 @@ enum class MouseCursor(val i: Int) {
     /** When hovering over InputText, etc.  */
     TextInput(1),
     /** Unused  */
-    Move(2),
+    ResizeAll(2),
     /** When hovering over an horizontal border  */
     ResizeNS(3),
     /** When hovering over a vertical border or a column */

src/main/kotlin/imgui/font.kt

@@ -506,6 +506,8 @@ class FontAtlas {
 
         if (cursor <= MouseCursor.None || cursor >= MouseCursor.Count) return false
 
+        if (flags has Flags.NoMouseCursors) return false
+
         val r = customRects[customRectIds[0]]
         assert(r.id == DefaultTexData.id)
         val pos = DefaultTexData.cursorDatas[cursor.i][0] + Vec2(r.x, r.y)
@@ -526,6 +528,20 @@ class FontAtlas {
     // Members
     //-------------------------------------------
 
+    enum class Flags {
+        /** Don't round the height to next power of two */
+        NoPowerOfTwoHeight,
+        /** Don't build software mouse cursors into the atlas   */
+        NoMouseCursors;
+
+        val i = 1 shl ordinal
+    }
+
+    infix fun Int.has(flag: Flags) = and(flag.i) != 0
+    infix fun Int.hasnt(flag: Flags) = and(flag.i) == 0
+
+    /** Build flags (see ImFontAtlasFlags_) */
+    var flags = 0
     /** User data to refer to the texture once it has been uploaded to user's graphic systems. It is passed back to you
     during rendering via the DrawCmd structure.   */
     var texId = -1
@@ -608,7 +624,7 @@ class FontAtlas {
         // Start packing
         val maxTexHeight = 1024 * 32
         val spc = STBTTPackContext.create()
-        if(!stbtt_PackBegin(spc, null, texSize.x, maxTexHeight, 0, texGlyphPadding, MemoryUtil.NULL))
+        if (!stbtt_PackBegin(spc, null, texSize.x, maxTexHeight, 0, texGlyphPadding, MemoryUtil.NULL))
             return false
 
         /*  Pack our extra data rectangles first, so it will be on the upper-left corner of our texture (UV will have
@@ -698,7 +714,7 @@ class FontAtlas {
         assert(bufRangesN == totalRangesCount)
 
         // Create texture
-        texSize.y = texSize.y.upperPowerOfTwo
+        texSize.y = if (flags has Flags.NoPowerOfTwoHeight) texSize.y + 1 else texSize.y.upperPowerOfTwo
         texUvScale = 1f / Vec2(texSize)
         texPixelsAlpha8 = bufferBig(texSize.x * texSize.y)
         spc.pixels = texPixelsAlpha8!!
@@ -768,8 +784,11 @@ class FontAtlas {
     }
 
     fun buildRegisterDefaultCustomRects() {
-        if (customRectIds[0] < 0)
-            customRectIds[0] = addCustomRectRegular(DefaultTexData.id, DefaultTexData.wHalf * 2 + 1, DefaultTexData.h)
+        if (customRectIds[0] >= 0) return
+        customRectIds[0] = when {
+            flags hasnt Flags.NoMouseCursors -> addCustomRectRegular(DefaultTexData.id, DefaultTexData.wHalf * 2 + 1, DefaultTexData.h)
+            else -> addCustomRectRegular(DefaultTexData.id, 2, 2)
+        }
     }
 
     fun buildSetupFont(font: Font, fontConfig: FontConfig, ascent: Float, descent: Float) {
@@ -828,21 +847,34 @@ class FontAtlas {
 
     fun buildRenderDefaultTexData() {
 
+        assert(customRectIds[0] >= 0 && texPixelsAlpha8 != null)
         val r = customRects[customRectIds[0]]
-        assert(r.width == DefaultTexData.wHalf * 2 + 1 && r.height == DefaultTexData.h)
-        assert(r.isPacked && texPixelsAlpha8 != null)
-
-        // Render/copy pixels
-        var n = 0
-        for (y in 0 until DefaultTexData.h)
-            for (x in 0 until DefaultTexData.wHalf) {
-                val offset0 = r.x + x + (r.y + y) * texSize.x
-                val offset1 = offset0 + DefaultTexData.wHalf + 1
-                texPixelsAlpha8!![offset0] = if (DefaultTexData.pixels[n] == '.') 0xFF.b else 0x00.b
-                texPixelsAlpha8!![offset1] = if (DefaultTexData.pixels[n] == 'X') 0xFF.b else 0x00.b
-                n++
+        assert(r.id == DefaultTexData.id && r.isPacked)
+
+        val w = texSize.x
+        if (flags hasnt Flags.NoMouseCursors) {
+            // Render/copy pixels
+            assert(r.width == DefaultTexData.wHalf * 2 + 1 && r.height == DefaultTexData.h)
+            var n = 0
+            for (y in 0 until DefaultTexData.h)
+                for (x in 0 until DefaultTexData.wHalf) {
+                    val offset0 = r.x + x + (r.y + y) * w
+                    val offset1 = offset0 + DefaultTexData.wHalf + 1
+                    texPixelsAlpha8!![offset0] = if (DefaultTexData.pixels[n] == '.') 0xFF.b else 0x00.b
+                    texPixelsAlpha8!![offset1] = if (DefaultTexData.pixels[n] == 'X') 0xFF.b else 0x00.b
+                    n++
+                }
+        } else {
+            assert(r.width == 2 && r.height == 2)
+            val offset = r.x.i + r.y.i * w
+            with(texPixelsAlpha8!!) {
+                put(offset + w + 1, 0xFF.b)
+                put(offset + w, 0xFF.b)
+                put(offset + 1, 0xFF.b)
+                put(offset, 0xFF.b)
             }
-        texUvWhitePixel = (r.x + 0.5f) * texUvScale
+        }
+        texUvWhitePixel = (Vec2(r.x, r.y) + 0.5f) * texUvScale
     }
 
     fun buildMultiplyCalcLookupTable(inBrightenFactor: Float) = CharArray(256, {

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

@@ -104,15 +104,6 @@ interface imgui_internal {
 
     fun findWindowByName(name: String) = g.windowsById[hash(name, 0)]
 
-    fun initialize() {
-
-        g.logClipboard = StringBuilder()
-
-        assert(g.settings.isEmpty())
-        loadIniSettingsFromDisk(io.iniFilename)
-        g.initialized = true
-    }
-
     fun markIniSettingsDirty() {
         if (g.settingsDirtyTimer <= 0f) g.settingsDirtyTimer = io.iniSavingRate
     }
@@ -2772,13 +2763,14 @@ interface imgui_internal {
             }
 
             val tStep = 1f / resW
+            val invScale = if(scaleMin == scaleMax) 0f else 1f / (scaleMax - scaleMin)
 
             val v0 = data[(0 + valuesOffset) % valuesCount]
             var t0 = 0f
             // Point in the normalized space of our target rectangle
-            val tp0 = Vec2(t0, 1f - saturate((v0 - scaleMin) / (scaleMax - scaleMin)))
+            val tp0 = Vec2(t0, 1f - saturate((v0 - scaleMin) * invScale))
             // Where does the zero line stands
-            val histogramZeroLineT = if (scaleMin * scaleMax < 0f) -scaleMin / (scaleMax - scaleMin) else if (scaleMin < 0f) 0f else 1f
+            val histogramZeroLineT = if (scaleMin * scaleMax < 0f) -scaleMin * invScale else if (scaleMin < 0f) 0f else 1f
 
             val colBase = (if (plotType == PlotType.Lines) Col.PlotLines else Col.PlotHistogram).u32
             val colHovered = (if (plotType == PlotType.Lines) Col.PlotLinesHovered else Col.PlotHistogramHovered).u32
@@ -2788,7 +2780,7 @@ interface imgui_internal {
                 val v1Idx = (t0 * itemCount + 0.5f).i
                 assert(v1Idx in 0 until valuesCount)
                 val v1 = data[(v1Idx + valuesOffset + 1) % valuesCount]
-                val tp1 = Vec2(t1, 1f - saturate((v1 - scaleMin) / (scaleMax - scaleMin)))
+                val tp1 = Vec2(t1, 1f - saturate((v1 - scaleMin) * invScale))
 
                 // NB: Draw calls are merged together by the DrawList system. Still, we should render our batch are lower level to save a bit of CPU.
                 val pos0 = innerBb.min.lerp(innerBb.max, tp0)

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

@@ -13,7 +13,6 @@ import imgui.ImGui.clearDragDrop
 import imgui.ImGui.closePopupsOverWindow
 import imgui.ImGui.end
 import imgui.ImGui.getNavInputAmount2d
-import imgui.ImGui.initialize
 import imgui.ImGui.io
 import imgui.ImGui.isMousePosValid
 import imgui.ImGui.keepAliveId
@@ -37,23 +36,14 @@ interface imgui_main {
         get() = gImGui?.style
                 ?: throw Error("No current context. Did you call ImGui::Context() or ImGui::setCurrentContext()?")
 
-//    val style
-//        get() = g.style
-//        set(value) {
-//            g.style = value
-//        }
-
-    /** Same value as passed to your ::renderDrawListsFn() function. Valid after ::render() and
-     *  until the next call to ::newFrame()   */
-    val drawData get() = g.drawData.takeIf { it.valid }
-
     /** start a new ImGui frame, you can submit any command from this point until NewFrame()/Render().  */
     fun newFrame() {
 
         ptrIndices = 0
 
         /* (We pass an error message in the assert expression as a trick to get it visible to programmers who are not 
             using a debugger, as most assert handlers display their argument)         */
+        assert(g.initialized)
         assert(io.deltaTime >= 0f) { "Need a positive deltaTime (zero is tolerated but will cause some timing issues)" }
         assert(io.displaySize greaterThanEqual 0) { "Invalid displaySize value" }
         assert(io.fonts.fonts.size > 0) { "Font Atlas not built. Did you call io.Fonts->GetTexDataAsRGBA32() / GetTexDataAsAlpha8() ?" }
@@ -69,8 +59,12 @@ interface imgui_main {
         if (io.navFlags has NavFlags.EnableKeyboard)
             assert(io.keyMap[Key.Space] != -1) { "ImGuiKey_Space is not mapped, required for keyboard navigation." }
 
-        // Initialize on first frame
-        if (!g.initialized) initialize()
+        // Load settings on first frame
+        if (!g.settingsLoaded) {
+            assert(g.settingsWindows.isEmpty())
+            loadIniSettingsFromDisk(io.iniFilename)
+            g.settingsLoaded = true
+        }
 
         g.time += io.deltaTime
         g.frameCount += 1
@@ -186,7 +180,7 @@ interface imgui_main {
                 is lagging as this point.
             - We also support the moved window toggling the NoInputs flag after moving has started in order to be able to detect
                 windows below it, which is useful for e.g. docking mechanisms.  */
-        g.hoveredWindow = if (g.movingWindow?.flags?.hasnt(Wf.NoInputs) == true) g.movingWindow else findHoveredWindow(io.mousePos)
+        g.hoveredWindow = if (g.movingWindow?.flags?.hasnt(Wf.NoInputs) == true) g.movingWindow else findHoveredWindow()
         g.hoveredRootWindow = g.hoveredWindow?.rootWindow
 
         val modalWindow = frontMostModalRootWindow
@@ -315,7 +309,8 @@ interface imgui_main {
     }
 
 
-    /** ends the ImGui frame, finalize rendering data, then call your io.RenderDrawListsFn() function if set.   */
+    /** Ends the ImGui frame, finalize the draw data. (Obsolete: optionally call io.renderDrawListsFn if set.
+     *  Nowadays, prefer calling your render function yourself.)   */
     fun render() {
 
         assert(g.initialized)   // Forgot to call ImGui::NewFrame()
@@ -365,13 +360,13 @@ interface imgui_main {
             setupDrawData(g.drawDataBuilder.layers[0], g.drawData)
             io.metricsRenderVertices = g.drawData.totalVtxCount
             io.metricsRenderIndices = g.drawData.totalIdxCount
-
-            // Render. If user hasn't set a callback then they may retrieve the draw data via GetDrawData()
-            if (g.drawData.cmdListsCount > 0 && io.renderDrawListsFn != null)
-                io.renderDrawListsFn!!(g.drawData)
         }
     }
 
+    /** Same value as passed to the old io.renderDrawListsFn function. Valid after ::render() and until the next call to
+     *  ::newFrame()   */
+    val drawData get() = g.drawData.takeIf { it.valid }
+
     /** Ends the ImGui frame. Automatically called by Render()! you most likely don't need to ever call that yourself
      *  directly. If you don't need to render you can call EndFrame() but you'll have wasted CPU already. If you don't
      *  need to render, don't create any windows instead!