white_gold 0.0.2 → 0.0.3

data/lib/white_gold/master.rb

@@ -17,7 +17,7 @@ class WhiteGold
     @frame_delay = 1.0 / fps
   end
 
-  def init init_page = :main_page, fps: nil, theme: nil
+  def init fps: nil, theme: nil
     @window = Window.new
     @gui = Gui.new window
     @preserved_pages = {}
@@ -25,12 +25,12 @@ class WhiteGold
     self.fps = fps if fps
     @frame_delay = 0.015 if !@frame_delay
     @jobs = []
-    @next_page_id = init_page
-    load_page init_page
+    @initialized = true
   end
 
-  def run init_page = :main_page, fps: nil, theme: nil, init: true
-    self.init init_page, fps: fps, theme: theme if init
+  def run page = nil, fps: nil, theme: nil
+    self.init fps: fps, theme: theme if !@initialized
+    load_page page if page
 
     next_frame_time = Time.now
     while @gui.self_active?
@@ -53,35 +53,33 @@ class WhiteGold
   end
 
   def load_page page_id
-    @current_page_id = page_id
+    @next_page_id = @current_page_id = page_id
     case page_id
     when Symbol
       page = @preserved_pages[page_id] = Page.new self
-      @gui.self_add page, "main_container"
-      @current_page = page
-      ExternObject.callback_storage = page.widget_callbacks
-      ExternObject.global_callback_storage = page.global_callbacks
-      ExternObject.data_storage = page.custom_data
+      init_page page
       send(page_id)
     when Class
       page = @preserved_pages[page_id] = page_id.new self
-      @gui.self_add page, "main_container"
-      @current_page = page
-      ExternObject.callback_storage = page.widget_callbacks
-      ExternObject.global_callback_storage = page.global_callbacks
-      ExternObject.data_storage = page.custom_data
-      page.build
+      init_page page
+      page.send! do
+        page.build
+      end
     when Proc
       page = @preserved_pages[page_id] = Page.new self
-      @gui.self_add page, "main_container"
-      @current_page = page
-      ExternObject.callback_storage = page.widget_callbacks
-      ExternObject.global_callback_storage = page.global_callbacks
-      ExternObject.data_storage = page.custom_data
-      instance_exec &page_id
+      init_page page
+      page_id.call
     end
   end
 
+  def init_page page
+    @gui.self_add page, "main_container"
+    @current_page = page
+    ExternObject.callback_storage = page.widget_callbacks
+    ExternObject.global_callback_storage = page.global_callbacks
+    ExternObject.data_storage = page.custom_data
+  end
+
   attr_accessor :next_page_id
   attr :gui, :window
 
@@ -150,21 +148,4 @@ class WhiteGold
     job delay: delay || delay_, repeat: do
     end.on_done &b
   end
-
-  def respond_to? name
-    super || @current_page.respond_to?(name)
-  end
-
-  def method_missing name, *a, **na, &b
-    if @current_page.respond_to? name
-      @current_page.send(name, *a, **na, &b)
-    elsif @gui.respond_to? name
-      @gui.send(name, *a, **na, &b)
-    elsif @window.respond_to? name
-      @window.send(name, *a, **na, &b)
-    else
-      no_method_error = "method '#{name}' missing in Page/Gui/Window"
-      raise no_method_error
-    end
-  end
 end

data/lib/white_gold/tgui-abi.rb

@@ -160,14 +160,16 @@ class ExternObject
     end
   end
 
-  abi_packer Tgui::Abi::Vector2f do |o|
-    case o
-    when Array
-      raise "Invalid array size excepted: #{2}, given: #{o.size}" if o.size != 2
-      return o.map{ abi_pack_float _1 }
-    else
-      raise "Unable to make Vector2f from #{o}"
+  abi_packer Tgui::Abi::Vector2f do |*arg|
+    case arg.size
+    when 1
+      a = arg.first
+      x = y = a
+    when 2
+      x, y = *arg
+    else raise "Unsupported argument #{arg}"
     end
+    [abi_pack_float(x), abi_pack_float(y)]
   end
 
   abi_packer Tgui::Abi::Vector2u do |o|
@@ -219,21 +221,19 @@ class ExternObject
     o.odd?
   end
 
-  abi_unpacker "SizeLayout" do |o|
-    [o.x, o.y]
-  end
-
-  abi_unpacker "PositionLayout" do |o|
-    [o.x, o.y]
-  end
-
-  abi_unpacker Tgui::Vector2f do |o|
+  vector2f_unpacker = proc do |o|
     v = Tgui::Vector2f.new o
     r = [v.x, v.y]
     Util.free(o)
     r
   end
 
+  abi_unpacker "SizeLayout", &vector2f_unpacker
+
+  abi_unpacker "PositionLayout", &vector2f_unpacker
+
+  abi_unpacker Tgui::Vector2f, &vector2f_unpacker
+
   abi_unpacker Tgui::Vector2u do |o|
     v = Tgui::Vector2u.new o
     r = [v.x, v.y]

