rubyshop 0.0.1 → 0.0.2

data/lib/rubyshop.rb

@@ -1,37 +1,8 @@
 require 'rmagick'
 
-require 'rubyshop/canvas'
 require 'rubyshop/layerset'
 require 'rubyshop/layer'
+require 'rubyshop/canvas'
 require 'rubyshop/filllayer'
 require 'rubyshop/adjustmentlayer'
-
-module Rubyshop
-  # Layer mode constants 
-  #   some of photoshops layer modes are directly equvilent to RMagick 
-  #   some are not, and some arent supported at all.
-
-  Normal = Magick::OverCompositeOp # PS equivilent
-  Dissolve = Magick::DissolveCompositeOp
-  Darken = Magick::DarkenCompositeOp # PS equivilent
-  Multiply = Magick::MultiplyCompositeOp # PS equivilent
-  #ColorBurn
-  #LinearBurn
-  Lighten = Magick::LightenCompositeOp # PS equivilent
-  Screen = Magick::ScreenCompositeOp # PS equivilent
-  #ColorDodge
-  #LinearDodge
-  Overlay = Magick::OverlayCompositeOp # PS equivilent
-  #SoftLight
-  #HardLight
-  #VividLight
-  #LinearLight
-  #PinLight
-  #HardMix
-  Difference = Magick::DifferenceCompositeOp # PS equivilent
-  #Exclusion
-  Hue = Magick::HueCompositeOp
-  Saturation = Magick::SaturateCompositeOp
-  Color = Magick::ColorizeCompositeOp
-  Luminosity = Magick::LuminizeCompositeOp
-end
+require 'rubyshop/layermask'

data/lib/rubyshop/adjustmentlayer.rb

@@ -1,4 +1,48 @@
 module Rubyshop
+  Levels = 1
+  Curves = 2
+  ColorBalance = 3
+  BrightnessContrast = 4
+  HueSaturation = 5
+  SelectiveColor = 6
+  ChannelMixer = 7
+  GradientMap = 8
+  PhotoFilter = 9
+  Invert = 10 # negate
+  Threshold = 11 # threshold
+  Polarize = 12 # 
+  Blur = 13
+
   class AdjustmentLayer < Layer
+    attr_reader :type, :args
+    
+    def initialize(type, *args, &block)
+      @type = type
+      @args = args
+      @mode = Normal
+      @offset_x = 0
+      @offset_y = 0
+      @opacity_percent = 100
+      @layer_mask = nil
+      
+      case type
+        when Invert
+          @proc = proc { negate }
+        when Threshold    
+          @proc = proc { threshold *args }
+        when Levels
+          @proc = proc { level *args }
+        when Blur
+          @proc = proc { gaussian_blur *args }
+      end
+      @proc = proc { |*args| @proc }.call(*@args)
+    end
+
+    def merge_down(image)
+      @image = image.clone.instance_eval &@proc
+      @image.matte = true
+
+      super(image)
+    end
   end
 end

data/lib/rubyshop/canvas.rb

@@ -1,78 +1,16 @@
 module Rubyshop
-  class Canvas
+  class Canvas < LayerSet
     attr_reader :width, :height
+    attr_accessor :image
 
     def initialize(width, height, &block)
       @image = Magick::Image.new width, height
       @width = width
       @height = height
-      @layers = []
-      @sets = {}
+      $RubyshopCanvasWidth = @width
+      $RubyshopCanvasHeight = @height
 
-      self.instance_eval &block if block_given?
-    end
-
-    def layer_set(name, &block)
-      if name.is_a? Rubyshop::LayerSet
-        set = name
-        @layers << set
-        @sets[set.name] = set 
-      elsif @sets[name]
-        set = @sets[name]
-      else
-        set = LayerSet.new name  
-        @layers << set
-        @sets[name] = set
-      end
-
-      set.instance_eval &block if block_given?
-
-      return set
-    end
-    
-    def layer(filename, &block)
-      layer = Layer.new filename
-      @layers << layer
-
-      layer.instace_eval &block if block_given?
-    
-      return layer
-    end
-    
-    def flatten
-      layers = @layers
-      layers.reverse.each do |layer|
-        if layer.is_a? Rubyshop::Layer
-          @image.composite!(layer.image, layer.offset_x, layer.offset_y, layer.mode)
-        elsif layer.is_a? Rubyshop::LayerSet
-          layer.layers.reverse.each do |set_layer|
-            image.composite!(set_layer.image, set_layer.offset_x, set_layer.offset_y, set_layer.mode)
-          end
-        end
-        @layers.delete(layer) 
-      end
-    end
-
-    def render
-      image = @image
-      @layers.reverse.each do |layer|
-        if layer.is_a? Rubyshop::Layer
-          image.composite!(layer.image, layer.offset_x, layer.offset_y, layer.mode)
-        elsif layer.is_a? Rubyshop::LayerSet
-          layer.layers.reverse.each do |set_layer|
-            image.composite!(set_layer.image, set_layer.offset_x, set_layer.offset_y, set_layer.mode)
-          end
-        elsif layer.is_a? Rubyshop::AdjustmentLayer
-          # nothing to do 
-        elsif layer.is_a? Rubyshop::FillLayer
-          # nother to do
-        end
-      end
-      return image
-    end
-  
-    def save_as(filename)
-      render.write(filename)
+      super(:canvas, &block)
     end
   end
 end

