jenncad 1.0.0.pre.alpha15 → 1.0.0.pre.alpha18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eebd115b8e6783b61fff33f1b002f935f3d2c2023df70df9ff3b9850f12245f
-  data.tar.gz: 806a99e1195f98ee1e8450030f9e2809c11217af7bf19e8cac88ad9408146a40
+  metadata.gz: 5d05a39eda135dbbda74bcdc75c66a4c9d7620e426d5656e377442dcc17ef665
+  data.tar.gz: 1514fd3b8ecc502f95c0a9a7e93e13622e706d518abe31f7af4e60d56d85f357
 SHA512:
-  metadata.gz: a120ac12bfe18f3532560c10452ae9460d21bd8ba2e4d287669b9b23cdf903476541fed341b81ce7feb8e906ccc8087a7a0f46f5f49e63d66b6421cd8e4d0984
-  data.tar.gz: 06e239cea5a153ecb3b8ab1873574bc8d9a03e51d1c0d75e5fe72f393e1584971bbc2ba388d9da82ce58cc79c2f949e206962be9052da29b0a24e351c176a53d
+  metadata.gz: 9ea62b48418d86b7daa3f2ddcb895d03494942dea723fd60de9f81cbd25aab1d6aefd801136258192ab18b0dc9803cfe368cfb3f5b8bb1a33288eade384b7b96
+  data.tar.gz: e25c9f138b698f5c041dc7d0455a06807fe26ba12663039a9c522f0433d7435f3ecebdb72031069e81dea24414a8b0cfec76809a20bdedc50ab76442e7380b65

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/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/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,47 +24,20 @@ 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
-      else
-        bottom = 0
-        top = @opts[:y]
-        mid_y = @opts[:y] / 2.0
-      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
+      set_anchors_2d
       if @opts[:center_z]
         set_anchor :bottom_face, z: -@z/2.0
         set_anchor :top_face, z: @z/2.0
@@ -90,95 +46,14 @@ module JennCad::Primitives
         set_anchor :top_face, z: @z
       end
 
-      # 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
@@ -187,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

data/lib/jenncad/primitives/cylinder.rb

@@ -1,5 +1,5 @@
 module JennCad::Primitives
-  class Cylinder < Primitive
+  class Cylinder < Circle
     attr_accessor :d, :d1, :d2, :r, :fn, :anchors
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
@@ -32,7 +32,7 @@ module JennCad::Primitives
         },
         fn: nil,
       }.deep_merge!(args)
-
+      init(args)
       # FIXME:
       # - margins calculation needs to go to output
       # - assinging these variables has to stop
@@ -41,24 +41,12 @@ module JennCad::Primitives
       @z = args[:z] || args[:h]
       handle_radius_diameter
       handle_fn
-      super(args)
+      @dimensions = [:x, :y, :z]
       set_anchors
     end
 
     def set_anchors
-      @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
-
+      set_anchors_2d
       # TODO: figure out if we also want to have "corners"
       # - possibly move it like a cube
       # - points at 45 ° angles might not be that useful unless you can get the point on the circle at a given angle
@@ -91,52 +79,18 @@ module JennCad::Primitives
     # This will transform the cylinder around the center point.
     def cz
       @opts[:cz] = true
+      @transformations ||= []
       @transformations << Move.new(z: -@z / 2.0)
       set_anchors
       self
     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
+    def z=(val)
+      @z = val
+      @h = val
+      opts[:h] = val
+      opts[:z] = val
+      set_anchors
     end
 
     def h

data/lib/jenncad/primitives/linear_extrude.rb

@@ -4,7 +4,7 @@ module JennCad::Primitives
     def initialize(part, args={})
       @transformations = []
       @parts = [part]
-      @z = args[:h] || args[:height]
+      @z = args[:h] || args[:height] || args[:z]
       @center_bool = args[:center]
       @convexity = args[:convexity]
       @twist = args[:twist]

data/lib/jenncad/primitives/polygon.rb

@@ -1,9 +1,12 @@
 module JennCad::Primitives
   class Polygon < Primitive
-    attr_accessor :points
+    attr_accessor :points, :paths
     def initialize(args)
-      super
       @points = args[:points]
+      @paths = args[:paths]
+      @convexity = args[:convexity] || 10
+      @dimensions = [:x, :y]
+      super
     end
   end
 end

data/lib/jenncad/primitives/polyhedron.rb

@@ -0,0 +1,35 @@
+module JennCad::Primitives
+  class Polyhedron < Primitive
+    attr_accessor :points, :faces, :convexity
+    def initialize(args)
+      @opts = args
+      @points = args[:points]
+      @faces = args[:faces]
+      @convexity = args[:convexity] || 10
+
+      super
+    end
+
+    def face(i)
+      unless @faces[i]
+        $log.error "polyhedron: Cannot find face #{i}"
+        return self
+      end
+      face = 0
+      poly_faces = []
+      poly_points = []
+      @faces[i].each do |f|
+        point = @points[f]
+        if point.nil?
+          $log.error "polyhedron: Cannot find point #{f} for face #{i}"
+        end
+        poly_points << point
+        poly_faces << face
+        face += 1
+        #poly_points << [point[0], point[1]]
+      end
+      #polygon(points: poly_points)
+      polyhedron(points: poly_points, faces: [poly_faces, poly_faces.reverse])
+    end
+  end
+end

data/lib/jenncad/primitives/primitive.rb

@@ -1,5 +1,7 @@
 module JennCad::Primitives
   class Primitive < JennCad::Thing
+    attr_accessor :dimensions
+
     def initialize(*args)
       super(*args)
     end
@@ -7,7 +9,9 @@ module JennCad::Primitives
     def handle_margins
       @x = @opts[:x].to_d + @opts[:margins][:x].to_d
       @y = @opts[:y].to_d + @opts[:margins][:y].to_d
-      @z = @opts[:z].to_d + @opts[:margins][:z].to_d
+      if @opts[:z]
+        @z = @opts[:z].to_d + @opts[:margins][:z].to_d
+      end
     end
 
     def handle_diameter
@@ -20,5 +24,20 @@ module JennCad::Primitives
       end
     end
 
+    def feed_opts(args)
+      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
+
+
   end
 end