Skip to content

Commit 787f86c

Browse files
elect86elect86
committed
1.67 beta 0
1 parent f8ea69b commit 787f86c

39 files changed

+227
-264
lines changed

‎src/main/kotlin/imgui/Ref.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package imgui
22

3-
import kotlin.reflect.KMutableProperty0
4-
53
object Ref {
64

75
// var i0 = 0

‎src/main/kotlin/imgui/draw.kt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ class DrawList(sharedData: DrawListSharedData?) {
510510
var dmX = (temp[i1].x + temp[i2].x) * 0.5f
511511
var dmY = (temp[i1].y + temp[i2].y) * 0.5f
512512
// IM_NORMALIZE2F_OVER_EPSILON_CLAMP(dmX, dmY, 0.000001f, 100.0f)
513-
val d2 = dmX*dmX + dmY*dmY
513+
val d2 = dmX * dmX + dmY * dmY
514514
if (d2 > 0.000001f) {
515515
var invLen = 1f / sqrt(d2)
516516
if (invLen > 100f) invLen = 100f
@@ -523,15 +523,15 @@ class DrawList(sharedData: DrawListSharedData?) {
523523
val dmInY = dmY * halfInnerThickness
524524

525525
// Add temporary vertexes
526-
val outVtxIdx = tempPointsIdx + i2*4
527-
temp[outVtxIdx+0].x = points[i2].x + dmOutX
528-
temp[outVtxIdx+0].y = points[i2].y + dmOutY
529-
temp[outVtxIdx+1].x = points[i2].x + dmInX
530-
temp[outVtxIdx+1].y = points[i2].y + dmInY
531-
temp[outVtxIdx+2].x = points[i2].x - dmInX
532-
temp[outVtxIdx+2].y = points[i2].y - dmInY
533-
temp[outVtxIdx+3].x = points[i2].x - dmOutX
534-
temp[outVtxIdx+3].y = points[i2].y - dmOutY
526+
val outVtxIdx = tempPointsIdx + i2 * 4
527+
temp[outVtxIdx + 0].x = points[i2].x + dmOutX
528+
temp[outVtxIdx + 0].y = points[i2].y + dmOutY
529+
temp[outVtxIdx + 1].x = points[i2].x + dmInX
530+
temp[outVtxIdx + 1].y = points[i2].y + dmInY
531+
temp[outVtxIdx + 2].x = points[i2].x - dmInX
532+
temp[outVtxIdx + 2].y = points[i2].y - dmInY
533+
temp[outVtxIdx + 3].x = points[i2].x - dmOutX
534+
temp[outVtxIdx + 3].y = points[i2].y - dmOutY
535535

536536
// Add indexes
537537
idxBuffer[_idxWritePtr + 0] = idx2 + 1
@@ -589,7 +589,7 @@ class DrawList(sharedData: DrawListSharedData?) {
589589
var dX = p2.x - p1.x
590590
var dY = p2.y - p1.y
591591
// IM_NORMALIZE2F_OVER_ZERO(dX, dY)
592-
val d2 = dX*dX + dY*dY
592+
val d2 = dX * dX + dY * dY
593593
if (d2 > 0f) {
594594
val invLen = 1f / sqrt(d2)
595595
dX *= invLen
@@ -666,7 +666,7 @@ class DrawList(sharedData: DrawListSharedData?) {
666666
var dX = p1.x - p0.x
667667
var dY = p1.y - p0.y
668668
// IM_NORMALIZE2F_OVER_ZERO(dx, dy)
669-
val d2 = dX*dX + dY*dY
669+
val d2 = dX * dX + dY * dY
670670
if (d2 > 0f) {
671671
val invLen = 1f / sqrt(d2)
672672
dX *= invLen
@@ -686,8 +686,8 @@ class DrawList(sharedData: DrawListSharedData?) {
686686
var dmX = (n0.x + n1.x) * 0.5f
687687
var dmY = (n0.y + n1.y) * 0.5f
688688
// IM_NORMALIZE2F_OVER_EPSILON_CLAMP(dmX, dmY, 0.000001f, 100.0f)
689-
val d2 = dmX*dmX + dmY*dmY
690-
if (d2 > 0.000001f) {
689+
val d2 = dmX * dmX + dmY * dmY
690+
if (d2 > 0.000001f) {
691691
var invLen = 1f / sqrt(d2)
692692
if (invLen > 100f)
693693
invLen = 100f

‎src/main/kotlin/imgui/enums.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ enum class TabBarFlag(@JvmField val i: Int) {
266266
NoTabListPopupButton(1 shl 3),
267267
NoTabListScrollingButtons(1 shl 4),
268268
/** Disable tooltips when hovering a tab */
269-
NoTooltip (1 shl 5),
269+
NoTooltip(1 shl 5),
270270
/** Resize tabs when they don't fit */
271271
FittingPolicyResizeDown(1 shl 6),
272272
/** Add scroll buttons when tabs don't fit */

‎src/main/kotlin/imgui/font.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ package imgui
44
import gli_.has
55
import glm_.*
66
import glm_.vec2.Vec2
7-
import glm_.vec2.operators.times
8-
import glm_.vec2.operators.div
97
import glm_.vec2.Vec2i
8+
import glm_.vec2.operators.div
9+
import glm_.vec2.operators.times
1010
import glm_.vec4.Vec4
1111
import imgui.ImGui.io
1212
import imgui.ImGui.style
@@ -21,8 +21,6 @@ import uno.convert.decode85
2121
import uno.stb.stb
2222
import unsigned.toULong
2323
import java.nio.ByteBuffer
24-
import java.util.*
25-
import kotlin.collections.ArrayList
2624
import kotlin.math.floor
2725
import kotlin.math.sqrt
2826

‎src/main/kotlin/imgui/functionalProgramming.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package imgui
33
import glm_.f
44
import glm_.vec2.Vec2
55
import glm_.vec4.Vec4
6-
import imgui.ImGui.begin_
76
import imgui.ImGui.beginChild
87
import imgui.ImGui.beginGroup
98
import imgui.ImGui.beginMainMenuBar
@@ -14,6 +13,7 @@ import imgui.ImGui.beginPopupContextItem
1413
import imgui.ImGui.beginPopupContextWindow
1514
import imgui.ImGui.beginPopupModal
1615
import imgui.ImGui.beginTooltip
16+
import imgui.ImGui.begin_
1717
import imgui.ImGui.collapsingHeader
1818
import imgui.ImGui.combo
1919
import imgui.ImGui.end

‎src/main/kotlin/imgui/helpers.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package imgui
33
import glm_.bool
44
import glm_.glm
55
import glm_.i
6-
import glm_.vec2.Vec2
76
import glm_.vec4.Vec4
87
import imgui.ImGui.calcListClipping
98
import imgui.ImGui.colorConvertHSVtoRGB
@@ -14,9 +13,6 @@ import imgui.ImGui.inputText
1413
import imgui.ImGui.popItemWidth
1514
import imgui.ImGui.pushItemWidth
1615
import imgui.ImGui.style
17-
import imgui.internal.strlen
18-
import java.nio.ByteBuffer
19-
import kotlin.math.max
2016

2117
/** Helper: Execute a block of code at maximum once a frame. Convenient if you want to quickly create an UI within
2218
* deep-nested code that runs multiple times every frame.

‎src/main/kotlin/imgui/imgui/clipping.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package imgui.imgui
22

33
import glm_.vec2.Vec2
44
import imgui.ImGui.currentWindow
5-
import org.w3c.dom.css.Rect
65

76
interface imgui_clipping {
87

‎src/main/kotlin/imgui/imgui/colums.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import imgui.ImGui.popClipRect
1313
import imgui.ImGui.popId
1414
import imgui.ImGui.popItemWidth
1515
import imgui.ImGui.pushColumnClipRect
16-
import imgui.ImGui.pushId
1716
import imgui.ImGui.pushItemWidth
1817
import imgui.ImGui.style
1918
import imgui.internal.*

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@ import imgui.ImGui.itemAdd
88
import imgui.ImGui.itemSize
99
import imgui.ImGui.style
1010
import imgui.g
11-
import imgui.internal.*
11+
import imgui.internal.GroupData
12+
import imgui.internal.Rect
1213
import imgui.internal.LayoutType as Lt
1314
import imgui.internal.SeparatorFlag as Sf
1415

1516
interface imgui_cursorLayout {
1617

1718

18-
1919
/** Call between widgets or groups to layout them horizontally. X position given in window coordinates.
2020
* Gets back to previous line and continue with horizontal layout
2121
* localPosX == 0 : follow right after previous item
2222
* localPosX != 0 : align to specified x position (relative to window/group left)
2323
* spacingW < 0 : use default spacing if localPosX == 0, no spacing if localPosX != 0
2424
* spacingW >= 0 : enforce spacing amount */
2525
fun sameLine(localPosX: Int, spacingW: Int = 1) = sameLine(localPosX.f, spacingW.f)
26+
2627
fun sameLine(localPosX: Float = 0f, spacingW: Float = -1f) {
2728

2829
val window = currentWindow

‎src/main/kotlin/imgui/imgui/demo debug informations.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ interface imgui_demoDebugInformations {
111111
/** create about window. display Dear ImGui version, credits and build/system information. */
112112
fun showAboutWindow(open: KMutableProperty0<Boolean>) {
113113

114-
if(!begin_("About Dear ImGui", open, Wf.AlwaysAutoResize.i)) {
114+
if (!begin_("About Dear ImGui", open, Wf.AlwaysAutoResize.i)) {
115115
end()
116116
return
117117
}

0 commit comments

Comments
 (0)