data/lib/rubyshop/filllayer.rb

@@ -1,4 +1,44 @@
 module Rubyshop
+  # Fill layer types
+
+  SolidColor = 0
+  Gradient = 1
+  Pattern = 2
+  
   class FillLayer < Layer
+    attr_accessor :image
+    attr_reader :offset_x, :offset_y
+
+    def initialize(type, *args, &block)
+      case type
+        when SolidColor
+          color = args[0]
+
+          fill = Magick::GradientFill.new(0, 0, 0, 0, color, color)
+          
+        when Gradient
+          x1 = args[0]
+          y1 = args[1]
+          x2 = args[2]
+          y2 = args[3]
+          color1 = args[4]
+          color2 = args[5]
+
+          fill = Magick::GradientFill.new(x1, y1, x2, y2, color1, color2)
+        
+        when Pattern
+          image = args[0]
+
+          fill = Magick::TextureFill.new(image)
+      end
+
+      @image = Magick::Image.new($RubyshopCanvasWidth, $RubyshopCanvasHeight, fill)
+
+      @image.matte = true
+      @mode = Normal
+      @offset_x = 0
+      @offset_y = 0
+      @opacity_percent = 100
+    end
   end
 end

data/lib/rubyshop/layer.rb

@@ -1,17 +1,70 @@
 module Rubyshop
+  # Layer mode constants 
+  #   some of photoshops layer modes are directly equvilent to RMagick 
+  #   some are not, and some arent supported at all.
+
+  Normal = Magick::OverCompositeOp # PS equivilent
+  Dissolve = Magick::DissolveCompositeOp
+  Darken = Magick::DarkenCompositeOp # PS equivilent
+  Multiply = Magick::MultiplyCompositeOp # PS equivilent
+  #ColorBurn
+  #LinearBurn
+  Lighten = Magick::LightenCompositeOp # PS equivilent
+  Screen = Magick::ScreenCompositeOp # PS equivilent
+  #ColorDodge
+  #LinearDodge
+  Overlay = Magick::OverlayCompositeOp # PS equivilent
+  #SoftLight
+  #HardLight
+  #VividLight
+  #LinearLight
+  #PinLight
+  #HardMix
+  Difference = Magick::DifferenceCompositeOp # PS equivilent
+  #Exclusion
+  Hue = Magick::HueCompositeOp
+  Saturation = Magick::SaturateCompositeOp
+  Color = Magick::ColorizeCompositeOp
+  Luminosity = Magick::LuminizeCompositeOp
+  
   class Layer
-    attr_accessor :image, :name
+    attr_accessor :image
     attr_reader :offset_x, :offset_y
 
-    def initialize(filename)
-      @image = Magick::Image.read(filename).first
-      @image.background_color = 'transparent'
-      @image.matte = true
-      @mode = Normal
-      @offset_x = 0
-      @offset_y = 0
-      @opacity_percent = 100
-      @name = filename
+    def initialize(options = {})
+      if options[:file]
+        @image = Magick::Image.read(options[:file]).first
+        @image.background_color = 'transparent'
+      elsif options[:blob]
+        @image = Magick::Image.from_blob(options[:blob]).first
+        @image.background_color = 'transparent'
+      elsif options[:image]
+        if options[:image].is_a? Magick::Image
+          @image = options[:image]
+        end
+      end
+
+      if @image
+        @image.matte = true
+        @mode = Normal
+        @offset_x = 0
+        @offset_y = 0
+        @opacity_percent = 100
+        @layer_mask = nil
+      else
+        raise "Layer not created -- no layer source."
+      end
+    end
+
+    def layer_mask(options, &block)
+      @layer_mask = LayerMask.new options
+      
+      @layer_mask.instance_eval &block if block_given?
+    end
+
+    def merge_down(image)
+      @layer_mask.apply self if @layer_mask
+      image.composite!(@image, @offset_x, @offset_y, @mode)
     end
 
     def width
@@ -39,6 +92,7 @@ module Rubyshop
       return true
     end
 
+
     def mode(mode = nil)
       return @mode if mode.nil?
       @mode = mode
@@ -55,5 +109,6 @@ module Rubyshop
     def leave_set(set)
       set.remove_layer(self)
     end
