imgui-bindings 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bbd987161848c4f790e55cfffd04dfb2ae144186f451b278b4d1eb2e77d69d5
-  data.tar.gz: c4ef36ccc46ec591c516374e69224ca54e08a8b9131f39d95c1cc1f250a64ba7
+  metadata.gz: 9d85ab51913e9f7e8f1a53d6ec0da01c5d6622242beebd9bada8d09bc0fe7023
+  data.tar.gz: e5e0393ed8d1f481c6ed735f2ef09caefdf8f0049ddf66c4cd8ba461a8e6e5c6
 SHA512:
-  metadata.gz: c485d9548d2a35387cee22080ea30d6f19f16ad240dbffc0c0922e4d16d1f96847078388ce1506569b378bf7e48bd6f3f180bdc1b706240e7e0a3ef5bada8607
-  data.tar.gz: 596bb4901a35014d5688d539c7c87671652a95e9317db863268ae83f9d4fab062612da9549eca3e26e715c8bdfc80179ffabc4afab8136e83d535105924d66b6
+  metadata.gz: 701c4754521d32d9a951492a55ce1f6a18b83d1a420053ce8aaeae1bdfc7b053807c719a3b79c07668a6b613dc18793e71e12741ae1346a2e484344a8d15db83
+  data.tar.gz: 1ec45b3575411a865285bd6aea1af87925321d592154edd4759bc4ba91da993c503058d4115fae02cf1dd4a4fceb7a72bfcb16e10321e7039018b5f94180413c

data/ChangeLog

