savio 0.1.4 → 0.1.7

data/lib/savio/io.rb

@@ -1,250 +1,250 @@
-#Adding ability to sense dragging
-on :mouse do |event|
-  if Savio.listening
-
-    if @dragging == nil
-      @dragging = {}
-    end
-    if event.type == :down
-      @dragging[event.button] = true
-    end
-    if event.type == :up
-      @dragging[event.button] = false
-    end
-
-  end
-end
-
-#Button Handler
-on :mouse do |event|
-  if Savio.listening
-
-    if @dragging[:right] == false
-      Button.buttons.each do |button|
-        if button.draggingEnabled
-          button.endDrag()
-        end
-      end
-    end
-
-    if @dragging[:right] == true
-      Button.buttons.each do |button|
-
-        if button.draggingEnabled
-          check = Struct.new(:x,:y).new(false,false)
-          case button.style
-          when 'box'
-            check.y = event.y.between?(button.y,button.y+button.height)
-            check.x = event.x.between?(button.x,button.x+button.length)
-          when 'badge'
-            check.x = event.x.between?(button.x-button.size,button.x+button.size)
-            check.y = event.y.between?(button.y-button.size,button.y+button.size)
-          end
-          if check.x && check.y
-            button.allowDrag = true
-          end
-          if button.allowDrag
-            button.drag(event.x, event.y)
-          end
-        end
-      end
-    end
-
-    if @dragging[:left] == true
-      Button.buttons.each do |button|
-
-        if button.shown && button.enabled
-          check = Struct.new(:x,:y).new(false,false)
-          case button.style
-          when 'box'
-            check.y = event.y.between?(button.y,button.y+button.height)
-            check.x = event.x.between?(button.x,button.x+button.length)
-          when 'badge'
-            check.x = event.x.between?(button.x-button.size,button.x+button.size)
-            check.y = event.y.between?(button.y-button.size,button.y+button.size)
-          end
-          if check.x && check.y
-            if button.buttonManager == nil
-              button.toggle
-            else
-              button.buttonManager.toggle(button)
-            end
-          end
-        end
-
-      end
-    end
-
-  end
-end
-
-#Slider Handler
-on :mouse do |event|
-  if Savio.listening
-
-    if @dragging[:right] == false
-      Slider.sliders.each do |slider|
-        if slider.draggingEnabled
-          slider.endDrag()
-        end
-      end
-    end
-
-    if @dragging[:right] == true
-      Slider.sliders.each do |slider|
-
-        if slider.draggingEnabled
-          if event.y.between?(slider.y-slider.size,slider.y+slider.size) && event.x.between?(slider.x,slider.x+slider.length)
-            slider.allowDrag = true
-          end
-          if slider.allowDrag
-            slider.drag(event.x, event.y)
-          end
-        end
-
-      end
-    end
-
-    if @dragging[:left] == true
-      Slider.sliders.each do |slider|
-
-        if slider.shown && slider.enabled
-          if event.y.between?(slider.y-slider.size,slider.y+slider.size)
-            slider.moveKnob(event.x)
-          end
-        end
-
-      end
-    end
-
-  end
-end
-
-#Inputbox Handler
-on :mouse do |event|
-  if Savio.listening
-
-    if @dragging[:right] == false
-      InputBox.inputBoxs.each do |inputBox|
-        if inputBox.draggingEnabled
-          inputBox.endDrag()
-        end
-      end
-    end
-
-    if @dragging[:right] == true
-      InputBox.inputBoxs.each do |inputBox|
-
-        if inputBox.draggingEnabled
-          if event.y.between?(inputBox.y,inputBox.y+inputBox.height) && event.x.between?(inputBox.x,inputBox.x+inputBox.length)
-            inputBox.allowDrag = true
-          end
-          if inputBox.allowDrag
-            inputBox.drag(event.x, event.y)
-          end
-        end
-
-      end
-    end
-
-    if @dragging[:left] == true
-      InputBox.inputBoxs.each do |inputBox|
-
-        if inputBox.shown && inputBox.enabled
-          if event.y.between?(inputBox.y,inputBox.y+inputBox.height) && event.x.between?(inputBox.x,inputBox.x+inputBox.length)
-            inputBox.select
-          else
-            inputBox.deselect
-          end
-        end
-
-      end
-    end
-
-  end
-end
-
-on :key do |event|
-  if Savio.listening
-
-    InputBox.inputBoxs.each do |inputBox|
-      if inputBox.selected
-        if event.type == :down
-          if event.key == "left shift"
-            inputBox.shift = true
-          else
-            inputBox.addKey(event.key)
-          end
-        elsif event.type == :up && event.key == "left shift"
-          inputBox.shift = false
-        end
-      end
-    end
-
-  end
-end
-
-# #ColorPicker Handler
-on :mouse do |event|
-  if Savio.listening
-
-    if @dragging[:right] == false
-      ColorSlider.colorSliders.each do |slider|
-        if slider.draggingEnabled
-          slider.endDrag()
-        end
-      end
-    end
-
-    if @dragging[:right] == true
-      ColorSlider.colorSliders.each do |slider|
-
-        if slider.draggingEnabled
-          distance = (event.x-slider.x.to_f) ** 2 + (event.y-slider.y.to_f) ** 2
-          distance = Math.sqrt(distance)
-          if distance <= slider.size.to_f
-            slider.allowDrag = true
-          end
-          if slider.allowDrag
-            slider.drag(event.x, event.y)
-          end
-        end
-
-      end
-    end
-
-    if @dragging[:left] == true
-      ColorSlider.colorSliders.each do |slider|
-        if slider.shown && slider.enabled
-
-          distance = (event.x-slider.x.to_f) ** 2 + (event.y-slider.y.to_f) ** 2
-          distance = Math.sqrt(distance)
-
-          if distance <= slider.size.to_f * 0.7
-            slider.showOptions
-          else
-            slider.hideOptions
-          end
-
-          if distance >= slider.size * 0.90 && distance <= slider.size * 1.15
-            if event.x - slider.x == 0
-              event.x += 0.01
-            end
-            angle = Math.atan((event.y.to_f - slider.y.to_f) / (event.x.to_f - slider.x.to_f)).to_f
-            angle = angle.to_f * 180.0/Math::PI
-
-            if (event.x.to_f - slider.x.to_f) < 0
-              angle += 180.0
-            end
-            if event.y.to_f - slider.y.to_f < 0 && (event.x.to_f - slider.x.to_f) > 0
-              angle += 360.0
-            end
-
-            slider.setValue(angle.to_f)
-          end
-        end
-      end
-    end
-
-  end
-end
+#Adding ability to sense dragging
+on :mouse do |event|
+  if Savio.listening
+
+    if @dragging == nil
+      @dragging = {}
+    end
+    if event.type == :down
+      @dragging[event.button] = true
+    end
+    if event.type == :up
+      @dragging[event.button] = false
+    end
+
+  end
+end
+
+#Button Handler
+on :mouse do |event|
+  if Savio.listening
+
+    if @dragging[:right] == false
+      Button.buttons.each do |button|
+        if button.draggingEnabled
+          button.endDrag()
+        end
+      end
+    end
+
+    if @dragging[:right] == true
+      Button.buttons.each do |button|
+
+        if button.draggingEnabled
+          check = Struct.new(:x,:y).new(false,false)
+          case button.style
+          when 'box'
+            check.y = event.y.between?(button.y,button.y+button.height)
+            check.x = event.x.between?(button.x,button.x+button.length)
+          when 'badge'
+            check.x = event.x.between?(button.x-button.size,button.x+button.size)
+            check.y = event.y.between?(button.y-button.size,button.y+button.size)
+          end
+          if check.x && check.y
+            button.allowDrag = true
+          end
+          if button.allowDrag
+            button.drag(event.x, event.y)
+          end
+        end
+      end
+    end
+
+    if @dragging[:left] == true
+      Button.buttons.each do |button|
+
+        if button.shown && button.enabled
+          check = Struct.new(:x,:y).new(false,false)
+          case button.style
+          when 'box'
+            check.y = event.y.between?(button.y,button.y+button.height)
+            check.x = event.x.between?(button.x,button.x+button.length)
+          when 'badge'
+            check.x = event.x.between?(button.x-button.size,button.x+button.size)
+            check.y = event.y.between?(button.y-button.size,button.y+button.size)
+          end
+          if check.x && check.y
+            if button.buttonManager == nil
+              button.toggle
+            else
+              button.buttonManager.toggle(button)
+            end
+          end
+        end
+
+      end
+    end
+
+  end
+end
+
+#Slider Handler
+on :mouse do |event|
+  if Savio.listening
+
+    if @dragging[:right] == false
+      Slider.sliders.each do |slider|
+        if slider.draggingEnabled
+          slider.endDrag()
+        end
+      end
+    end
+
+    if @dragging[:right] == true
+      Slider.sliders.each do |slider|
+
+        if slider.draggingEnabled
+          if event.y.between?(slider.y-slider.size,slider.y+slider.size) && event.x.between?(slider.x,slider.x+slider.length)
+            slider.allowDrag = true
+          end
+          if slider.allowDrag
+            slider.drag(event.x, event.y)
+          end
+        end
+
+      end
+    end
+
+    if @dragging[:left] == true
+      Slider.sliders.each do |slider|
+
+        if slider.shown && slider.enabled
+          if event.y.between?(slider.y-slider.size,slider.y+slider.size)
+            slider.moveKnob(event.x)
+          end
+        end
+
+      end
+    end
+
+  end
+end
+
+#Inputbox Handler
+on :mouse do |event|
+  if Savio.listening
+
+    if @dragging[:right] == false
+      InputBox.inputBoxs.each do |inputBox|
+        if inputBox.draggingEnabled
+          inputBox.endDrag()
+        end
+      end
+    end
+
+    if @dragging[:right] == true
+      InputBox.inputBoxs.each do |inputBox|
+
+        if inputBox.draggingEnabled
+          if event.y.between?(inputBox.y,inputBox.y+inputBox.height) && event.x.between?(inputBox.x,inputBox.x+inputBox.length)
+            inputBox.allowDrag = true
+          end
+          if inputBox.allowDrag
+            inputBox.drag(event.x, event.y)
+          end
+        end
+
+      end
+    end
+
+    if @dragging[:left] == true
+      InputBox.inputBoxs.each do |inputBox|
+
+        if inputBox.shown && inputBox.enabled
+          if event.y.between?(inputBox.y,inputBox.y+inputBox.height) && event.x.between?(inputBox.x,inputBox.x+inputBox.length)
+            inputBox.select
+          else
+            inputBox.deselect
+          end
+        end
+
+      end
+    end
+
+  end
+end
+
+on :key do |event|
+  if Savio.listening
+
+    InputBox.inputBoxs.each do |inputBox|
+      if inputBox.selected
+        if event.type == :down
+          if event.key == "left shift"
+            inputBox.shift = true
+          else
+            inputBox.addKey(event.key)
+          end
+        elsif event.type == :up && event.key == "left shift"
+          inputBox.shift = false
+        end
+      end
+    end
+
+  end
+end
+
+# #ColorPicker Handler
+on :mouse do |event|
+  if Savio.listening
+
+    if @dragging[:right] == false
+      ColorSlider.colorSliders.each do |slider|
+        if slider.draggingEnabled
+          slider.endDrag()
+        end
+      end
+    end
+
+    if @dragging[:right] == true
+      ColorSlider.colorSliders.each do |slider|
+
+        if slider.draggingEnabled
+          distance = (event.x-slider.x.to_f) ** 2 + (event.y-slider.y.to_f) ** 2
+          distance = Math.sqrt(distance)
+          if distance <= slider.size.to_f
+            slider.allowDrag = true
+          end
+          if slider.allowDrag
+            slider.drag(event.x, event.y)
+          end
+        end
+
+      end
+    end
+
+    if @dragging[:left] == true
+      ColorSlider.colorSliders.each do |slider|
+        if slider.shown && slider.enabled
+
+          distance = (event.x-slider.x.to_f) ** 2 + (event.y-slider.y.to_f) ** 2
+          distance = Math.sqrt(distance)
+
+          if distance <= slider.size.to_f * 0.7
+            slider.showOptions
+          else
+            slider.hideOptions
+          end
+
+          if distance >= slider.size * 0.90 && distance <= slider.size * 1.15
+            if event.x - slider.x == 0
+              event.x += 0.01
+            end
+            angle = Math.atan((event.y.to_f - slider.y.to_f) / (event.x.to_f - slider.x.to_f)).to_f
+            angle = angle.to_f * 180.0/Math::PI
+
+            if (event.x.to_f - slider.x.to_f) < 0
+              angle += 180.0
+            end
+            if event.y.to_f - slider.y.to_f < 0 && (event.x.to_f - slider.x.to_f) > 0
+              angle += 360.0
+            end
+
+            slider.setValue(angle.to_f)
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/savio/version.rb