+
   end
 end

data/lib/rubyshop/layermask.rb

@@ -0,0 +1,16 @@
+module Rubyshop
+  class LayerMask < Layer
+    def apply(layer)
+      # apply layer mask to layer before merging down
+      fill = Magick::GradientFill.new(0,0,0,0, '#000', '#000')
+      mask = Magick::Image.new(layer.width, layer.height, fill)
+      mask.composite!(@image, @offset_x, @offset_y, Magick::OverCompositeOp)
+      
+      alpha_channel = layer.image.channel(Magick::AlphaChannel).negate
+      alpha_channel.composite!(mask, 0, 0, Magick::MultiplyCompositeOp)
+      alpha_channel.matte = false
+      layer.image.composite!(alpha_channel, 0, 0, Magick::CopyOpacityCompositeOp)
+    end
+  
+  end
+end

data/lib/rubyshop/layerset.rb

@@ -3,22 +3,108 @@ module Rubyshop
     attr_accessor :layers
     attr_reader :min_x, :min_y, :max_x, :max_y, :bounding_width, :bounding_height, :name
     
-    def initialize(name)
+    def initialize(name, &block)
       @layers = []
+      @layer_sets = {}
+
       bounding_box
       @name = name
-      yield self if block_given?
+
+      self.instance_eval &block if block_given?
     end
 
-    def layer(filename, &block)
-      layer = Layer.new(filename)
+    def layer_set(set_or_name, &block) 
+      if set_or_name.is_a? Rubyshop::LayerSet
+        # referencing a previously instanstiated LayerSet and adding to Canvas.
+        set = set_or_name
+        @layers << set
+        @layer_sets[set.name] = set 
+      
+      elsif @layer_sets[set_or_name]
+        # referencing a previously added LayerSet.
+        set = @layer_sets[set_or_name]
+      
+      else    
+        # creating a new LayerSet and adding to Canvas.
+        set = LayerSet.new set_or_name  
+        @layers << set
+        @layer_sets[set_or_name] = set
+      end     
+
+      # tie floating block methods (layer, rotate, offset, etc) to LayerSet object.
+      set.instance_eval &block if block_given?
+
+      return set
+    end
+    
+    def layer(options, &block) 
+      if options.is_a? Rubyshop::Layer
+        layer = options
+      else
+        layer = Layer.new options
+      end
+      @layers << layer
+
+      # tie floating block methods (opacity, mode, offset, etc) to Layer object.
+      layer.instance_eval &block if block_given?
+
+      return layer
+    end
+
+    def fill_layer(type, *args, &block)
+      layer = FillLayer.new type, *args
       @layers << layer
 
-      layer.instance_eval &block
+      # tie floating block methods (opacity, mode, offset, etc) to Layer object.
+      layer.instance_eval &block if block_given?
 
       return layer
     end
 
+    def adjustment_layer(type, *args, &block) 
+      layer = AdjustmentLayer.new type, *args
+      @layers << layer
+
+      # tie floating block methods (opacity, mode, offset, etc) to Layer object.
+      layer.instance_eval &block if block_given?
+    
+      return layer
+    end
+    
+    def flatten
+      flattened_image = render
+      
+      # clear layers and sets
+      @layers.clear
+      @layer_sets.clear
+
+      # only 1 flattened layer now   
+      @layers << Layer.new(flattened_image)
+   end
+
+    def render
+      return composite_layers(@image.clone, @layers)
+    end
+
+    def composite_layers(image, layers) 
+      layers.reverse.each do |layer| 
+        case layer
+          when Rubyshop::LayerSet
+            image = composite_layers image, layer.layers
+          when Rubyshop::Layer
+            layer.merge_down image
+        end     
+      end     
+      
+      return image
+    end
+  
+    def save_as(filename)
+      render.write(filename)
+    end
+
+################################################################################################################################
+
     def add_layer(layer)
       @layers << layer
       bounding_box

data/lib/rubyshop/rubyshop.rb

@@ -0,0 +1,7 @@
+require 'rmagick'
+
+require 'rubyshop/canvas'
+require 'rubyshop/layerset'
+require 'rubyshop/layer'
+require 'rubyshop/filllayer'
+require 'rubyshop/adjustmentlayer'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rubyshop
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2006-11-06 00:00:00 -05:00
+  version: 0.0.2
+date: 2006-11-10 00:00:00 -05:00
 summary: Powerful layer based image compositing made easy as pie.
 require_paths: 
 - lib
@@ -34,7 +34,9 @@ files:
 - lib/rubyshop/canvas.rb
 - lib/rubyshop/filllayer.rb
 - lib/rubyshop/layer.rb
+- lib/rubyshop/layermask.rb
 - lib/rubyshop/layerset.rb
+- lib/rubyshop/rubyshop.rb
 - LICENSE
 test_files: []