@@ -1,7 +1,19 @@
+2022-08-14  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* Added ImNodes ( https://github.com/rokups/ImNodes ) support
+	* Moved cimgui location
+	* Removed unmaintained debug version of shared libraries
+	* Added hand-written binding code for imgui_internal.h
+
+2022-08-06  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* Fixed several warnings
+
 2022-07-02  vaiorabbit  <http://twitter.com/vaiorabbit>
 
 	* (macOS) ImGui 1.88
 	* (Windows) ImGui 1.88
+	* Updated tested Ruby version
 
 2022-02-12  vaiorabbit  <http://twitter.com/vaiorabbit>
 

data/README.md

@@ -3,7 +3,7 @@
 # Yet another ImGui wrapper for Ruby #
 
 *   Created : 2019-01-05
-*   Last modified : 2022-07-02
+*   Last modified : 2022-08-14
 
 <img src="https://raw.githubusercontent.com/vaiorabbit/ruby-imgui/master/doc/jpfont_test.png" width="250">
 
@@ -14,16 +14,9 @@
 *   Ruby interpreter
     *   Tested on:
         *   [Windows] https://rubyinstaller.org/downloads/ Ruby+Devkit
-            *   ruby 3.0.2p107 (2021-07-07 revision 0db68f0233) [x64-mingw32]
-            *   ~~ruby 3.0.0p0 (2020-12-25 revision 95aff21468) [x64-mingw32]~~
-            *   ~~ruby 2.7.1p83 (2020-03-31 revision a0c7c23c9c) [x64-mingw32]~~
+            *   ruby 3.1.2p20 (2022-04-12 revision 4491bb740a) [x64-mingw-ucrt]
         *   [macOS]
-            *   ruby 3.1.0p0 (2021-12-25 revision fb4df44d16) [arm64-darwin20]
-            *   ruby 3.0.2p107 (2021-07-07 revision 0db68f0233) [arm64-darwin20]
-            *   ~~ruby 3.0.1p64 (2021-04-05 revision 0fb782ee38) [arm64-darwin20]~~
-            *   ~~ruby 3.0.0p0 (2020-12-25 revision 95aff21468) [arm64-darwin20]~~
-            *   ~~ruby 2.7.0p0 (2019-12-25 revision 647ee6f091) [x86_64-darwin19]~~
-            *   ~~ruby 2.6.0p0 (2018-12-25 revision 66547) [x86_64-darwin18]~~
+            *   ruby 3.1.2p20 (2022-04-12 revision 4491bb740a) [arm64-darwin21]
 *   Ruby Gems
     *   opengl-bindings
         *   gem install opengl-bindings
@@ -32,9 +25,32 @@
 *   Compiler
     *   Tested on:
         *   [Windows] gcc (Rev1, Built by MSYS2 project) 8.2.1 20181214
-        *   [macOS] clang (Apple clang version 12.0.5 (clang-1205.0.22.11), Target: arm64-apple-darwin20.6.0)
+        *   [macOS] clang (Apple clang version 13.1.6 (clang-1316.0.21.2.5), Target: arm64-apple-darwin21.5.0)
 *   CMake https://cmake.org/download/
 
+<details>
+<summary>Older versions</summary>
+
+*   Ruby interpreter
+    *   Tested on:
+        *   [Windows] https://rubyinstaller.org/downloads/ Ruby+Devkit
+            *   ruby 3.0.2p107 (2021-07-07 revision 0db68f0233) [x64-mingw32]
+            *   ruby 3.0.0p0 (2020-12-25 revision 95aff21468) [x64-mingw32]
+            *   ruby 2.7.1p83 (2020-03-31 revision a0c7c23c9c) [x64-mingw32]
+        *   [macOS]
+            *   ruby 3.1.2p20 (2022-04-12 revision 4491bb740a) [arm64-darwin21]
+            *   ruby 3.1.0p0 (2021-12-25 revision fb4df44d16) [arm64-darwin20]
+            *   ruby 3.0.2p107 (2021-07-07 revision 0db68f0233) [arm64-darwin20]
+            *   ruby 3.0.1p64 (2021-04-05 revision 0fb782ee38) [arm64-darwin20]
+            *   ruby 3.0.0p0 (2020-12-25 revision 95aff21468) [arm64-darwin20]
+            *   ruby 2.7.0p0 (2019-12-25 revision 647ee6f091) [x86_64-darwin19]
+            *   ruby 2.6.0p0 (2018-12-25 revision 66547) [x86_64-darwin18]
+
+*   Compiler
+    *   Tested on:
+        *   [Windows] gcc (Rev1, Built by MSYS2 project) 8.2.1 20181214
+        *   [macOS] clang (Apple clang version 12.0.5 (clang-1205.0.22.11), Target: arm64-apple-darwin20.6.0)
+</details>
 
 ## Setting up and run sample ##
 
@@ -42,7 +58,7 @@
     *   For the first time:
         *   git submodule update --init --recursive
     *   Update:
-        *   cd cimgui
+        *   cd imgui_dll/cimgui
         *   git pull origin master <- to get latest cimgui
         *   git submodule update <- to get specific revision of imgui required by cimgui
 2.  Get GLFW or SDL2
@@ -60,14 +76,17 @@
 
 ## License ##
 
-'imgui.dylib', 'imgui.dll' and 'imgui_debug.dll' are built on top of these products and are available under the terms of the MIT License.
+All shared libraries found in `lib` directory are built on top of these products and are available under the terms of the MIT License.
 *   cimgui ( https://github.com/cimgui/cimgui )
     *   https://github.com/cimgui/cimgui/blob/master/LICENSE
 *   Dear ImGui ( https://github.com/ocornut/imgui )
     *   https://github.com/ocornut/imgui/blob/master/LICENSE.txt
+*   ImNodes ( https://github.com/rokups/ImNodes )
+    *   https://github.com/rokups/ImNodes/blob/master/LICENSE
 
 All ruby codes here are available under the terms of the zlib/libpng License ( http://opensource.org/licenses/Zlib ).
 
+```
 Ruby-Imgui : Yet another ImGui wrapper for Ruby
 Copyright (c) 2019-2022 vaiorabbit <http://twitter.com/vaiorabbit>
 
@@ -89,3 +108,4 @@ freely, subject to the following restrictions:
 
     3. This notice may not be removed or altered from any source
     distribution.
+```

data/lib/imgui.rb

@@ -1635,34 +1635,6 @@ class ImGuiTextFilter < FFI::Struct
 
 end
 
-class ImGuiTextRange < FFI::Struct
-  layout(
-    :b, :pointer,
-    :e, :pointer
-  )
-
-  def self.create()
-    return ImGuiTextRange.new(ImGui::ImGuiTextRange_ImGuiTextRange_Nil())
-  end
-
-  def self.create(_b, _e)
-    return ImGuiTextRange.new(ImGui::ImGuiTextRange_ImGuiTextRange_Str(_b, _e))
-  end
-
-  def destroy()
-    ImGui::ImGuiTextRange_destroy(self)
-  end
-
-  def empty()
-    ImGui::ImGuiTextRange_empty(self)
-  end
-
-  def split(separator, out)
-    ImGui::ImGuiTextRange_split(self, separator, out)
-  end
-
-end
-
 class ImGuiViewport < FFI::Struct
   layout(
     :Flags, :int,
@@ -3235,8 +3207,8 @@ module ImGui
     symbols.each do |sym|
       begin
         attach_function sym, args[sym], retvals[sym]
-      rescue FFI::NotFoundError => error
-        $stderr.puts("[Warning] Failed to import #{s}.\n") if output_error
+      rescue FFI::NotFoundError
+        $stderr.puts("[Warning] Failed to import #{sym}.\n") if output_error
       end
     end
 

data/lib/imgui_impl_opengl3.rb

@@ -140,8 +140,8 @@ module ImGui
     draw_data[:CmdListsCount].times do |n|
 
       cmd_list = ImDrawList.new((draw_data[:CmdLists].pointer + 8 * n).read_pointer) # 8 == const ImDrawList*
-      vtx_buffer = ImDrawVert.new(cmd_list[:VtxBuffer][:Data]) # const ImDrawVert*
-      idx_buffer = cmd_list[:IdxBuffer][:Data] # const ImDrawIdx*
+      # vtx_buffer = ImDrawVert.new(cmd_list[:VtxBuffer][:Data]) # const ImDrawVert*
+      # idx_buffer = cmd_list[:IdxBuffer][:Data] # const ImDrawIdx*
 
       # Upload vertex/index buffers
       GL.BufferData(GL::ARRAY_BUFFER, cmd_list[:VtxBuffer][:Size] * ImDrawVert.size, Fiddle::Pointer.new(cmd_list[:VtxBuffer][:Data]), GL::STREAM_DRAW)
@@ -185,7 +185,7 @@ module ImGui
           end
 
         end
-        idx_buffer += pcmd[:ElemCount] * 2 # 2 == ImDrawIdx(:ushort).size
+        # idx_buffer += pcmd[:ElemCount] * 2 # 2 == ImDrawIdx(:ushort).size
       end
     end
 

data/lib/imgui_impl_sdl2.rb

@@ -17,7 +17,7 @@ module ImGui
       @window = nil                                           # SDL_Window*
       @renderer = nil                                         # SDL_Renderer*
       @time = 0.0                                             # Uint64
-      @mouseButtonsDown                                       # int
+      @mouseButtonsDown = 0                                   # int
       @mouseCursors = Array.new(ImGuiMouseCursor_COUNT) { 0 } # SDL_Cursor*
       @clipboardTextData = nil                                # char*
       @mouseCanUseGlobalState = false                         # bool

data/lib/imgui_impl_sdlrenderer.rb

@@ -60,7 +60,6 @@ module ImGui
   end
 
   def self.ImplSDLRenderer_NewFrame()
-    io = ImGuiIO.new(ImGui::GetIO())
     bd = ImGui_ImplSDLRenderer_GetBackendData()
     ImGui::ImplSDLRenderer_CreateDeviceObjects() if bd[:FontTexture] == nil
   end

data/lib/imgui_internal.rb

@@ -0,0 +1,49 @@
+# imgui-bindings : Yet another ImGui wrapper for Ruby
+#
+# * https://github.com/vaiorabbit/ruby-imgui
+
+require 'ffi'
+
+module ImGui
+
+  extend FFI::Library
+
+  @@imgui_import_internal_done = false
+
+  def self.import_internal_symbols(output_error = false)
+
+    symbols = [
+      :igFocusWindow,
+      :igGetCurrentWindow,
+    ]
+
+    args = {
+      :igFocusWindow => [:pointer],
+      :igGetCurrentWindow => [],
+    }
+
+    retvals = {
+      :igFocusWindow => :void,
+      :igGetCurrentWindow => :pointer,
+    }
+
+    symbols.each do |sym|
+      begin
+        attach_function sym, args[sym], retvals[sym]
+      rescue FFI::NotFoundError
+        $stderr.puts("[Warning] Failed to import #{sym}.\n") if output_error
+      end
+    end
+
+    @@imgui_import_internal_done = true
+  end # self.import_internal_symbols
+
+  def self.GetCurrentWindow()
+    igGetCurrentWindow()
+  end
+
+  def self.FocusWindow(window)
+    igFocusWindow(window)
+  end
+
+end # module ImGui

data/lib/imnodes.rb

@@ -0,0 +1,161 @@
+# imgui-bindings : Yet another ImGui wrapper for Ruby
+#
+# * https://github.com/vaiorabbit/ruby-imgui
+
+require 'ffi'
+
+# ImNodes::StyleColor
+ImNodesStyleColor_ColCanvasLines = 0
+ImNodesStyleColor_ColNodeBg = 1
+ImNodesStyleColor_ColNodeActiveBg = 2
+ImNodesStyleColor_ColNodeBorder = 3
+ImNodesStyleColor_ColConnection = 4
+ImNodesStyleColor_ColConnectionActive = 5
+ImNodesStyleColor_ColSelectBg = 6
+ImNodesStyleColor_ColSelectBorder = 7
+ImNodesStyleColor_ColMax = 8
+
+# ImNodesStyleVar
+ImNodesStyleVar_GridSpacing = 0        # float
+ImNodesStyleVar_CurveThickness = 1     # float
+ImNodesStyleVar_CurveStrength = 2      # float
+ImNodesStyleVar_SlotRadius = 3         # float
+ImNodesStyleVar_NodeRounding = 4       # float
+ImNodesStyleVar_NodeSpacing = 5        # ImVec2
+ImNodesStyleVar_ItemSpacing = 6        # ImVec2
+ImNodesStyleVar_COUNT = 7
+
+# ImNodesStyleCol
+ImNodesStyleCol_GridLines = 0
+ImNodesStyleCol_NodeBodyBg = 1
+ImNodesStyleCol_NodeBodyBgHovered = 2
+ImNodesStyleCol_NodeBodyBgActive = 3
+ImNodesStyleCol_NodeBorder = 4
+ImNodesStyleCol_Connection = 5
+ImNodesStyleCol_ConnectionActive = 6
+ImNodesStyleCol_SelectBg = 7
+ImNodesStyleCol_SelectBorder = 8
+ImNodesStyleCol_NodeTitleBarBg = 9
+ImNodesStyleCol_NodeTitleBarBgHovered = 10
+ImNodesStyleCol_NodeTitleBarBgActive = 11
+ImNodesStyleCol_COUNT = 12
+
+module ImNodes
+
+  extend FFI::Library
+
+  @@imnodes_import_done = false
+
+  class CanvasStyle < FFI::Struct
+    layout(
+      # Thickness of curves that connect slots together.
+      :CurveThickness, :float,
+      # Indent connection into slot widget a little. Useful when slot content covers connection end with some kind
+      # of icon (like a circle) and then no seam between icon and connection end is visible.
+      :ConnectionIndent, :float,
+      :GridSpacing, :float,
+      :CurveStrength, :float,
+      :NodeRounding, :float,
+      :NodeSpacing, ImVec2.by_value
+    )
+  end
+
+  class CanvasState < FFI::Struct
+    layout(
+      # Current zoom of canvas.
+      :Zoom, :float,
+      # Current scroll offset of canvas.
+      :Offset, ImVec2.by_value,
+      # Colors used to style elements of this canvas.
+      :Colors, [ImColor.by_value, ImNodesStyleColor_ColMax],
+      # Style parameters
+      :Style, CanvasStyle.by_value,
+      # Implementation detail.
+      :_Impl, :pointer
+    )
+
+    def self.create()
+      return CanvasState.new(ImNodesCanvasStateCtor())
+    end
+
+    def destroy()
+      ImNodesCanvasStateDtor(self)
+    end
+  end
+
+  class SlotInfo < FFI::Struct
+    layout(
+      :title, :pointer,
+      :kind, :int
+    )
+
+    def self.create(title, kind)
+      instance = SlotInfo.new
+      instance[:title] = FFI::MemoryPointer.from_string(title)
+      instance[:kind] = kind
+      return instance
+    end
+  end
+
+  def self.load_lib(libpath = './imnodes.dylib', output_error = false)
+    ffi_lib_flags :now, :global
+    ffi_lib libpath
+    import_symbols(output_error) unless @@imnodes_import_done
+  end
+
+  def self.import_symbols(output_error = false)
+
+    symbols = [
+      # name, func, args, returns
+      [:CanvasStateCtor, :ImNodesCanvasStateCtor, [], :pointer],
+      [:CanvasStateDtor, :ImNodesCanvasStateDtor, [:pointer], :void],
+      [:BeginCanvas, :ImNodesBeginCanvas, [:pointer], :void],
+      [:EndCanvas, :ImNodesEndCanvas, [], :void],
+      [:BeginNode, :ImNodesBeginNode, [:pointer, :pointer, :pointer], :bool],
+      [:EndNode, :ImNodesEndNode, [], :void],
+      [:IsNodeHovered, :ImNodesIsNodeHovered, [], :bool],
+      [:AutoPositionNode, :ImNodesAutoPositionNode, [:pointer], :void],
+      [:GetNewConnection, :ImNodesGetNewConnection, [:pointer, :pointer, :pointer, :pointer], :bool],
+      [:GetPendingConnection, :ImNodesGetPendingConnection, [:pointer, :pointer, :pointer], :bool],
+      [:Connection, :ImNodesConnection, [:pointer, :pointer, :pointer, :pointer], :bool],
+      [:GetCurrentCanvas, :ImNodesGetCurrentCanvas, [], :pointer],
+      [:InputSlotKind, :ImNodesInputSlotKind, [:int], :int],
+      [:OutputSlotKind, :ImNodesOutputSlotKind, [:int], :int],
+      [:IsInputSlotKind, :ImNodesIsInputSlotKind, [:int], :bool],
+      [:IsOutputSlotKind, :ImNodesIsOutputSlotKind, [:int], :bool],
+      [:BeginSlot, :ImNodesBeginSlot, [:pointer, :int], :bool],
+      [:BeginInputSlot, :ImNodesBeginInputSlot, [:pointer, :int], :bool],
+      [:BeginOutputSlot, :ImNodesBeginOutputSlot, [:pointer, :int], :bool],
+      [:EndSlot, :ImNodesEndSlot, [], :void],
+      [:IsSlotCurveHovered, :ImNodesIsSlotCurveHovered, [], :bool],
+      [:IsConnectingCompatibleSlot, :ImNodesIsConnectingCompatibleSlot, [], :bool],
+      [:EzCreateContext, :ImNodesEzCreateContext, [], :pointer],
+      [:EzFreeContext, :ImNodesEzFreeContext, [:pointer], :void],
+      [:EzSetContext, :ImNodesEzSetContext, [:pointer], :void],
+      [:EzGetState, :ImNodesEzGetState, [], :pointer],
+      [:EzBeginCanvas, :ImNodesEzBeginCanvas, [], :void],
+      [:EzEndCanvas, :ImNodesEzEndCanvas, [], :void],
+      [:EzBeginNode, :ImNodesEzBeginNode, [:pointer, :pointer, :pointer, :pointer], :bool],
+      [:EzEndNode, :ImNodesEzEndNode, [], :void],
+      [:EzInputSlots, :ImNodesEzInputSlots, [:pointer, :int], :void],
+      [:EzOutputSlots, :ImNodesEzOutputSlots, [:pointer, :int], :void],
+      [:EzConnection, :ImNodesEzConnection, [:pointer, :pointer, :pointer, :pointer], :bool],
+      [:EzPushStyleVarFloat, :ImNodesEzPushStyleVarFloat, [:int, :float], :void],
+      [:EzPushStyleVarVec2, :ImNodesEzPushStyleVarVec2, [:int, :pointer], :void],
+      [:EzPopStyleVar, :ImNodesEzPopStyleVar, [:int], :void],
+      [:EzPushStyleColorU32, :ImNodesEzPushStyleColorU32, [:int, :uint], :void],
+      [:EzPushStyleColorVec4, :ImNodesEzPushStyleColorVec4, [:int, :pointer], :void],
+      [:EzPopStyleColor, :ImNodesEzPopStyleColor, [:int], :void],
+    ]
+
+    symbols.each do |sym|
+      begin
+        attach_function *sym
+      rescue FFI::NotFoundError
+        $stderr.puts("[Warning] Failed to import #{sym}.\n") if output_error
+      end
+    end
+
+  end # self.import_symbols
+
+end # module ImNodes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imgui-bindings
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - vaiorabbit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -53,14 +53,16 @@ files:
 - lib/imgui.dll
 - lib/imgui.dylib
 - lib/imgui.rb
-- lib/imgui_debug.dll
-- lib/imgui_debug.dylib
 - lib/imgui_impl_glfw.rb
 - lib/imgui_impl_opengl2.rb
 - lib/imgui_impl_opengl3.rb
 - lib/imgui_impl_raylib.rb
 - lib/imgui_impl_sdl2.rb
 - lib/imgui_impl_sdlrenderer.rb
+- lib/imgui_internal.rb
+- lib/imnodes.dll
+- lib/imnodes.dylib
+- lib/imnodes.rb
 homepage: https://github.com/vaiorabbit/ruby-imgui
 licenses:
 - Zlib
@@ -73,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="