savio 0.1.3 → 0.1.6

data/lib/savio/Scene.rb

@@ -1,55 +1,55 @@
-module Savio
-  class Scene
-    attr_accessor :elements
-    def initialize(file, color = 'black')
-      @file = file
-      @color = color
-      show()
-    end
-
-    def show()
-      @bg = Square.new(x: 0, y: 0, z: 999, size: Window.width+1, color: @color)
-      @elements = []
-      content = File.read(@file)
-      content = content.gsub('[', "").gsub(']', "").gsub('"',"").chomp.split(",")
-
-      (content.count-1).times do |i|
-        if (i % 2) == 0
-          classType = Object.const_get(content[i].gsub(" ",""))
-          hash = content[i+1].gsub(';', ',').gsub('"',"").chomp
-          pairs = hash.split(",").to_s.gsub('"',"").chomp
-          keypair = pairs.split("=>").to_s.gsub('"',"").chomp
-          new = keypair.gsub('{', "").gsub('}', "").gsub('[', "").gsub(']', "").gsub('"',"").gsub(" ","").chomp.split(",")
-          build = {}
-          (new.count-1).times do |j|
-            if (j % 2) == 0
-              case Savio.guessType(new[j+1].chomp)
-              when "int"
-                value = new[j+1].chomp.to_i
-              when "float"
-                value = new[j+1].chomp.to_f
-              when "str"
-                value = new[j+1].chomp.to_s
-              when "bool"
-                value = Savio.makeBool(new[j+1].chomp)
-              end
-              build[new[j].intern] = value
-            end
-          end
-          puts "SCENE: " + @file.to_s + build.to_s
-          @elements.push(classType.new(build))
-        end
-      end
-      @elements.each do |e|
-        e.z = 1000
-      end
-    end
-
-    def remove()
-      @bg.remove
-      @elements.each do |e|
-        e.kill()
-      end
-    end
-  end
-end
+module Savio
+  class Scene
+    attr_accessor :elements
+    def initialize(file, color = 'black')
+      @file = file
+      @color = color
+      show()
+    end
+
+    def show()
+      @bg = Square.new(x: 0, y: 0, z: 999, size: Window.width+1, color: @color)
+      @elements = []
+      content = File.read(@file)
+      content = content.gsub('[', "").gsub(']', "").gsub('"',"").chomp.split(",")
+
+      (content.count-1).times do |i|
+        if (i % 2) == 0
+          classType = Object.const_get(content[i].gsub(" ",""))
+          hash = content[i+1].gsub(';', ',').gsub('"',"").chomp
+          pairs = hash.split(",").to_s.gsub('"',"").chomp
+          keypair = pairs.split("=>").to_s.gsub('"',"").chomp
+          new = keypair.gsub('{', "").gsub('}', "").gsub('[', "").gsub(']', "").gsub('"',"").gsub(" ","").chomp.split(",")
+          build = {}
+          (new.count-1).times do |j|
+            if (j % 2) == 0
+              case Savio.guessType(new[j+1].chomp)
+              when "int"
+                value = new[j+1].chomp.to_i
+              when "float"
+                value = new[j+1].chomp.to_f
+              when "str"
+                value = new[j+1].chomp.to_s
+              when "bool"
+                value = Savio.makeBool(new[j+1].chomp)
+              end
+              build[new[j].intern] = value
+            end
+          end
+          puts "SCENE: " + @file.to_s + build.to_s
+          @elements.push(classType.new(build))
+        end
+      end
+      @elements.each do |e|
+        e.z = 1000
+      end
+    end
+
+    def remove()
+      @bg.remove
+      @elements.each do |e|
+        e.kill()
+      end
+    end
+  end
+end

data/lib/savio/Slider.rb