@@ -1,3 +1,3 @@
-module Savio
-  VERSION = "0.1.4"
-end
+module Savio
+  VERSION = "0.1.7"
+end

data/lib/savio.rb

@@ -1,82 +1,82 @@
-require "savio/version"
-require 'ruby2d'
-
-module Savio
-  class Error < StandardError; end
-
-  require 'savio/IORenderable.rb'
-  require 'savio/InputBox.rb'
-  require 'savio/Slider.rb'
-  require 'savio/Button.rb'
-  require 'savio/ButtonManager.rb'
-  require 'savio/hsv2rgb.rb'
-  require 'savio/ColorSlider.rb'
-  require 'savio/Scene.rb'
-  require 'savio/Colors.rb'
-  require 'savio/io.rb'
-
-  def self.makeBool(value)
-    case value
-      when true, 'true', 1, '1', 't' then true
-      when false, 'false', nil, '', 0, '0', 'f' then false
-    else
-      return "no"
-    end
-  end
-
-  def self.guessType(value)
-    if value.to_i.to_s == value
-      return "int"
-    elsif value.to_f.to_s == value
-      return "float"
-    elsif value == "true" || value == "false"
-      return "bool"
-    else
-      return "str"
-    end
-  end
-
-  def self.listen()
-    @listening = true
-  end
-
-  def self.stop()
-    @listening = false
-  end
-
-  def self.listening
-    return @listening
-  end
-
-
-  @elements = []
-  def self.elements
-    @elements
-  end
-
-  def self.addElement(element)
-    @elements.push(element)
-  end
-
-  def self.removeElement(element)
-    @elements.delete(element)
-  end
-
-
-  def self.hide
-    @elements.each do |e|
-      e.remove
-    end
-  end
-
-  def self.unhide
-    @elements.each do |e|
-      e.add
-    end
-  end
-
-
-end
-
-include Savio
-Savio.listen
+require "savio/version"
+require 'ruby2d'
+
+module Savio
+  class Error < StandardError; end
+
+  require 'savio/IORenderable.rb'
+  require 'savio/InputBox.rb'
+  require 'savio/Slider.rb'
+  require 'savio/Button.rb'
+  require 'savio/ButtonManager.rb'
+  require 'savio/hsv2rgb.rb'
+  require 'savio/ColorSlider.rb'
+  require 'savio/Scene.rb'
+  require 'savio/Colors.rb'
+  require 'savio/io.rb'
+
+  def self.makeBool(value)
+    case value
+      when true, 'true', 1, '1', 't' then true
+      when false, 'false', nil, '', 0, '0', 'f' then false
+    else
+      return "no"
+    end
+  end
+
+  def self.guessType(value)
+    if value.to_i.to_s == value
+      return "int"
+    elsif value.to_f.to_s == value
+      return "float"
+    elsif value == "true" || value == "false"
+      return "bool"
+    else
+      return "str"
+    end
+  end
+
+  def self.listen()
+    @listening = true
+  end
+
+  def self.stop()
+    @listening = false
+  end
+
+  def self.listening
+    return @listening
+  end
+
+
+  @elements = []
+  def self.elements
+    @elements
+  end
+
+  def self.addElement(element)
+    @elements.push(element)
+  end
+
+  def self.removeElement(element)
+    @elements.delete(element)
+  end
+
+
+  def self.hide
+    @elements.each do |e|
+      e.remove
+    end
+  end
+
+  def self.unhide
+    @elements.each do |e|
+      e.add
+    end
+  end
+
+
+end
+
+include Savio
+Savio.listen