jenncad 1.0.0.pre.alpha1 → 1.0.0.pre.alpha2

data/lib/jenncad/shortcuts.rb

@@ -54,56 +54,47 @@ module JennCad
     UnionObject.new(*args)
   end
 
-  def +(args)
-    return args if self == nil
-    if self.kind_of?(UnionObject) && self.transformations.size == 0
-      self.add(args)
-      return self
-    else
-      UnionObject.new(self,args)
-    end
-  end
-
   def subtraction(*args)
     SubtractObject.new(*args)
   end
 
-  def -(args)
-    if self.kind_of?(SubtractObject) && self.transformations.size == 0
-      self.add(args)
-      return self
-    else
-      SubtractObject.new(self,args)
-    end
-  end
-
   def intersection(*args)
     IntersectionObject.new(*args)
   end
 
-  def *(args)
-    if self.kind_of?(IntersectionObject) && self.transformations.size == 0
-      self.add(args)
-      return self
-    else
-      IntersectionObject.new(self,args)
-    end
-  end
-
   def hull(*args)
     HullObject.new(*args)
   end
 
-  def &(args)
-    if self.kind_of?(HullObject) && self.transformations.size == 0
-      self.add(args)
-      return self
-    else
-      HullObject.new(self,args)
-    end
+  def +(part)
+    boolean_operation(part, UnionObject)
+  end
+
+  def -(part)
+    boolean_operation(part, SubtractObject)
+  end
+
+  def *(part)
+    boolean_operation(part, IntersectionObject)
+  end
+
+  def &(part)
+    boolean_operation(part, HullObject)
   end
 
   def assemble(partlib=nil, z_skip = false, z=0, &block)
     block.yield.assemble(partlib, z_skip, z)
   end
+
+  private
+  def boolean_operation(part, klass)
+    case self
+    when nil
+      part
+    when klass
+      add_or_new(part)
+    else
+      klass.new(self,part)
+    end
+  end
 end

data/lib/jenncad/thing.rb

@@ -3,7 +3,7 @@ module JennCad
     attr_accessor :opts
     attr_accessor :parts
     attr_accessor :transformations, :name
-    attr_accessor :x, :y, :z, :diameter
+    attr_accessor :x, :y, :diameter
     attr_accessor :calc_x, :calc_y, :calc_z, :calc_h
     attr_accessor :shape
     attr_accessor :angle, :cut, :fn
@@ -35,37 +35,41 @@ module JennCad
     end
     alias :rt :rotate
 
-    def center
-      return @center if @center
-      case shape.to_s
-        when "cube"
-          [@x/2.0,@y/2.0,@z/2.0]
-        when "cylinder"
-          [0,0,@z/2.0]
-      else
-        [0,0,0]
-      end
+    def rx(v)
+      rt(x:v)
     end
 
-    def flip_x
-      if self.kind_of?(BooleanObject)
+    def ry(v)
+      rt(y:v)
+    end
+
+    def rz(v)
+      rt(z:v)
+    end
+
+    def flip(direction)
+      case self
+      when BooleanObject
         ref = self.parts.first
       else
         ref = self
       end
 
-      self.rotate(y:90).moveh(x: -ref.z, z: ref.x)
+      case direction
+      when :x
+        self.ry(90).mh(x: -ref.z, z: ref.x)
+      when :y
+        self.rx(90).mh(y: ref.z, z: ref.y)
+      end
+    end
+
+    def flip_x
+      flip(:x)
     end
     alias :fx :flip_x
 
     def flip_y
-      if self.kind_of?(BooleanObject)
-        ref = self.parts.first
-      else
-        ref = self
-      end
-
-      self.rotate(x:90).moveh(y: ref.z, z: ref.y)
+      flip(:y)
     end
     alias :fy :flip_y
 
@@ -243,14 +247,26 @@ module JennCad
     end
 
     def color(args=nil)
-      return option(:color) if args == nil
-      if args == :auto
+      case args
+      when nil
+        return option(:color)
+      when :auto
         return auto_color!
