comfirm ImGui / CImGui 1.91.8

dinau · Feb 7, 2025 · f1f0e2b · f1f0e2b
1 parent 0784b03
commit f1f0e2b
Show file tree

Hide file tree

Showing 41 changed files with 439 additions and 98 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -1,4 +1,4 @@
-name: Linux OS(Ubuntu) Nim 2.2.0 compilation
+name: Linux OS(Ubuntu) Nim 2.2.2 compilation
 
 on:
   push:
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: jiro4989/setup-nim-action@v2
         with:
-          nim-version: '2.2.0'
+          nim-version: '2.2.2'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - run: |
           sudo apt install xorg-dev libopengl-dev libgl1-mesa-dev

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -1,4 +1,4 @@
-name: Windows OS Nim 2.2.0 compilation
+name: Windows OS Nim 2.2.2 compilation
 
 on:
   push:
@@ -15,6 +15,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: jiro4989/setup-nim-action@v2
         with:
-          nim-version: '2.2.0'
+          nim-version: '2.2.2'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - run: nimble all
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@
 
 ![alt](https://github.com/dinau/imguin_examples/actions/workflows/windows.yml/badge.svg)  ![alt](https://github.com/dinau/imguin_examples/actions/workflows/linux.yml/badge.svg)
 
-Confirmed ImGui**n** verion: : **v1.91.6.15** (2025/01)
+Confirmed ImGui**n** verion: : **v1.91.8.0** (2025/02)
 
 This project is example project to use ImGui, ImPlot, futhark and so on with Nim language.  
 Wrapper libraies used are here [ImGuin](https://github.com/dinau/imguin)
@@ -593,14 +593,14 @@ GCC: v14.2.0, Clang: v18.1.8, MSVC: 2022
 ---
 
 Windows11 (main)
-- **Nim Compiler Version 2.2.0**
+- **Nim Compiler Version 2.2.2**
 - **GCC (Rev1, Built by MSYS2 project) 14.2.0**
 
    ```sh
    pacman -S mingw-w64-ucrt-x86_64-gcc
    ```
 
-- Clang version 19.1.6
+- Clang version 19.1.7
 
    ```sh
    pacman -S mingw-w64-ucrt-x86_64-clang

diff --git a/config.nims.common b/config.nims.common
@@ -1,4 +1,4 @@
-switch "path","../../imguin/src"
+#switch "path","../../imguin/src"
 switch "hint","User:off"
 switch "hint","Name:off"
 switch "hint","XDeclaredButNotUsed:off"

diff --git a/config.nims.end b/config.nims.end
@@ -55,6 +55,6 @@ case TC
 when LTO: # These options let link time slow while reducing code size.
   switch "define", "lto"
 
-echo ""
+#echo ""
 echo "#### [ ", TC, " ] Compiler ####"
-echo ""
+#echo ""
diff --git a/glfw_opengl3/Makefile b/glfw_opengl3/Makefile
@@ -1,20 +1,3 @@
-TARGET = $(notdir $(CURDIR))
-NIMCACHE = .nimcache
 
-ifeq ($(OS),Windows_NT)
-	EXE = .exe
-else
-	OPT += --passL:-lstdc++
-endif
+include ../makefile.common.mk
 
-all:
-	nim c -d:strip --nimcache:$(NIMCACHE) $(TARGET).nim
-
-.PHONY: clean run
-
-run: all
-	./$(TARGET)$(EXE)
-
-clean:
-	@-rm $(TARGET)$(EXE)
-	@-rm -fr $(NIMCACHE)
diff --git a/glfw_opengl3_base/glfw_opengl3_base.ini b/glfw_opengl3_base/glfw_opengl3_base.ini
@@ -1,11 +1,11 @@
 [Window]
-startupPosX=282
-startupPosY=85
-viewportWidth=1024
-viewportHeigth=800
+startupPosX=314
+startupPosY=108
+viewportWidth=1010
+viewportHeigth=824
 colBGx=0.25
-colBGy=0.6499999761581421
-colBGz=0.8500000238418579
+colBGy=0.65
+colBGz=0.85
 colBGw=1.0
 theme=2
 [Image]

diff --git a/glfw_opengl3_base/imgui.ini b/glfw_opengl3_base/imgui.ini
@@ -10,7 +10,7 @@ Collapsed=0
 
 [Window][Nim: Dear ImGui test with Futhark]
 Pos=12,12
-Size=417,572
+Size=417,567
 Collapsed=0
 
 [Window][imgui Another Window]

diff --git a/glfw_opengl3_filedialog/glfw_opengl3_filedialog.ini b/glfw_opengl3_filedialog/glfw_opengl3_filedialog.ini
@@ -4,8 +4,8 @@ startupPosY=136
 viewportWidth=1024
 viewportHeigth=800
 colBGx=0.25
-colBGy=0.6499999761581421
-colBGz=0.8500000238418579
+colBGy=0.65
+colBGz=0.85
 colBGw=1.0
 theme=2
 [Image]

diff --git a/glfw_opengl3_filedialog/imgui.ini b/glfw_opengl3_filedialog/imgui.ini
@@ -352,3 +352,15 @@ Column 0  Sort=0v
 RefScale=19
 Column 0  Sort=0v
 
+[Table][0x518A3246,4]
+RefScale=19
+Column 0  Sort=0v
+
+[Table][0xCD804044,4]
+RefScale=19
+Column 0  Sort=0v
+
+[Table][0x63C83335,4]
+RefScale=19
+Column 0  Sort=0v
+
diff --git a/glfw_opengl3_iconfont_viewer/glfw_opengl3_iconfont_viewer.ini b/glfw_opengl3_iconfont_viewer/glfw_opengl3_iconfont_viewer.ini
@@ -1,11 +1,11 @@
 [Window]
 startupPosX=273
 startupPosY=80
-viewportWidth=996
+viewportWidth=997
 viewportHeigth=859
 colBGx=0.25
-colBGy=0.6499999761581421
-colBGz=0.8500000238418579
+colBGy=0.65
+colBGz=0.85
 colBGw=1.0
 theme=2
 [Image]

diff --git a/glfw_opengl3_image_load/glfw_opengl3_image_load.ini b/glfw_opengl3_image_load/glfw_opengl3_image_load.ini
@@ -1,11 +1,11 @@
 [Window]
-startupPosX=361
-startupPosY=94
+startupPosX=341
+startupPosY=73
 viewportWidth=1024
 viewportHeigth=900
 colBGx=0.25
-colBGy=0.6499999761581421
-colBGz=0.8500000238418579
+colBGy=0.65
+colBGz=0.85
 colBGw=1.0
 theme=2
 [Image]

diff --git a/glfw_opengl3_image_save/glfw_opengl3_image_save.ini b/glfw_opengl3_image_save/glfw_opengl3_image_save.ini
@@ -4,8 +4,8 @@ startupPosY=85
 viewportWidth=1024
 viewportHeigth=900
 colBGx=0.25
-colBGy=0.6499999761581421
-colBGz=0.8500000238418579
+colBGy=0.65
+colBGz=0.85
 colBGw=1.0
 theme=2
 [Image]

diff --git a/glfw_opengl3_imgui_toggle/glfw_opengl3_imgui_toggle.ini b/glfw_opengl3_imgui_toggle/glfw_opengl3_imgui_toggle.ini
@@ -2,10 +2,10 @@
 startupPosX=74
 startupPosY=61
 viewportWidth=1512
-viewportHeigth=900
+viewportHeigth=950
 colBGx=0.25
-colBGy=0.6499999761581421
-colBGz=0.8500000238418579
+colBGy=0.65
+colBGz=0.85
 colBGw=1.0
 theme=2
 [Image]

diff --git a/glfw_opengl3_imguizmo/glfw_opengl3_imguizmo.ini b/glfw_opengl3_imguizmo/glfw_opengl3_imguizmo.ini
@@ -3,8 +3,8 @@ startupPosX=512
 startupPosY=192
 viewportWidth=800
 viewportHeigth=600
-colBGx=0.07000000029802322
-colBGy=0.2599999904632568
+colBGx=0.07
+colBGy=0.26
 colBGz=0.75
 colBGw=1.0
 theme=2

diff --git a/glfw_opengl3_imknobs/glfw_opengl3_imknobs.ini b/glfw_opengl3_imknobs/glfw_opengl3_imknobs.ini
@@ -4,8 +4,8 @@ startupPosY=134
 viewportWidth=1024
 viewportHeigth=800
 colBGx=0.25
-colBGy=0.6499999761581421
-colBGz=0.8500000238418579
+colBGy=0.65
+colBGz=0.85
 colBGw=1.0
 theme=2
 [Image]

diff --git a/glfw_opengl3_imnodes/glfw_opengl3_imnodes.ini b/glfw_opengl3_imnodes/glfw_opengl3_imnodes.ini
@@ -4,8 +4,8 @@ startupPosY=140
 viewportWidth=1024
 viewportHeigth=800
 colBGx=0.25
-colBGy=0.6499999761581421
-colBGz=0.8500000238418579
+colBGy=0.65
+colBGz=0.85
 colBGw=1.0
 theme=2
 [Image]

diff --git a/glfw_opengl3_implot/glfw_opengl3_implot.ini b/glfw_opengl3_implot/glfw_opengl3_implot.ini
@@ -4,8 +4,8 @@ startupPosY=121
 viewportWidth=1024
 viewportHeigth=800
 colBGx=0.25
-colBGy=0.6499999761581421
-colBGz=0.8500000238418579
+colBGy=0.65
+colBGz=0.85
 colBGw=1.0
 theme=2
 [Image]

diff --git a/glfw_opengl3_implot3d/glfw_opengl3_implot3d.ini b/glfw_opengl3_implot3d/glfw_opengl3_implot3d.ini
@@ -1,11 +1,11 @@
 [Window]
-startupPosX=428
-startupPosY=68
+startupPosX=450
+startupPosY=61
 viewportWidth=1036
 viewportHeigth=819
 colBGx=0.25
-colBGy=0.6499999761581421
-colBGz=0.8500000238418579
+colBGy=0.65
+colBGz=0.85
 colBGw=1.0
 theme=2
 [Image]

diff --git a/glfw_opengl3_implot3d/glfw_opengl3_implot3d.nim b/glfw_opengl3_implot3d/glfw_opengl3_implot3d.nim
@@ -3,7 +3,7 @@
 
 import std/[math, random, sugar, paths]
 import ../utils/appImGui
-import implotFuncs
+import implot3dFuncs
 
 when defined(windows):
   when not defined(vcc):   # imguinVcc.res TODO WIP
@@ -66,10 +66,10 @@ proc imPlot3dWindow() =
       # See ./implotFuncs.nim
       let IMPLOT3D_AUTO_COL = vec4(0, 0, 0, -1) # Deduce color automatically
       let IMPLOT3D_AUTO     = -1.0.cfloat       # Deduce variable automatically
-      ImPlot3dSetupAxes("x", "y", "z", 0.cint, 0.cint, 0.cint)
-      ImPlot3dPlotline_FloatPtr("f(x)", addr xs1[0],  addr ys1[0],  addr zs1[0], 1001, 0.cint, 0.cint, sizeof(xs1[0]).cint)
-      ImPlot3dSetNextMarkerStyle(ImPlot3DMarker_Circle.cint, IMPLOT3D_AUTO, IMPLOT3D_AUTO_COL, IMPLOT3D_AUTO, IMPLOT3D_AUTO_COL)
-      ImPlot3dPlotLine_DoublePtr("g(x)",addr xs2[0], addr ys2[0], addr zs2[0], 20, ImPlot3DLineFlags_Segments.cint, 0.cint, sizeof(xs2[0]).cint)
+      imPlot3dSetupAxes("x", "y", "z")
+      imPlot3dPlotline("f(x)", xs1.ptz,  ys1.ptz,  zs1.ptz, 1001)
+      imPlot3dSetNextMarkerStyle(Circle)
+      imPlot3dPlotLine("g(x)", xs2.ptz, ys2.ptz, zs2.ptz, 20, Segments)
 
 #------
 # main

diff --git a/glfw_opengl3_implot3d/imgui.ini b/glfw_opengl3_implot3d/imgui.ini
@@ -59,12 +59,12 @@ Size=416,349
 Collapsed=0
 
 [Window][ImPlot3D Demo]
-Pos=428,2
+Pos=428,5
 Size=600,810
 Collapsed=0
 
 [Window][Plot3D Window]
-Pos=5,4
+Pos=8,3
 Size=416,456
 Collapsed=0