data/lib/white_gold/version.rb

@@ -0,0 +1,3 @@
+class WhiteGold
+  VERSION = "0.0.3"
+end

data/lib/white_gold.rb

@@ -1,47 +1,48 @@
 require_relative 'white_gold/master'
 include Tgui
 
-@wg = WhiteGold.new
+@white_gold_instance = WhiteGold.new
 
-@wg.methods.difference(Object.instance_methods, [:respond_to?, :method_missing, :go, :[], :page]).each do |m|
-  define_method m do |*a, **na, &b|
-    @wg.send(m, *a, **na, &b)
-  end
-end
+class << self 
+  include BangNestedCaller
+  include BangDef
 
-class << self  
+  def go page
+    @white_gold_instance.go page.is_a?(Symbol) ? proc{ send(page) } : page
+  end
+  
+  def page
+    @white_gold_instance.page
+  end
 
   def respond_to? name
-    super || (name.end_with?("!") && @wg.respond_to?(name))
+    super || 
+    (name.end_with?("!") && bang_respond_to?(name[...-1])) ||
+    @white_gold_instance.page.respond_to?(name)
   end
 
   def method_missing name, *a, **na, &b
-    if name.end_with?("!")
-      @wg.send(name, *a, **na, &b)
+    if name.end_with? "!"
+      bang_method_missing name[...-1], *a, **na, &b
+    elsif @white_gold_instance.page.respond_to? name
+      @white_gold_instance.page.send name, *a, **na, &b
     else super
     end
   end
+end
 
-  def go page
-    method(page).unbind.bind(@wg) if Symbol === page && !@wg.respond_to?(page)
-    @wg.go page
-  end
-  
-  def page
-    @wg.page
-  end
-
-  def def! name, &b
-    @wg.page.class.def! name, &b
-  end
+def! :run do |page = nil|
+  go page if page
+  @white_gold_instance.run
+  @white_gold_instance = nil
 end
 
-@wg.init Page
+@white_gold_instance.init
+@white_gold_instance.load_page Page
 if $0 != 'irb'
   at_exit do
-    go :main_page
-  rescue NameError
-  ensure
-    @wg.run init: false
+    @white_gold_instance&.run
   end
-end
+end
+
+BangNestedCaller.push self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: white_gold
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Łukasz Pomietło
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -24,8 +24,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-description: "    Ruby gem for building pure ruby graphical user interface. \n    Uses
-  TGUI & SFML as a backend.\n"
+description: |2
+      Ruby gem for building pure ruby graphical user interface.
+      Uses TGUI & SFML as a backend.
+      Dedicated to creating single-file applications and learning programming.
 email: oficjalnyadreslukasza@gmail.com
 executables: []
 extensions: []
@@ -74,6 +76,7 @@ files:
 - lib/white_gold/convention/theme/theme_attributed.rb
 - lib/white_gold/convention/theme/theme_component.rb
 - lib/white_gold/convention/theme_attributes.rb
+- lib/white_gold/convention/tree_node.rb
 - lib/white_gold/convention/unit.rb
 - lib/white_gold/convention/widget_like.rb
 - lib/white_gold/dsl/backend_gui.rb
@@ -82,6 +85,7 @@ files:
 - lib/white_gold/dsl/box_layout_ratios.rb
 - lib/white_gold/dsl/button.rb
 - lib/white_gold/dsl/button_base.rb
+- lib/white_gold/dsl/canvas.rb
 - lib/white_gold/dsl/chat_box.rb
 - lib/white_gold/dsl/check_box.rb
 - lib/white_gold/dsl/child_window.rb
@@ -116,6 +120,11 @@ files:
 - lib/white_gold/dsl/scrollable_panel.rb
 - lib/white_gold/dsl/scrollbar.rb
 - lib/white_gold/dsl/separator_line.rb
+- lib/white_gold/dsl/sfml/circle_shape.rb
+- lib/white_gold/dsl/sfml/convex_shape.rb
+- lib/white_gold/dsl/sfml/rectangle_shape.rb
+- lib/white_gold/dsl/sfml/shape.rb
+- lib/white_gold/dsl/sfml/text.rb
 - lib/white_gold/dsl/signal/global_signal.rb
 - lib/white_gold/dsl/signal/signal.rb
 - lib/white_gold/dsl/signal/signal_animation_type.rb
@@ -159,10 +168,12 @@ files:
 - lib/white_gold/path/string.path.rb
 - lib/white_gold/tgui-abi.rb
 - lib/white_gold/tgui-config.rb
+- lib/white_gold/version.rb
 homepage: https://github.com/lpogic/white_gold
 licenses:
 - Zlib
-metadata: {}
+metadata:
+  documentation_uri: https://github.com/lpogic/white_gold/blob/master/doc/wiki/README.md
 post_install_message:
 rdoc_options: []
 require_paths: