jenncad 1.0.0.pre.alpha14 → 1.0.0.pre.alpha17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb1887d6ae1d3fc87da9c816de1cd2cb54ea5fb3ce7f1277ca6af8bcfc4e687
-  data.tar.gz: 5cc6fd0fc52de9b8b9087dfadd0387122014b157c9573b091aa7c4570a5f2c6a
+  metadata.gz: be56296dfd0c04706441288172b3493d918f76a05ee92fa1004ce0c619e6d1c0
+  data.tar.gz: 7b1130259db67a2a0e75e8074265958fac8ada1dbd6a3ce34de2dc4050a1d7a9
 SHA512:
-  metadata.gz: 8f86a697557b258219756ba02c0bb0e478d1c240c05fd53ecb1221749caedd4e7bf7c3395c439f9c0d426e33366d104e71c20a89bca894ee8e0c843733a0446d
-  data.tar.gz: 4ee555b106f36751024a876ece4880b3cea9138e606c541457a809828645f399f3a417cc0f40256e7363bf20f2b212a20f27166429337062a297caddb21931e1
+  metadata.gz: 76e84ad22e862bc9b961d4e96382d0c40ebdfe6ab2ff2ee709c5e90faf7eb01b5199612abb4c0950c193cef97c4a43a895b2e071c306a9036d018ac135416adc
+  data.tar.gz: df24c4d80c52738a6223dd0ac7d20a8448c06839c7c448e436afa0501d659276d7e28dc5c0a23cf2742babd13475e5afb1be8aa13bf69916fc8b4844306b006e

data/lib/jenncad/commands.rb

@@ -118,15 +118,15 @@ module JennCad
         File.open(filename, "w") do |f|
           f.puts "class #{classname} < Part"
           f.puts "  def initialize(opts={})"
-          f.puts "    @opts = {"
-          f.puts "      x: 10,"
-          f.puts "      y: 10,"
-          f.puts "      z: 5,"
-          f.puts "    }.merge(opts)"
+          f.puts "    @x = 10"
+          f.puts "    @y = 10"
+          f.puts "    @z = 5"
           f.puts "  end"
           f.puts ""
           f.puts "  def part"
-          f.puts "    cube(@opts)"
+          f.puts "    base = cube(x: @x, y: @y, z: @z)"
+          f.puts "    res = base.fix"
+          f.puts "    res"
           f.puts "  end"
           f.puts "end"
         end

data/lib/jenncad/exporters/openscad.rb

@@ -162,14 +162,16 @@ module JennCad::Exporters
         bool('intersection', part)
       when JennCad::HullObject
         bool('hull', part)
-      when JennCad::Primitives::Circle
-        prim('circle', part)
       when JennCad::Primitives::Cylinder
         prim('cylinder', part)
       when JennCad::Primitives::Sphere
         prim('sphere', part)
       when JennCad::Primitives::Cube
         prim('cube', part)
+       when JennCad::Primitives::Circle
+        prim('circle', part)
+      when JennCad::Primitives::Square
+        prim('square', part)
       when JennCad::Primitives::LinearExtrude
         new_obj(part, :linear_extrude, part.openscad_params, parse(part.parts))
       when JennCad::Primitives::RotateExtrude
@@ -178,6 +180,8 @@ module JennCad::Exporters
         new_obj(part, :projection, collect_params(part), parse(part.parts))
       when JennCad::Primitives::Polygon
         new_obj(part, :polygon, collect_params(part))
+      when JennCad::Primitives::Polyhedron
+        new_obj(part, :polyhedron, collect_params(part))
       when JennCad::StlImport
         new_obj(part, :import, collect_params(part))
       when JennCad::Part
@@ -212,7 +216,7 @@ module JennCad::Exporters
         return part.openscad_params
       end
       res = {}
-      [:d, :h, :d1, :d2, :size, :fn, :points, :file].each do |var|
+      [:d, :h, :d1, :d2, :size, :fn, :points, :paths, :faces, :convexity, :file].each do |var|
         if part.respond_to? var
           res[var] = part.send var
         end

data/lib/jenncad/features/aggregation.rb

@@ -6,6 +6,7 @@ module JennCad::Features
       super({})
       @name = name.gsub(".","_")
       @parts = [part]
+      @zref = part
     end
 
     def z

data/lib/jenncad/features/climb.rb

@@ -1,6 +1,8 @@
 module JennCad::Features
   class Climb < Feature
     def initialize(opts, block)
+      $log.warn "DEPRECATED feature: climb. Please use x.of (multiples_of example)"
+
       @opts = {
         offset: :auto,
         step: nil,

data/lib/jenncad/features/multiples_of.rb

@@ -0,0 +1,14 @@
+class Integer
+  def of(part=nil, anchor=:top_face)
+    return nil if part.nil?
+    num = self - 1
+
+    res = part.fix
+    num.times do
+      res += part.movea(anchor)
+    end
+    res
+  end
+end
+
+

data/lib/jenncad/features/path.rb

@@ -1,7 +1,7 @@
 module JennCad
   class RoundCorner
     attr_accessor :start_point, :end_point, :input_a, :output_a, :a, :l, :od, :id, :thing, :angle, :current_angle, :direction, :from, :ccw
-    def initialize(args, &thing)
+    def initialize(args)
       @start_point = args[:start_point]
       @end_point = args[:end_point]
       @a = args[:a]
@@ -11,7 +11,13 @@ module JennCad
       @id = args[:id]
       @input_a = args[:input_a] || 0
       @output_a = args[:output_a] || 0
-      @thing = thing
+      thing = Marshal.load(args[:thing])
+
+      @thing_dia = thing.d || thing.y
+      unless @thing_dia
+        $log.error "ERROR: cannot find diameter or y of thing #{thing.inspect}"
+        return
+      end
       @angle = args[:angle]
       @current_angle = args[:current_angle]
       @direction = args[:direction]
@@ -57,11 +63,7 @@ module JennCad
     end
 
     def positions
-      td = thing.yield.d || thing.yield.y
-      unless td
-        puts "ERROR: cannot find diameter or y of thing #{thing.yield.inspect}"
-        return
-      end
+      td = @thing_dia
       l = td + @id
       l2 = td / 2.0 + @id / 2.0
       r = 0
@@ -101,7 +103,7 @@ module JennCad
     end
 
     def part
-      d = thing.yield.d
+      d = @thing_dia
       len = d * 2 + @id
       x = Math::sin((@a/180.0)*Math::PI)*len
       y = Math::cos((@a/180.0)*Math::PI)*len
@@ -134,15 +136,15 @@ module JennCad
   end
 
   class Line
-    attr_accessor :start_point, :end_point, :l, :thing, :angle, :current_angle, :direction
-    def initialize(args, &thing)
+    attr_accessor :start_point, :end_point, :l, :angle, :current_angle, :direction
+    def initialize(args)
       @start_point = args[:start_point]
       @end_point = args[:end_point]
       @angle = args[:angle]
       @current_angle = args[:current_angle]
       @direction = args[:direction]
       @l = args[:l]
-      @thing = thing
+      @thing = args[:thing]
     end
 
     def sp_margin(margin)
@@ -181,8 +183,8 @@ module JennCad
 
     def part
       hull(
-        @thing.yield.move(x: @start_point[:x], y: @start_point[:y]),
-        @thing.yield.move(x: @end_point[:x], y: @end_point[:y])
+        Marshal.load(@thing).move(x: @start_point[:x], y: @start_point[:y]),
+        Marshal.load(@thing).move(x: @end_point[:x], y: @end_point[:y])
       )
     end
   end
@@ -191,7 +193,7 @@ module JennCad
 
     attr_accessor :elements, :lpos, :thing, :angle, :current_angle, :direction
     def initialize(args)
-      @thing = args[:part] #// cylinder(d: @d, z: @z)
+      @thing = store_thing_from(args[:part])
       @part = new_thing
       @angle = args[:a] || 0
       @current_angle = args[:a] || 0
@@ -207,10 +209,14 @@ module JennCad
       super(args)
     end
 
-    def new_thing
-      r = @thing.clone
+    def store_thing_from(thing)
+      r = Marshal.load(Marshal.dump(thing)) # make sure we don't edit the object in memory
       r.transformations = []
-      r
+      Marshal.dump(r)
+    end
+
+    def new_thing
+      Marshal.load(@thing)
     end
 
     def corner(args)
@@ -232,8 +238,9 @@ module JennCad
         from: args[:from],
         to: args[:to],
         a: args[:a],
-        direction: @direction
-      ){ new_thing }
+        direction: @direction,
+        thing: thing,
+      )
 
       _, ox, oy, x, y = rc.positions
       @lpos[:x] += x + ox
