jenncad 1.0.0.pre.alpha19 → 1.0.0.pre.alpha22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2088ad700952d85766093d0d494281c6117c0cf628a6307840131ec38314f832
-  data.tar.gz: 2a68a98e3fcc5d3c6008f8907ad72eab028e95d8021aa432dec93cd21993dd95
+  metadata.gz: 655d1eab8f78d92f18915154cdc36a57fecfcb222e40dc69e663c974d5d85052
+  data.tar.gz: 79bd0ecee0ea0b3b691c4953ec33e68e1783248899d1e9417fe9cfac80e6fc46
 SHA512:
-  metadata.gz: f96b42ef5e8f8ab836a900c96b83cbee8ed2c91cc0f83631e650adbc27d6e4ec2ba91cf5f94fa8424b420d4951a3a80cae52012e6d7013abdaf8b10e0c141283
-  data.tar.gz: 80f3f16a02f07b664efed6ba0a25f786720269de165f98532c1ab18b674f11e86fb59cf62bd7a787777e9e71d9dcd9556184b0a637f7ec98aa1b6a494e23dcec
+  metadata.gz: 77c14e0645ff92f85f8746830469707d91495b7cf57d8d64210a0c2da7d7a6b0f9c27c3b4eb6fdcfdcd983a6d647b54309d4e10d2d407d70f7e55d02cd72ec9f
+  data.tar.gz: dd7538fb2068d4cb15326af37f7324d19c31828e3584b700f78ea585004790ee9033576e235e17774f007722f3b5a729d4a6a4c75f9c9fd2a0e2b0ee33e59bb4

data/lib/jenncad/commands.rb

@@ -46,6 +46,7 @@ module JennCad
 
     class Build < Run
       option :binary, type: :boolean, default: false, desc: "run through admesh to create a binary stl"
+      option :only_print, type: :boolean, default: true, desc: "If a part has a print orientation set, only build that orientation as STL"
 
       def build(options)
         if options[:binary]
@@ -55,7 +56,13 @@ module JennCad
           end
         end
 
-        Dir.glob("output/**/*.scad").each do |file|
+        files = Dir.glob("output/**/*.scad")
+        if options[:only_print]
+          # Remove non _print.scad files from the list of files to build if we have a print orientation (and the only_print flag set)
+          files -= Dir.glob("output/**/*_print.scad").map{|x| x.gsub("_print.scad",".scad")}
+        end
+
+        files.each do |file|
           stl = file.gsub(".scad",".stl")
           build_stl(file, stl)
           convert_to_binary(stl) if options[:binary] && admesh_installed

data/lib/jenncad/exporters/openscad.rb

@@ -95,6 +95,9 @@ module JennCad::Exporters
           if v == nil
             next
           end
+          if v.kind_of?(Symbol)
+            v = v.to_s
+          end
           if v.kind_of?(Array)
             v = handle_args(v)
           elsif !v.kind_of?(TrueClass) && !v.kind_of?(FalseClass) && v == v.to_i
@@ -172,6 +175,8 @@ module JennCad::Exporters
         prim('circle', part)
       when JennCad::Primitives::Square
         prim('square', part)
+      when JennCad::Primitives::Text
+        prim('text', part)
       when JennCad::Primitives::LinearExtrude
         new_obj(part, :linear_extrude, part.openscad_params, parse(part.parts))
       when JennCad::Primitives::RotateExtrude

data/lib/jenncad/features.rb

@@ -7,9 +7,6 @@ require "jenncad/features/stl_import"
 require "jenncad/features/path"
 require "jenncad/features/multiples_of"
 
-
-
-
 module JennCad
   include Features
 end

data/lib/jenncad/part.rb

@@ -10,6 +10,8 @@ end
 module JennCad
   # Part should be inherited from the user when making parts
   class Part < Thing
+    attr_accessor :d
+
     def self.inherited(subclass)
       subclass.prepend(AutoName) if subclass.superclass == Part
     end

data/lib/jenncad/position.rb

