savio 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9c4a4721041e88aef40cb7c21004642868062c0893f9d580b0becc061754e1e
-  data.tar.gz: 7c297a0dc4c4333610a0073ee3ebeef372cdaed9ca14078d518de5cb17e55507
+  metadata.gz: 6f8211e8af8eea0a22081349bc0274e100804f0163f83db1041d896ed7a895ee
+  data.tar.gz: 66f8436669bedbf6724c39da5d1563f6eec5580646fc49ad182c2e7480210b7d
 SHA512:
-  metadata.gz: 9d58b069df4a6556b7b0c4a931e50eb0e0a730e32b00d39cbeb5453003e9ff2a125387e53a102bc9bc81b92d53ba4b67298992cf2f848bc89fb8141db3cff910
-  data.tar.gz: 4307f4a3119b6328e4724a4e555a6f767c5e51a16ca1ba89e667157bb594b13b2f2598a183fb4f362aa3961a33645419852e4fb03083256838030ea5ba46b7f9
+  metadata.gz: 253013e256d8e2416912d866e69e44fa74b265e3f22cd0727da32735009ed81cd100a1ff77c6b173c832962ac20190c63deb2e3e23e301332388d2016990ac56
+  data.tar.gz: 3b985f911a2c5a4de7be93a3895d5c4d57325f7096c66ce78856b975cf37e2f989b7ce138761cc858144fc9dbe7e8f68fb8772c69a2330430f6e84296d0a0271

data/README.md

@@ -103,6 +103,7 @@ all SavIO object's parameters are optional, if it is not defined then it will us
 |.moveKnob(**x**) | Moves the knob to that **x** pixel location on the screen and finds and sets equivalent value for the slider |
 |.setValue(**value**)|Sets the sliders value to that value and moves the knob there (same as .value=)|
 | .value = **value** | Sets the sliders value to that **value** and moves the knob there (same as .setValue)|
+|.onChange| Calls the given proc any time the sliders **value** is updated(see basic usage)|
 
 ### Basic Usage:
 
@@ -110,13 +111,18 @@ all SavIO object's parameters are optional, if it is not defined then it will us
 	    puts "nice"
     end
 
+-----
+
+    slippyTheSlider.onChange do
+      puts "Value Changed! new value is: " + slippyTheSlider.value.to_s
+    end
+
 # | Buttons:
 **On top of** all the basic parameters and methods a **Button** can **also** use these:
 
 ### Params:
 | Variable | Description | Default |
 |--|--|--|
-|value | Anything you want to be tied to the button | 0
 |selected | Whether the button is selected or not | false
 |type | Whether the button will act normally('toggle') or instantly deselect itself('clicker') | 'toggle'
 |style|'box' or 'badge'. Determines the style the button should be rendered with| 'badge'

data/lib/savio.rb

@@ -12,6 +12,7 @@ module Savio
   require 'savio/hsv2rgb.rb'
   require 'savio/ColorSlider.rb'
   require 'savio/Scene.rb'
+  require 'savio/Colors.rb'
   require 'savio/io.rb'
 
   def self.makeBool(value)

data/lib/savio/Button.rb

@@ -15,11 +15,10 @@ module Savio
 
       @@buttons.push(self)
 
-      @value = args[:value] || 0
-
-      @baseColor = args[:baseColor] || '#F5F5F5'
-      @selectedColor = args[:selectedColor] || '#00B3EC'
-      @labelColor = args[:labelColor] || '#F5F5F5'
+      @baseColor = args[:baseColor] || Savio::Colors::White
+      @selectedColor = args[:selectedColor] || Savio::Colors::Blue
+      @labelActiveColor = args[:labelActiveColor] || Savio::Colors::White
+      @labelInactiveColor = args[:labelInactiveColor] || Savio::Colors::White
 
       @cooldownTime = args[:cooldownTime] || 0.0
       @timeLastClicked = 0.0
@@ -41,10 +40,12 @@ module Savio
 
       if @style == 'box'
         @size *= 2
-        @labelColor = args[:baseColor] || '#757575'
+        @labelActiveColor = args[:labelActiveColor] || Savio::Colors::White
+        @labelInactiveColor = args[:labelInactiveColor] || Savio::Colors::Gray
       end
+
       @length = args[:length] || @size * 10
-      @height = args[:height] || @size * 1.2
+      @height = args[:height] || @size * 2
 
       @onClick = Proc.new {}
 
@@ -53,7 +54,7 @@ module Savio
 
     def size=(size)
       @length = size * 10