@@ -292,7 +299,7 @@ module JennCad
         return
       end
 
-      @steps << Line.new(start_point: { x: @lpos[:x], y: @lpos[:y] }, end_point: { x: @lpos[:x] + x, y: @lpos[:y] + y  }, angle: @angle, current_angle: @current_angle, direction: @direction, l: l){ new_thing }
+      @steps << Line.new(start_point: { x: @lpos[:x], y: @lpos[:y] }, end_point: { x: @lpos[:x] + x, y: @lpos[:y] + y  }, angle: @angle, current_angle: @current_angle, direction: @direction, l: l, thing: thing)
 
       add_lpos({x: x, y: y})
     end

data/lib/jenncad/features.rb

@@ -5,6 +5,8 @@ require "jenncad/features/openscad_include"
 require "jenncad/features/climb"
 require "jenncad/features/stl_import"
 require "jenncad/features/path"
+require "jenncad/features/multiples_of"
+
 
 
 

data/lib/jenncad/part.rb

@@ -1,9 +1,54 @@
+module AutoName
+  def initialize(args={})
+    unless args.empty?
+      @auto_name = "#{self.class}_#{args.map{|key, val| "#{key}_#{val}"}.join('_')}"
+    end
+    super(args)
+  end
+end
+
 module JennCad
   # Part should be inherited from the user when making parts
   class Part < Thing
+    def self.inherited(subclass)
+      subclass.prepend(AutoName) if subclass.superclass == Part
+    end
+
+    # this function both gets and defines hardware
+    def hardware(hw_type=nil, args={})
+      @_hw ||= {}
+      if hw_type == nil
+        return @_hw
+      end
+
+      anchors = args[:anchor] || args[:anchors]
+      unless anchors.kind_of? Array
+        anchors = [anchors]
+      end
+
+      anchors.each do |a|
+        @_hw[a] = {
+          hw_type: hw_type,
+          size: args[:size],
+          d: args[:d],
+          len: args[:len],
+          pos: anchor(a, args[:from]),
+        }
+      end
+      self
+    end
+    alias :hw :hardware
+
+    def fix_name_for_openscad(name)
+      [":", ",", ".", "[", "]","-", " "].each do |key|
+        name.gsub!(key, "_")
+      end
+      name
+    end
 
     def to_openscad
-      a = Aggregation.new(self.class.to_s, self.get_contents)
+      name = @name || @auto_name || self.class.to_s
+      a = Aggregation.new(fix_name_for_openscad(name), self.get_contents)
       a.transformations = @transformations
       if self.has_explicit_color?
         a.color(self.color)

data/lib/jenncad/primitives/boolean_object.rb

@@ -7,6 +7,9 @@ module JennCad::Primitives
       else
         @parts = parts
       end
+      if parts.first && parts.first.respond_to?(:debug?) && parts.first.debug?
+        $log.debug("Creating new #{self.class} for part #{parts}")
+      end
 
       @parent = @parts.first.parent
 
@@ -16,9 +19,11 @@ module JennCad::Primitives
     def add_or_new(part)
       case @transformations
       when nil, []
+        $log.debug("adding new part to existing boolean object") if part && part.debug?
         add(part)
         self
       else
+        $log.debug("add_or_new: creating new boolean object") if part.debug?
         self.class.new(self, part)
       end
     end

data/lib/jenncad/primitives/circle.rb

@@ -2,10 +2,108 @@ module JennCad::Primitives
   class Circle < Primitive
     attr_accessor :d, :r, :fn
     def initialize(args)