@@ -0,0 +1,138 @@
+module JennCad
+  class Size
+    attr_accessor :size
+    def initialize(args={})
+      @size = {
+        x: args[:x].to_d,
+        y: args[:y].to_d,
+        z: (args[:z] || args[:h]).to_d,
+        d: args[:d].to_d,
+      }
+    end
+
+    def add(other)
+      return self if other.nil?
+      @size[:x] += other.x
+      @size[:y] += other.y
+      @size[:z] += other.z
+      @size[:d] += other.d
+      self
+    end
+
+    def union(other)
+      @size[:x] = [@size[:x], other.x].max
+      @size[:y] = [@size[:y], other.y].max
+      @size[:z] = [@size[:z], other.z].max
+      @size[:d] = [@size[:d], other.d].max
+      self
+    end
+
+    def to_point
+      Point.new(x: @size[:x], y: @size[:y], z: @size[:z])
+    end
+
+    def set(a, to)
+      @size[a] = to
+    end
+
+    def x
+      @size[:x]
+    end
+
+    def y
+      @size[:y]
+    end
+
+    def z
+      @size[:z]
+    end
+
+    def d
+      @size[:d]
+    end
+
+  end
+
+  class Point
+    attr_accessor :pos
+    def initialize(args={})
+      @pos = {x: 0.to_d, y: 0.to_d, z: 0.to_d}
+      add(args)
+    end
+
+    def x
+      @pos[:x]
+    end
+
+    def y
+      @pos[:y]
+    end
+
+    def z
+      @pos[:z]
+    end
+
+    def zero?
+      return true if x == 0.0 && y == 0.0 && z == 0.0
+      false
+    end
+
+    def to_a
+      if @z != 0.0
+        [@pos[:x], @pos[:y], @pos[:z]]
+      else
+        [@pos[:x], @pos[:y]]
+      end
+    end
+
+    def to_h
+      @pos.clone.delete_if{|k,v| v.to_d == 0.0}
+    end
+
+    def add(args)
+      if args.kind_of? Point
+        @pos[:x] += args.x
+        @pos[:y] += args.y
+        @pos[:z] += args.z
+        return self
+      end
+
+      args.each do |k, val|
+        if [:chain, :debug].include? k
+          next
+        end
+        unless val.kind_of? Numeric
+          next
+        end
+        if val.to_d == 0.0
+          next
+        end
+
+        keys = k.to_s.chars
+        axis = []
+        axis << keys.delete("x")
+        axis << keys.delete("y")
+        axis << keys.delete("z")
+        multi = 1
+
+        if keys.size > 0
+          if keys.include?("h")
+            multi = 0.5
+          elsif keys.include?("q")
+            multi = 0.25
+          elsif keys.include?("d")
+            multi = 2.0
+          end
+          if keys.include?("n") || keys.include?("i")
+            multi *= -1
+          end
+        end
+        axis.compact.each do |a|
+          @pos[a.to_sym] += val.to_d * multi.to_d
+        end
+      end
+      self
+    end
+  end
+
+end

data/lib/jenncad/primitives/boolean_object.rb

@@ -7,11 +7,19 @@ module JennCad::Primitives
       else
         @parts = parts
       end
+
+      if @parts.first.respond_to? :anchors
+        @anchors = @parts.first.anchors
+      end
+
       if parts.first && parts.first.respond_to?(:debug?) && parts.first.debug?
-        $log.debug("Creating new #{self.class} for part #{parts}")
+        $log.debug("Creating new #{self.class} for part #{parts.pretty_inspect}")
       end
 
-      @parent = @parts.first.parent
+
+      @parent = @parts.first.parent if @parts.first
+      @csize = @parts.first.csize if @parts.first
+      @csize ||= Size.new
 
       after_add
     end

data/lib/jenncad/primitives/circle.rb

@@ -1,5 +1,7 @@
 module JennCad::Primitives
   class Circle < Primitive
+    include CircleIsh
+
     attr_accessor :d, :r, :fn
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
@@ -36,21 +38,7 @@ module JennCad::Primitives
       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
+      @csize = Size.new(d: @opts[:d])
     end
 
     def openscad_params
@@ -61,49 +49,6 @@ module JennCad::Primitives
       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,6 +1,7 @@
 module JennCad::Primitives
   class Cube < Square
     extend JennCad::Features::Cuttable