-      elsif args == :none
+      when :none
         set_option :no_auto_color, true
-        return self
+      when :random
+        set_option :color, Color.random
+      when Array
+        set_option :color, Color.parse(args)
+      when /(?<=#)(?<!^)(\h{6}|\h{3})/
+        set_option :color, args
+      when /(?<!^)(\h{6}|\h{3})/
+        set_option :color, "##{args}"
+      when String
+        set_option :color, args
+      else
+        puts "meow"
       end
-      set_option :color, args
       self
     end
 
@@ -273,14 +289,10 @@ module JennCad
       if @parts == nil
         if self.respond_to? :part
           @parts = [part]
-        else
-          # FIXME: -> move logic OpenScad
-          #puts "[Error in openscad export] Could not find @parts or part for #{self}"
-          #exit
         end
       end
 
-      OpenScad.new(self).save(file)
+      JennCad::Exporters::OpenScad.new(self).save(file)
     end
 
     def referenced_z
@@ -289,19 +301,27 @@ module JennCad
      return false
     end
 
+    def z=(args)
+      set_option(:z, args)
+      @z = args
+    end
+
     def z
-      ref = referenced_z
-      if ref
-        return ref.z.to_f + ref.z_margin.to_f
+      case ref = referenced_z
+      when nil, false
+        @z + z_margin
+      else
+        ref.z.to_f + ref.z_margin.to_f
       end
-      @z
     end
 
     def z_margin
-      if option(:margins)
-        return option(:margins)[:z].to_f
+      case m = option(:margins)
+      when nil, {}
+        0.0
+      else
+        m[:z].to_f
       end
-      0.0
     end
 
   end

data/lib/jenncad/transformation/color.rb

@@ -4,5 +4,184 @@ module JennCad
     def initialize(args)
       @color = args
     end
+
+    def self.parse(a)
+      case a
+      when Array
+        check_color_array(a)
+      else
+        a
+      end
+    end
+
+    def self.check_color_array(a)
+      if a.max > 1.0
+        a.map{|l| l.to_f/255.0}
+      else
+        a
+      end
+    end
+
+    def self.random
+      named_colors.random
+    end
+
+    def self.named_colors
+      named_color_values.map{|k,v| k}
+    end
+
+    def self.named_color_values
+    {
+      aliceblue: [240,248,255,0],
+      antiquewhite: [250,235,215,0],
+      aqua: [0,255,255,0],
+      aquamarine: [127,255,212,0],
+      azure: [240,255,255,0],
+      beige: [245,245,220,0],
+      bisque: [255,228,196,0],
+      black: [0,0,0,0],
+      blanchedalmond: [255,235,205,0],
+      blue: [0,0,255,0],
+      blueviolet: [138,43,226,0],
+      brown: [165,42,42,0],
+      burlywood: [222,184,135,0],
+      cadetblue: [95,158,160,0],
+      chartreuse: [127,255,0,0],
+      chocolate: [210,105,30,0],
+      coral: [255,127,80,0],
+      cornflowerblue: [100,149,237,0],
+      cornsilk: [255,248,220,0],
+      crimson: [220,20,60,0],
+      cyan: [0,255,255,0],
+      darkblue: [0,0,139,0],
+      darkcyan: [0,139,139,0],
+      darkgoldenrod: [184,134,11,0],
+      darkgray: [169,169,169,0],
+      darkgreen: [0,100,0,0],
+      darkgrey: [169,169,169,0],
+      darkkhaki: [189,183,107,0],
+      darkmagenta: [139,0,139,0],
+      darkolivegreen: [85,107,47,0],
+      darkorange: [255,140,0,0],
+      darkorchid: [153,50,204,0],
+      darkred: [139,0,0,0],
+      darksalmon: [233,150,122,0],
+      darkseagreen: [143,188,143,0],
+      darkslateblue: [72,61,139,0],
+      darkslategray: [47,79,79,0],
+      darkslategrey: [47,79,79,0],
+      darkturquoise: [0,206,209,0],
+      darkviolet: [148,0,211,0],
+      deeppink: [255,20,147,0],
+      deepskyblue: [0,191,255,0],
+      dimgray: [105,105,105,0],
+      dimgrey: [105,105,105,0],
+      dodgerblue: [30,144,255,0],
+      firebrick: [178,34,34,0],
+      floralwhite: [255,250,240,0],
+      forestgreen: [34,139,34,0],
+      fuchsia: [255,0,255,0],
+      gainsboro: [220,220,220,0],
+      ghostwhite: [248,248,255,0],
+      gold: [255,215,0,0],
+      goldenrod: [218,165,32,0],
+      gray: [128,128,128,0],
+      green: [0,128,0,0],
+      greenyellow: [173,255,47,0],
+      grey: [128,128,128,0],
+      honeydew: [240,255,240,0],
+      hotpink: [255,105,180,0],
+      indianred: [205,92,92,0],
+      indigo: [75,0,130,0],
+      ivory: [255,255,240,0],
+      khaki: [240,230,140,0],
+      lavender: [230,230,250,0],
+      lavenderblush: [255,240,245,0],
+      lawngreen: [124,252,0,0],
+      lemonchiffon: [255,250,205,0],
+      lightblue: [173,216,230,0],
+      lightcoral: [240,128,128,0],
+      lightcyan: [224,255,255,0],
+      lightgoldenrodyellow: [250,250,210,0],
+      lightgray: [211,211,211,0],
+      lightgreen: [144,238,144,0],
+      lightgrey: [211,211,211,0],
+      lightpink: [255,182,193,0],
+      lightsalmon: [255,160,122,0],
+      lightseagreen: [32,178,170,0],
+      lightskyblue: [135,206,250,0],
+      lightslategray: [119,136,153,0],
+      lightslategrey: [119,136,153,0],
+      lightsteelblue: [176,196,222,0],
+      lightyellow: [255,255,224,0],
+      lime: [0,255,0,0],
+      limegreen: [50,205,50,0],
+      linen: [250,240,230,0],
+      magenta: [255,0,255,0],
+      maroon: [128,0,0,0],
+      mediumaquamarine: [102,205,170,0],
+      mediumblue: [0,0,205,0],
+      mediumorchid: [186,85,211,0],
+      mediumpurple: [147,112,219,0],
+      mediumseagreen: [60,179,113,0],
+      mediumslateblue: [123,104,238,0],
+      mediumspringgreen: [0,250,154,0],
+      mediumturquoise: [72,209,204,0],
+      mediumvioletred: [199,21,133,0],
+      midnightblue: [25,25,112,0],
+      mintcream: [245,255,250,0],
+      mistyrose: [255,228,225,0],
+      moccasin: [255,228,181,0],
+      navajowhite: [255,222,173,0],
+      navy: [0,0,128,0],
+      oldlace: [253,245,230,0],
+      olive: [128,128,0,0],
+      olivedrab: [107,142,35,0],
+      orange: [255,165,0,0],
+      orangered: [255,69,0,0],
+      orchid: [218,112,214,0],
+      palegoldenrod: [238,232,170,0],
+      palegreen: [152,251,152,0],
+      paleturquoise: [175,238,238,0],
+      palevioletred: [219,112,147,0],
+      papayawhip: [255,239,213,0],
+      peachpuff: [255,218,185,0],
+      peru: [205,133,63,0],
+      pink: [255,192,203,0],
+      plum: [221,160,221,0],
+      powderblue: [176,224,230,0],
+      purple: [128,0,128,0],
+      rebeccapurple: [102,51,153,0],
+      red: [255,0,0,0],
+      rosybrown: [188,143,143,0],
+      royalblue: [65,105,225,0],
+      saddlebrown: [139,69,19,0],
+      salmon: [250,128,114,0],
+      sandybrown: [244,164,96,0],
+      seagreen: [46,139,87,0],
+      seashell: [255,245,238,0],
+      sienna: [160,82,45,0],
+      silver: [192,192,192,0],
+      skyblue: [135,206,235,0],
+      slateblue: [106,90,205,0],
+      slategray: [112,128,144,0],
+      slategrey: [112,128,144,0],
+      snow: [255,250,250,0],
+      springgreen: [0,255,127,0],
+      steelblue: [70,130,180,0],
+      tan: [210,180,140,0],
+      teal: [0,128,128,0],
+      thistle: [216,191,216,0],
+      tomato: [255,99,71,0],
+      turquoise: [64,224,208,0],
+      violet: [238,130,238,0],
+      wheat: [245,222,179,0],
+      white: [255,255,255,0],
+      whitesmoke: [245,245,245,0],
+      yellow: [255,255,0,0],
+      yellowgreen: [154,205,50,0],
+      transparent: [0,0,0,0],
+    }
+    end
   end
 end

data/lib/jenncad/version.rb

@@ -1,4 +1,4 @@
 module JennCad
-  VERSION = "1.0.0-alpha1"
+  VERSION = "1.0.0-alpha2"
 end
 

data/lib/jenncad.rb

@@ -20,29 +20,7 @@ require "jenncad/part"
 require "jenncad/project"
 require "jenncad/commands"
 
-require "jenncad/primitives/primitive"
-require "jenncad/primitives/aggregation"
-require "jenncad/primitives/openscad_include"
-
-require "jenncad/primitives/circle"
-
-require "jenncad/primitives/cylinder"
-require "jenncad/primitives/sphere"
-require "jenncad/primitives/cube"
-require "jenncad/primitives/rounded_cube"
-require "jenncad/primitives/polygon"
-require "jenncad/primitives/slot"
-
-require "jenncad/primitives/boolean_object"
-require "jenncad/primitives/union_object"
-require "jenncad/primitives/subtract_object"
-require "jenncad/primitives/hull_object"
-require "jenncad/primitives/intersection_object"
-require "jenncad/primitives/projection"
-require "jenncad/primitives/linear_extrude"
-require "jenncad/primitives/rotate_extrude"
-
-
+require "jenncad/primitives"
 
 
 
@@ -55,9 +33,7 @@ require "jenncad/transformation/color"
 require "jenncad/transformation/multmatrix"
 
 
-
-
-
+# TODO: extras need be split from the package to external hardware lib
 require "jenncad/extras/hardware"
 require "jenncad/extras/din912"
 require "jenncad/extras/din933"
@@ -66,8 +42,7 @@ require "jenncad/extras/iso7380"
 
 
 
-
 require "jenncad/register"
 require "jenncad/shortcuts"
-require "jenncad/jenncad"
-require "jenncad/openscad"
+require "jenncad/exporters/openscad"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha1
+  version: 1.0.0.pre.alpha2
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: observr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: TBD
 email:
 - "=^.^=@jenncad.kittenme.ws"
@@ -88,15 +102,15 @@ files:
 - lib/jenncad.rb
 - lib/jenncad/commands.rb
 - lib/jenncad/default_profile.rb
+- lib/jenncad/exporters/openscad.rb
 - lib/jenncad/extras/din912.rb
 - lib/jenncad/extras/din933.rb
 - lib/jenncad/extras/din934.rb
 - lib/jenncad/extras/hardware.rb
 - lib/jenncad/extras/iso7380.rb
-- lib/jenncad/jenncad.rb
-- lib/jenncad/openscad.rb
 - lib/jenncad/part.rb
 - lib/jenncad/patches/array.rb
+- lib/jenncad/primitives.rb
 - lib/jenncad/primitives/aggregation.rb
 - lib/jenncad/primitives/boolean_object.rb
 - lib/jenncad/primitives/circle.rb
@@ -141,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

data/lib/jenncad/jenncad.rb

@@ -1,3 +0,0 @@
-module JennCad
-  include Primitives
-end