-      super
-      @d = args[:d]
-      @r = args[:r]
-      @fn = args[:fn]
+      if args.kind_of?(Array) && args[0].kind_of?(Hash)
+        args = args.first
+      end
+      if args.kind_of? Array
+        m = {}
+        if args.last.kind_of? Hash
+          m = args.last
+        end
+        args = [:d, :z].zip(args.flatten).to_h
+        args.deep_merge!(m)
+      end
+
+
+      @opts = {
+        d: 0,
+        d1: nil,
+        d2: nil,
+        r1: nil,
+        r2: nil,
+        z: nil,
+        r: 0,
+        cz: false,
+        margins: {
+          r: 0,
+          d: 0,
+          z: 0,
+        },
+        fn: nil,
+      }.deep_merge!(args)
+      init(args)
+      @dimensions = [:x, :y]
+      handle_radius_diameter
+      handle_fn
+      set_anchors_2d
     end
+
+    def set_anchors_2d
+      @anchors = {} # reset anchors
+      if @opts[:d]
+        rad = @opts[:d] / 2.0
+      else
+        rad = @opts[:r]
+      end
+
+      # Similar to cube
+      set_anchor :left, x: -rad
+      set_anchor :right, x: rad
+      set_anchor :top, y: rad
+      set_anchor :bottom, y: -rad
+    end
+
+    def openscad_params
+      res = {}
+      [:d, :fn].each do |n|
+        res[n] = self.send n
+      end
+      res
+    end
+
+    def handle_fn
+      case @opts[:fn]
+        when nil, 0
+          $fn = auto_dn!
+        else
+          @fn = @opts[:fn]
+      end
+    end
+
+    def auto_dn!
+      case @d
+        when (16..)
+          @fn = (@d*4).ceil
+        else
+          @fn = 64
+      end
+    end
+
+    def handle_radius_diameter
+      case @opts[:d]
+      when 0, nil
+        @r = @opts[:r].to_d + @opts[:margins][:r].to_d
+        @d = @r * 2.0
+      else
+        @d = @opts[:d].to_d + @opts[:margins][:d].to_d
+        @r = @d / 2.0
+      end
+
+      case @opts[:d1]
+      when 0, nil
+      else
+        @d1 = @opts[:d1].to_d + @opts[:margins][:d].to_d
+        @d2 = @opts[:d2].to_d + @opts[:margins][:d].to_d
+      end
+
+      case @opts[:r1]
+      when 0, nil
+      else
+        @d1 = 2 * @opts[:r1].to_d + @opts[:margins][:d].to_d
+        @d2 = 2 * @opts[:r2].to_d + @opts[:margins][:d].to_d
+      end
+    end
+
+
   end
 end

data/lib/jenncad/primitives/cube.rb

@@ -1,24 +1,7 @@
 module JennCad::Primitives
-  class Cube < Primitive
+  class Cube < Square
     extend JennCad::Features::Cuttable
 