-      @height = size * 1.2
+      @height = size * 2
       super(size)
     end
     def type=(newType)
@@ -123,12 +124,15 @@ module Savio
           @buttonManager.select(self)
         else
           @selectCircle.add
+          @nameLabel.color = @labelActiveColor
           @selected = true
           if @type == 'clicker'
             fade = Thread.new {
               @selectCircle.add
+              @nameLabel.color = @labelActiveColor
               sleep(0.06)
               @selectCircle.remove
+              @nameLabel.color = @labelInactiveColor
             }
             deselect(enforce)
           end
@@ -141,6 +145,7 @@ module Savio
         @buttonManager.deselect(self)
       else
         @selectCircle.remove
+        @nameLabel.color = @labelInactiveColor
         @selected = false
       end
     end
@@ -196,9 +201,10 @@ module Savio
           @displayName.to_s,
           x: @x + @size * 2, y: @y - @size * 1.5,
           size: @size * 2,
-          color: @labelColor,
+          color: @labelInactiveColor,
           z: @z
         )
+        @nameLabel.y = @baseCircle.y - @baseCircle.radius / 4 - @nameLabel.height / 2
       when 'box'
         @baseCircle = Rectangle.new(
           x: @x, y: @y,
@@ -216,7 +222,7 @@ module Savio
           @displayName.to_s,
           x: @x, y: @y,
           size: @size,
-          color: @labelColor,
+          color: @labelInactiveColor,
           z: @z+2
         )
         @nameLabel.x = @baseCircle.x + @baseCircle.width / 2 - @nameLabel.width / 2

data/lib/savio/ColorSlider.rb

@@ -2,7 +2,7 @@ module Savio
   class ColorSlider
     include IORenderable
 
-    attr_reader :value, :baseColor, :knobColor, :textColor, :sectors, :optionsShown, :animating
+    attr_reader :baseColor, :knobColor, :textColor, :sectors, :optionsShown, :animating
 
     @@colorSliders = []
     def self.colorSliders
@@ -14,10 +14,12 @@ module Savio
       super(args)
       @@colorSliders.push(self)
 
-      @value = args[:value] || rand(0..360)
-      @baseColor = args[:baseColor] || 'white'
-      @knobColor = args[:baseColor] || 'gray'
-      @textColor = args[:textColor] || 'black'
+      @color = args[:color] || HsvColor.new(rand(0..360), rand(0.0..1.0),rand(0.0..1.0))
+      @hue = @color[0]
+
+      @baseColor = args[:baseColor] || Savio::Colors::White
+      @knobColor = args[:baseColor] || Savio::Colors::Gray
+      @textColor = args[:textColor] || Savio::Colors::Black
       @sectors = args[:sectors] || 64
 
       @optionsShown = false
@@ -47,8 +49,8 @@ module Savio
       @innerCircle.remove
       @outerCircle.remove
       @knob.remove
-      @mySaturation.remove
-      @myValue.remove
+      @saturationSlider.remove
+      @valueSlider.remove
     end
 
     def add()
@@ -56,8 +58,8 @@ module Savio
       @innerCircle.add
       @outerCircle.add
       @knob.add
-      @mySaturation.add
-      @myValue.add
+      @saturationSlider.add
+      @valueSlider.add
     end
 
     def animate()
@@ -118,24 +120,27 @@ module Savio
     def setValue(angle)
       @knob.x = (@size).to_f * Math.cos((angle.to_f % 360.0) * Math::PI/180.0) + @x.to_f
       @knob.y = (@size).to_f * Math.sin((angle.to_f % 360.0) * Math::PI/180.0) + @y.to_f
-      @value = angle
 
-      hue = Savio.hsv2rgb(@value % 360,@mySaturation.value,@myValue.value)
-      @innerCircle.color.r = hue[0]
-      @innerCircle.color.g = hue[1]
-      @innerCircle.color.b = hue[2]
+      @color = HsvColor.new(angle % 360, @saturationSlider.value, @valueSlider.value)
+      @hue = @color[0]
+
+      rgb = RgbColor.newFromHSV(@color)
+      @innerCircle.color.r = rgb[0]
+      @innerCircle.color.g = rgb[1]
+      @innerCircle.color.b = rgb[2]
     end
 
     def rgb()
-      return Savio.hsv2rgb(@value % 360,@mySaturation.value,@myValue.value)
+      return RgbColor.newFromHSV(@color)
     end
 
     def hsv()