@@ -1,188 +1,195 @@
-module Savio
-  class Slider
-    include IORenderable
-
-    attr_reader :length, :min, :max, :size, :value
-
-    @@sliders = []
-    def self.sliders
-      @@sliders
-    end
-
-    def initialize(args = {})
-      @@sliders.push(self)
-      super(args)
-
-      @length = args[:length]   || 100
-      @min = args[:min]         || 0
-      @max = args[:max]         || 100
-
-      @style = args[:style] || 'knob'
-      if @style != 'knob' && @style != 'fill'
-        @style = 'knob'
-      end
-
-      @value = args[:value]     || rand(@min..@max)
-      @showValue = args[:showValue] || true
-
-      @labelColor  = args[:labelColor]  || '#F5F5F5'
-      @sliderColor = args[:sliderColor] || '#757575'
-      @knobColor   = args[:knobColor]   || '#5BB36A'
-
-      build()
-    end
-
-    def style=(style)
-      if style == 'knob' || style == 'fill'
-        @style = style
-        rebuild()
-      end
-    end
-    def length=(length)
-      @length = length.clamp(1, Window.width-@x)
-      rebuild()
-    end
-    def showValue=(state)
-      @showValue = state
-      rebuild()
-    end
-    def labelColor=(c)
-      @labelColor = c
-      rebuild()
-    end
-    def sliderColor=(c)
-      @sliderColor = c
-      rebuild()
-    end
-    def knobColor=(c)
-      @knobColor = c
-      rebuild()
-    end
-    def min=(x)
-      @min = x
-      setValue(@value)
-    end
-    def max=(x)
-      @max = x
-      setValue(@value)
-    end
-
-    def renderKnobTo(x)
-      if x.between?(@x, @x+@length)
-        case @style
-        when 'knob'
-          @knob.x = x
-        when 'fill'
-          @knob.width = x - @x
-        end
-      end
-    end
-
-    def moveKnob(x)
-      if x.between?(@x, @x+@length)
-        renderKnobTo(x)
-
-        to_max = @max
-        to_min = @min
-        from_max = @x + @length
-        from_min = @x
-        pos = x
-        @value = (((to_max - to_min) * (pos - from_min)) / (from_max - from_min) + to_min)
-        if @showValue == true
-          @label.text = @value.round(2).to_s
-        end
-      end
-    end
-
-    def value=(value)
-      setValue(value)
-    end
-
-    def setValue(value)
-      if value.between?(@min, @max)
-        to_max = @x + @length
-        to_min = @x
-        from_max = @max.to_f
-        from_min = @min.to_f
-        pos = value
-        knobX = (((to_max - to_min) * (pos - from_min)) / (from_max - from_min) + to_min)
-        @value = value
-        if @showValue == true
-          @label.text = @value.round(2).to_s
-        end
-        renderKnobTo(knobX)
-      else
-        setValue(@min)
-      end
-    end
-
-    def remove()
-      super()
-      @sliderLine.remove
-      @knob.remove
-      @label.remove
-      @nameLabel.remove
-    end
-
-    def add()
-      super()
-      @sliderLine.add
-      @knob.add
-      @label.add
-      @nameLabel.add
-    end
-
-    def build()
-      @shown = true
-
-      @sliderLine = Line.new(
-        x1: @x, y1: @y,
-        x2: @x+@length, y2: @y,
-        width: @size,
-        color: @sliderColor,
-        z: @z
-      )
-
-      case @style
-      when 'knob'
-        @knob = Circle.new(
-          x: @x, y: @y,
-          radius: @size * 1.2,
-          color: @knobColor,
-          z: @z+1
-        )
-      when 'fill'
-        @knob = Rectangle.new(
-          x: @x, y: @y,
-          width: 0 , height: @size,
-          color: @knobColor,
-          z: @z+1
-        )
-      end
-
-      @label = Text.new(
-        @value.to_s,
-        x: @x + @length + @size, y: @y - @size * 1.75,
-        size: @size * 2.5,
-        color: @labelColor,
-        z: @z+1
-      )
-
-      @label.y = @y + @sliderLine.width / 2 - @label.height / 2
-
-      @nameLabel = Text.new(
-        @displayName.to_s,
-        x: @x, y: @y - @size * 3 - @size,
-        size: @size * 2.5,
-        color: @labelColor,
-        z: @z+2
-      )
-
-      setValue(@value)
-
-      if @showValue == false
-        @label.remove
-      end
-    end
-  end
-end
+module Savio
+  class Slider
+    include IORenderable
+
+    attr_reader :length, :min, :max, :size, :value
+
+    @@sliders = []
+    def self.sliders
+      @@sliders
+    end
+
+    def initialize(args = {})
+      @@sliders.push(self)
+      super(args)
+
+      @length = args[:length]   || 100
+      @min = args[:min]         || 0
+      @max = args[:max]         || 100
+
+      @style = args[:style] || 'knob'
+      if @style != 'knob' && @style != 'fill'
+        @style = 'knob'
+      end
+
+      @value = args[:value]     || rand(@min..@max)
+      @showValue = args[:showValue] || true
+
+      @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
+        rebuild()
+      end
+    end
+    def length=(length)
+      @length = length.clamp(1, Window.width-@x)
+      rebuild()
+    end
+    def showValue=(state)
+      @showValue = state
+      rebuild()
+    end
+    def labelColor=(c)
+      @labelColor = c
+      rebuild()
+    end
+    def sliderColor=(c)
+      @sliderColor = c
+      rebuild()
+    end
+    def knobColor=(c)
+      @knobColor = c
+      rebuild()
+    end
+    def min=(x)
+      @min = x
+      setValue(@value)
+    end
+    def max=(x)
+      @max = x
+      setValue(@value)
+    end
+
+    def renderKnobTo(x)
+      if x.between?(@x, @x+@length)
+        case @style
+        when 'knob'
+          @knob.x = x
+        when 'fill'
+          @knob.width = x - @x
+        end
+      end
+    end
+
+    def moveKnob(x)
+      if x.between?(@x, @x+@length)
+        renderKnobTo(x)
+
+        to_max = @max
+        to_min = @min
+        from_max = @x + @length
+        from_min = @x
+        pos = x
+        @value = (((to_max - to_min) * (pos - from_min)) / (from_max - from_min) + to_min)
+        if @showValue == true
+          @label.text = @value.round(2).to_s
+        end
+        @onChange.call
+      end
+    end
+
+    def value=(value)
+      setValue(value)
+    end
+
+    def setValue(value)
+      if value.between?(@min, @max)
+        to_max = @x + @length
+        to_min = @x
+        from_max = @max.to_f
+        from_min = @min.to_f
+        pos = value
+        knobX = (((to_max - to_min) * (pos - from_min)) / (from_max - from_min) + to_min)
+        @value = value
+        if @showValue == true
+          @label.text = @value.round(2).to_s
+        end
+        renderKnobTo(knobX)
+      else
+        setValue(@min)
+      end
+    end
+
+    def remove()
+      super()
+      @sliderLine.remove
+      @knob.remove
+      @label.remove
+      @nameLabel.remove
+    end
+
+    def add()
+      super()
+      @sliderLine.add
+      @knob.add
+      @label.add
+      @nameLabel.add
+    end
+
+    def build()
+      @shown = true
+
+      @sliderLine = Line.new(
+        x1: @x, y1: @y,
+        x2: @x+@length, y2: @y,
+        width: @size,
+        color: @sliderColor,
+        z: @z
+      )
+
+      case @style
+      when 'knob'
+        @knob = Circle.new(
+          x: @x, y: @y,
+          radius: @size * 1.2,
+          color: @knobColor,
+          z: @z+1
+        )
+      when 'fill'
+        @knob = Rectangle.new(
+          x: @x, y: @y,
+          width: 0 , height: @size,
+          color: @knobColor,
+          z: @z+1
+        )
+      end
+
+      @label = Text.new(
+        @value.to_s,
+        x: @x + @length + @size, y: @y - @size * 1.75,
+        size: @size * 2.5,
+        color: @labelColor,
+        z: @z+1
+      )
+
+      @label.y = @y + @sliderLine.width / 2 - @label.height / 2
+
+      @nameLabel = Text.new(
+        @displayName.to_s,
+        x: @x, y: @y - @size * 3 - @size,
+        size: @size * 2.5,
+        color: @labelColor,
+        z: @z+2
+      )
+
+      setValue(@value)
+
+      if @showValue == false
+        @label.remove
+      end
+    end
+  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]
-    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 rgb
-  end
-end
+module Savio
+  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
+
+      if (max != 0.0)
+        s = delta / max
+      else
+        s = 0.0
+      end
+
+      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
+
+        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