-    attr_accessor :corners, :sides
-
-    def feed_opts(args)
-      # FIXME: this doesn't seem to work
-      if args.kind_of? Array
-        m = {}
-        if args.last.kind_of? Hash
-          m = args.last
-        end
-        args = [:x, :y, :z].zip(args.flatten).to_h
-        args.deep_merge!(m)
-        @opts.deep_merge!(args)
-      else
-        @opts.deep_merge!(args)
-      end
-    end
-
     def initialize(args)
       @opts = {
         x: 0,
@@ -41,137 +24,36 @@ module JennCad::Primitives
       else
         feed_opts(parse_xyz_shortcuts(args))
       end
+      init
 
 
       handle_margins
-      super(z: @opts[:z])
       @h = @z.dup
       @calc_h = @z.dup
 
+      @dimensions = [:x, :y, :z]
 
       set_anchors
     end
 
     def set_anchors
-      @anchors = {} # this resets anchors
-
-      if @opts[:center] || @opts[:center_x]
-        left = -@opts[:x] / 2.0
-        right = @opts[:x] / 2.0
-        mid_x = 0
-      else
-        left = 0
-        right =  @opts[:x]
-        mid_x = @opts[:x] / 2.0
-      end
-      if @opts[:center] || @opts[:center_y]
-        bottom = -@opts[:y] / 2.0
-        top = @opts[:y] / 2.0
-        mid_y = 0
+      set_anchors_2d
+      if @opts[:center_z]
+        set_anchor :bottom_face, z: -@z/2.0
+        set_anchor :top_face, z: @z/2.0
       else
-        bottom = 0
-        top = @opts[:y]
-        mid_y = @opts[:y] / 2.0
+        set_anchor :bottom_face, z: 0
+        set_anchor :top_face, z: @z
       end
 
-      set_anchor :left, x: left, y: mid_y
-      set_anchor :right, x: right, y: mid_y
-      set_anchor :top, x: mid_x, y: top
-      set_anchor :bottom, x: mid_x, y: bottom
-      set_anchor :top_left, x: left, y: top
-      set_anchor :top_right, x: right, y: top
-      set_anchor :bottom_left, x: left, y: bottom
-      set_anchor :bottom_right, x: right, y: bottom
-
-      # we need to re-do the inner ones, if they were defined
-      if @inner_anchor_defs && @inner_anchor_defs.size > 0
-        @inner_anchor_defs.each do |anch|
-         inner_anchors(anch[:dist], anch[:prefix], true)
-        end
-      end
 
-      self
     end
 
-    def inner_anchors(dist, prefix=:inner_, recreate=false)
-      @inner_anchor_defs ||= []
-      @inner_anchor_defs << { "dist": dist, "prefix": prefix } unless recreate
-
-#      $log.info "dist: #{dist}, prefix: #{prefix}"
-      sides = {
-        left: {x: dist, y: 0},
-        right: {x: -dist, y: 0},
-        top: {x: 0, y: -dist},
-        bottom: {x: 0, y: dist},
-      }
-      corners = {
-        top_left: {x: dist, y: -dist},
-        top_right: {x: -dist, y: -dist},
-        bottom_left: {x: dist, y: dist},
-        bottom_right: {x: -dist, y: dist},
-      }
-      new_sides = []
-      new_corners = []
-
-      sides.merge(corners).each do |key, vals|
-        new_dist = anchor(key).dup
-        new_dist[:x] += vals[:x]
-        new_dist[:y] += vals[:y]
-        name = [prefix, key].join.to_sym
-#        $log.info "Set anchor #{name} , new dist #{new_dist}"
-        set_anchor name, new_dist
-        if sides.include? key
-          new_sides << name
-        end
-        if corners.include? key
-          new_corners << name
-        end
-      end
-
-      sides_name = [prefix, "sides"].join
-      corners_name = [prefix, "corners"].join
-      all_name = [prefix, "all"].join
-      self.class.__send__(:attr_accessor, sides_name.to_sym)
-      self.class.__send__(:attr_accessor, corners_name.to_sym)
-      self.class.__send__(:attr_accessor, all_name.to_sym)
-      self.__send__("#{sides_name}=", new_sides)
-      self.__send__("#{corners_name}=", new_corners)
-      self.__send__("#{all_name}=", new_corners+new_sides)
-
-
-      self
-    end
-
-
     # used for openscad export
     def size
       [@x, @y, z+z_margin]
     end
 
-    def not_centered
-      @opts[:center] = false
-      set_anchors
-      self
-    end
-    alias :nc :not_centered
-
-    def cx
-      nc
-      @opts[:center_x] = true
-      set_anchors
-      self
-    end
-    alias :center_x :cx
-
-    def cy
-      nc
-      @opts[:center_y] = true
-      set_anchors
-      self
-    end
-    alias :center_y :cy
-
-
     def cz
       nc
       @opts[:center_z] = true
@@ -180,18 +62,5 @@ module JennCad::Primitives
     end
     alias :center_z :cz
 
-    def centered_axis
-      return [:x, :y] if @opts[:center]
-      a = []
-      a << :x if @opts[:center_x]
-      a << :y if @opts[:center_y]
-      a << :z if @opts[:center_z]
-      a
-    end
-
-    def to_openscad
-      self.mh(centered_axis.to_h{|a| [a, -@opts[a]] }) # center cube
-    end
-
   end
 end