-      return [@value % 360, @mySaturation.value, @myValue.value]
+      return HsvColor.new(@color[0],@color[1],@color[2])
     end
 
     def hex()
-      return ("#%02x%02x%02x" % [rgb()[0]*255,rgb()[1]*255,rgb()[2]*255])
+      rgb = RgbColor.newFromHSV(@color)
+      return ("#%02x%02x%02x" % [rgb[0]*255,rgb[1]*255,rgb[2]*255])
     end
 
     def chord(placement)
@@ -176,7 +181,7 @@ module Savio
       )
 
       placement = chord(1.0)
-      @mySaturation = Slider.new(
+      @saturationSlider = Slider.new(
         displayName: "Saturation",
         labelColor: @textColor,
         x:@x - @size + placement.adjust + placement.margin,
@@ -190,7 +195,7 @@ module Savio
       )
 
       placement = chord(1.3)
-      @myValue = Slider.new(
+      @valueSlider = Slider.new(
         displayName: "Value",
         labelColor: @textColor,
         x:@x - @size + placement.adjust + placement.margin,
@@ -202,10 +207,18 @@ module Savio
         size: @size * 0.06,
         showValue: false
       )
-      @myValue.showValue=false
-      @mySaturation.showValue=false
+      @valueSlider.showValue=false
+      @saturationSlider.showValue=false
+
+      @valueSlider.onChange do
+        setValue(@hue)
+      end
+
+      @saturationSlider.onChange do
+        setValue(@hue)
+      end
 
-      setValue(@value)
+      setValue(@hue)
     end
   end
 end

data/lib/savio/Colors.rb

@@ -0,0 +1,13 @@
+module Savio
+  module Colors
+    White = '#FDFDFD'
+    Gray  = '#858585'
+    Black = '#1A1A1A'
+
+    Red    = '#FF728B'
+    Green  = '#28E457'
+    Blue   = '#28B2E4'
+    Yellow = '#FFED61'
+    Purple = '#FF90FF'
+  end
+end

data/lib/savio/InputBox.rb

@@ -26,11 +26,11 @@ module Savio
       @length = args[:length] || @size * 10
       @height = args[:height] || @size * 1.2
 
-      @color = args[:color] || '#F5F5F5'
-      @activeColor = args[:activeColor] || '#5BB36A'
+      @color = args[:color] || Savio::Colors::White
+      @activeColor = args[:activeColor] || Savio::Colors::Green
 
-      @activeTextColor = args[:activeTextColor] || '#F5F5F5'
-      @inactiveTextColor = args[:inactiveTextColor] || '#757575'
+      @activeTextColor = args[:activeTextColor] || Savio::Colors::White
+      @inactiveTextColor = args[:inactiveTextColor] || Savio::Colors::Gray
 
       build()
     end
@@ -152,7 +152,7 @@ module Savio
     def build()
       @shown = true
 
-      @display = Text.new(@value,x: @x,y: @y,z: @z + 1, size: @size, color: @inactiveTextColor)
+      @display = Text.new(@value,x: @x + 0.02 * @length,y: @y,z: @z + 1, size: @size, color: @inactiveTextColor)
       @height = @display.height * 1.1
 
       @container = Rectangle.new(x: @x, y: @y, z: @z, height: @height, width: @length, color: @color)

data/lib/savio/Slider.rb

@@ -25,13 +25,19 @@ module Savio
       @value = args[:value]     || rand(@min..@max)
       @showValue = args[:showValue] || true
 
-      @labelColor  = args[:labelColor]  || '#F5F5F5'
-      @sliderColor = args[:sliderColor] || '#757575'
-      @knobColor   = args[:knobColor]   || '#5BB36A'
+      @labelColor  = args[:labelColor]  || Savio::Colors::White
+      @sliderColor = args[:sliderColor] || Savio::Colors::Gray
+      @knobColor   = args[:knobColor]   || Savio::Colors::Green
+
+      @onChange = Proc.new {}
 
       build()
     end
 
+    def onChange(&proc)
+      @onChange = proc
+    end
+
     def style=(style)
       if style == 'knob' || style == 'fill'
         @style = style
@@ -91,6 +97,7 @@ module Savio
         if @showValue == true
           @label.text = @value.round(2).to_s
         end
+        @onChange.call
       end
     end
 

data/lib/savio/hsv2rgb.rb

@@ -1,36 +1,78 @@
 module Savio
-  def self.hsv2rgb(hue, saturation, value)
-
-    hue = hue.to_f
-    saturation = saturation.to_f
-    value = value.to_f
-
-    chroma = (value * saturation).to_f
-    hPrime = hue/60.0
-    x = (chroma * (1 - (hPrime % 2 - 1).abs)).to_f
-
-    if 0 <= hPrime && hPrime < 1
-      rgb = [chroma, x, 0]
-    elsif 1 <= hPrime && hPrime < 2
-      rgb = [x, chroma, 0]
-    elsif 2 <= hPrime && hPrime < 3
-      rgb = [0, chroma, x]
-    elsif 3 <= hPrime && hPrime < 4
-      rgb = [0, x, chroma]
-    elsif 4 <= hPrime && hPrime < 5
-      rgb = [x, 0, chroma]
-    elsif 5 <= hPrime && hPrime < 6
-      rgb = [chroma, 0, x]
-    else
-      rgb = [0,0,0]
+  RgbColor = Struct.new(:r, :g, :b) do
+    def self.newFromHSV(hsv)
+      rgb = hsv.to_rgb()
+      return RgbColor.new(rgb.r,rgb.g,rgb.b)
     end
+    def to_hsv()
+      max = [r, g, b].max
+      min = [r, g, b].min
+      delta = max - min
+      v = max
 
-    match = (value - chroma).to_f
+      if (max != 0.0)
+        s = delta / max
+      else
+        s = 0.0
+      end
 
-    rgb[0] = (rgb[0] + match).to_f
-    rgb[1] = (rgb[1] + match).to_f
-    rgb[2] = (rgb[2] + match).to_f
+      if (s == 0.0)
+        h = 0.0
+      else
+        if (r == max)
+          h = 0 + (g - b) / delta
+        elsif (g == max)
+          h = 2 + (b - r) / delta
+        elsif (b == max)
+          h = 4 + (r - g) / delta
+        end
 
-    return rgb
+        h *= 60.0
+
+        if (h < 0)
+          h += 360.0
+        end
+      end
+      return HsvColor.new(h,s,v)
+    end
+  end
+  HsvColor = Struct.new(:h, :s, :v) do
+    def self.newFromRGB(rgb)
+      hsv = rgb.to_hsv()
+      return HsvColor.new(hsv.h,hsv.s,hsv.v)
+    end
+    def to_rgb()
+      hue = h.to_f
+      saturation = s.to_f
+      value = v.to_f
+
+      chroma = (value * saturation).to_f
+      hPrime = hue/60.0
+      x = (chroma * (1 - (hPrime % 2 - 1).abs)).to_f
+
+      if 0 <= hPrime && hPrime < 1
+        rgb = [chroma, x, 0]
+      elsif 1 <= hPrime && hPrime < 2
+        rgb = [x, chroma, 0]
+      elsif 2 <= hPrime && hPrime < 3
+        rgb = [0, chroma, x]
+      elsif 3 <= hPrime && hPrime < 4
+        rgb = [0, x, chroma]
+      elsif 4 <= hPrime && hPrime < 5
+        rgb = [x, 0, chroma]
+      elsif 5 <= hPrime && hPrime < 6
+        rgb = [chroma, 0, x]
+      else
+        rgb = [0,0,0]
+      end
+
+      match = (value - chroma).to_f
+
+      rgb[0] = (rgb[0] + match).to_f
+      rgb[1] = (rgb[1] + match).to_f
+      rgb[2] = (rgb[2] + match).to_f
+
+      return RgbColor.new(rgb[0],rgb[1],rgb[2])
+    end
   end
 end

data/lib/savio/version.rb

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

data/test.rb

@@ -0,0 +1,9 @@
+require 'savio'
+
+$colorSlider = ColorSlider.new(x: 200, y:200)
+
+update do
+  puts $colorSlider.hsv
+end
+
+show()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: savio
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - TheRealSavi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2d
@@ -42,10 +42,10 @@ files:
 - bin/setup
 - lib/.DS_Store
 - lib/savio.rb
-- lib/savio/.DS_Store
 - lib/savio/Button.rb
 - lib/savio/ButtonManager.rb
 - lib/savio/ColorSlider.rb
+- lib/savio/Colors.rb
 - lib/savio/IORenderable.rb
 - lib/savio/InputBox.rb
 - lib/savio/Scene.rb
@@ -54,6 +54,7 @@ files:
 - lib/savio/io.rb
 - lib/savio/version.rb
 - savio.gemspec
+- test.rb
 homepage: http://www.gibbonsiv.com
 licenses:
 - MIT