+    include ZIsh
 
     def initialize(args)
       @opts = {
@@ -26,27 +27,19 @@ module JennCad::Primitives
       end
       init
 
-
       handle_margins
       @h = @z.dup
       @calc_h = @z.dup
 
       @dimensions = [:x, :y, :z]
+      @csize = Size.new(x: @opts[:x], y: @opts[:y], z: @opts[:z])
 
       set_anchors
     end
 
     def set_anchors
       set_anchors_2d
-      if @opts[:center_z]
-        set_anchor :bottom_face, z: -@z/2.0
-        set_anchor :top_face, z: @z/2.0
-      else
-        set_anchor :bottom_face, z: 0
-        set_anchor :top_face, z: @z
-      end
-
-
+      set_anchors_z
     end
 
     # used for openscad export
@@ -54,13 +47,6 @@ module JennCad::Primitives
       [@x, @y, z+z_margin]
     end
 
-    def cz
-      nc
-      @opts[:center_z] = true
-      set_anchors
-      self
-    end
-    alias :center_z :cz
 
   end
 end

data/lib/jenncad/primitives/cylinder.rb

@@ -1,5 +1,6 @@
 module JennCad::Primitives
   class Cylinder < Circle
+    include ZIsh
     attr_accessor :d, :d1, :d2, :r, :fn, :anchors
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
@@ -15,7 +16,7 @@ module JennCad::Primitives
       end
 
       args[:z] ||= args[:h]
-
+      args[:center_z] ||= args[:cz]
       @opts = {
         d: 0,
         d1: nil,
@@ -24,7 +25,7 @@ module JennCad::Primitives
         r2: nil,
         z: nil,
         r: 0,
-        cz: false,
+        center_z: false,
         margins: {
           r: 0,
           d: 0,
@@ -43,22 +44,16 @@ module JennCad::Primitives
       handle_fn
       @dimensions = [:x, :y, :z]
       set_anchors
+      @csize = Size.new(x: @opts[:d], y: @opts[:d], d: @opts[:d], z: @z)
     end
 
     def set_anchors
       set_anchors_2d
+      set_anchors_z
       # 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
       # - inner/outer points could be useful for small $fn values
-
-      if @opts[:cz]
-        set_anchor :bottom_face, z: -@z/2.0
-        set_anchor :top_face, z: @z/2.0
-      else
-        set_anchor :bottom_face, z: 0
-        set_anchor :top_face, z: @z
-      end
     end
 
     def openscad_params
@@ -78,7 +73,7 @@ module JennCad::Primitives
     # Centers the cylinder around it's center point by height
     # This will transform the cylinder around the center point.
     def cz
-      @opts[:cz] = true
+      @opts[:center_z] = true
       @transformations ||= []
       @transformations << Move.new(z: -@z / 2.0)
       set_anchors

data/lib/jenncad/primitives/linear_extrude.rb

@@ -1,24 +1,36 @@
 module JennCad::Primitives
+  include ZIsh
   attr_accessor :center_bool, :convexity, :twist, :slices
+
   class LinearExtrude < JennCad::Thing
     def initialize(part, args={})
       @transformations = []
       @parts = [part]
+      if args.kind_of? Numeric
+        args = {h: args}
+      end
       @z = args[:h] || args[:height] || args[:z]
+      @csize = Size.new(z: @z).add(part.csize)
+
       @center_bool = args[:center]
       @convexity = args[:convexity]
       @twist = args[:twist]
       @slices = args[:slices]
       @fn = args[:fn]
       @opts = {
+        center_z: false,
         margins: {
           z: 0,
         }
       }.deep_merge(args)
+      set_anchors_z
+
+      @x = part.x
+      @y = part.y
     end
 
     def height
-      @z.to_d + @opts[:margins][:z].to_d
+      @z.to_d + z_margin
     end
 
     def openscad_params

data/lib/jenncad/primitives/rounded_cube.rb

@@ -44,6 +44,8 @@ module JennCad::Primitives
         feed_opts(parse_xyz_shortcuts(args))
       end
       init(args)
+      @d = opts[:d]
+      @csize = Size.new(x: @opts[:x], y: @opts[:y], z: @opts[:z])
 
       handle_margins
       handle_diameter
@@ -52,6 +54,7 @@ module JennCad::Primitives
       else
         @dimensions = [:x, :y]
       end
+
       set_anchors
     end
 
@@ -59,28 +62,28 @@ module JennCad::Primitives
       # FIXME: this check needs to be done on object creation
       #        otherwise it fails to position it
       if @d == 0
-        if @z.to_d > 0
+        if @csize.z.to_d > 0
           return cube(@opts)
         else
           return square(@opts)
         end
       end
       # make diameter not bigger than any side
-      d = [@d, @x, @y].min
+      d = [@d, @csize.x, @csize.y].min
       res = HullObject.new(
         circle(d: d),
-        circle(d: d).move(x: @x - d, y: 0),
-        circle(d: d).move(x: 0, y: @y - d),
-        circle(d: d).move(x: @x - d, y: @y - d),
+        circle(d: d).move(x: @csize.x - d, y: 0),
+        circle(d: d).move(x: 0, y: @csize.y - d),
+        circle(d: d).move(x: @csize.x - d, y: @csize.y - d),
       )
-      res = res.move(xy: d/2.0)
+      res = res.move(xyh: d)
 
       @opts[:flat_edges].each do |edge|
         res += apply_flat_edge(edge)
       end
 
-      if @z.to_d > 0
-        res = res.extrude(z: @z + z_margin)
+      if @csize.z.to_d > 0
+        res = res.extrude(z: @csize.z + z_margin)
       end
 
       res = union(res) # put everything we have in a parent union that we can apply the transformations of this object of
@@ -103,13 +106,13 @@ module JennCad::Primitives
     def apply_flat_edge(edge)
       case edge
       when :up, :top
-        square(x: @x, y: @y/2.0).nc.moveh(y:@y)
+        square(x: @csize.x, y: @csize.y/2.0).nc.moveh(y:@csize.y)
       when :down, :bottom
-        square(x: @x, y: @y/2.0).nc
+        square(x: @csize.x, y: @csize.y/2.0).nc
       when :right
-        square(x: @x/2.0, y: @y).nc.moveh(x:@x)
+        square(x: @csize.x/2.0, y: @csize.y).nc.moveh(x:@csize.x)
       when :left
-        square(x: @x/2.0, y: @y).nc
+        square(x: @csize.x/2.0, y: @csize.y).nc
       else
         nil
       end

data/lib/jenncad/primitives/slot.rb

@@ -1,5 +1,6 @@
 module JennCad::Primitives
   class Slot < Primitive
+    include CircleIsh
     attr_accessor :d, :r, :h, :fn, :len_x, :len_y
 
     def initialize(args)
@@ -28,7 +29,11 @@ module JennCad::Primitives
         x: 0,
         y: 0,
         z: nil,
+        d1: nil,
+        d2: nil,
+        mode: :auto,
         cz: false,
+        az: false,
         margins: {
           r: 0,
           d: 0,
@@ -60,9 +65,12 @@ module JennCad::Primitives
       if ty
         @len_y = ty - @d
       end
+      if @opts[:z] && opts[:z].to_d > 0
+        @dimensions = [:x, :y, :z]
+      else
+        @dimensions = [:x, :y]
+      end
 
-      # TODO: this needs anchors like cube
-      # TODO: color on this needs to apply to hull, not on the cylinders.
       set_anchors
     end
 
@@ -76,11 +84,7 @@ module JennCad::Primitives
 
     def set_anchors
       @anchors = {} # reset anchors
-      if @opts[:d]
-        rad = @opts[:d] / 2.0
-      else
-        rad = @opts[:r]
-      end
+      rad = radius
 
       if @x > 0
         set_anchor :left, x: - rad
@@ -120,9 +124,39 @@ module JennCad::Primitives
       end
     end
 
+    def get_mode
+      if @opts[:d1] && @opts[:d2]
+        case @opts[:mode]
+        when nil, :auto
+          :dia1
+        when :cyl
+          :cyl
+        else
+          :dia1
+        end
+      else
+        :default
+      end
+    end
+
     def to_openscad
-      c1 = cylinder(@opts)
-      c2 = cylinder(@opts)
+      mode = get_mode
+
+      opts = @opts.clone
+      opts.delete(:color)
+
+      case mode
+      when :default
+        c1 = ci(opts)
+        c2 = ci(opts)
+      when :dia1 # new default mode; d1 start dia, d2 end dia
+        c1 = ci(opts.merge(d: @opts[:d1]))
+        c2 = ci(opts.merge(d: @opts[:d2]))
+      when :cyl # old mode; use cylinders
+        c1 = cy(opts)
+        c2 = cy(opts)
+      end
+
       if @len_x
         c2.move(x:@len_x)
       end
@@ -130,6 +164,14 @@ module JennCad::Primitives
         c2.move(y:@len_y)
       end
       res = c1 & c2
+      if mode != :cyl && @z.to_d > 0
+        res = res.e(@z)
+      elsif @opts[:az] == true
+        # TODO: this needs testing, may not work
+        res = res.auto_extrude
+      end
+      res.inherit_color(self)
+
       if @a != 0.0
         res = res.rotate(z:@a)
       end

data/lib/jenncad/primitives/square.rb

@@ -28,6 +28,8 @@ module JennCad::Primitives
       @x = args[:x]
       @y = args[:y]
       @dimensions = [:x, :y]
+      @sits_on = :bottom
+      @csize = Size.new(x: @opts[:x], y: @opts[:y])
     end
 
 
@@ -42,6 +44,8 @@ module JennCad::Primitives
 
     def set_anchors_2d
       @anchors = {} # this resets anchors
+      @corners = [:top_right, :top_left, :bottom_right, :bottom_left]
+      @sides = [:left, :right, :top, :bottom]
 
       if @opts[:center] || @opts[:center_x]
         left = -@opts[:x] / 2.0
@@ -135,8 +139,6 @@ module JennCad::Primitives
       self
     end
 
-
-
     def not_centered
       @opts[:center] = false
       set_anchors
@@ -160,8 +162,6 @@ module JennCad::Primitives
     end
     alias :center_y :cy
 
-
-
     def centered_axis
       return [:x, :y] if @opts[:center]
       a = []
@@ -172,10 +172,8 @@ module JennCad::Primitives
     end
 
     def to_openscad
-      self.mh(centered_axis.to_h{|a| [a, -@opts[a]] }) # center cube
+      self.mh(centered_axis.to_h{|a| [a, -@opts[a]] }.merge(prepend: true)) # center cube
     end
 
-
-
   end
 end