jenncad 1.0.0.pre.alpha15 → 1.0.0.pre.alpha16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eebd115b8e6783b61fff33f1b002f935f3d2c2023df70df9ff3b9850f12245f
-  data.tar.gz: 806a99e1195f98ee1e8450030f9e2809c11217af7bf19e8cac88ad9408146a40
+  metadata.gz: ef20af7d3fc9a11140dacb23030a9ba671a80cbd39491caed609d6755f8bc85c
+  data.tar.gz: 4e515e6fbedcfa16b315b8ea02cafe8a6d41207fbdd9aece996165edee7f9214
 SHA512:
-  metadata.gz: a120ac12bfe18f3532560c10452ae9460d21bd8ba2e4d287669b9b23cdf903476541fed341b81ce7feb8e906ccc8087a7a0f46f5f49e63d66b6421cd8e4d0984
-  data.tar.gz: 06e239cea5a153ecb3b8ab1873574bc8d9a03e51d1c0d75e5fe72f393e1584971bbc2ba388d9da82ce58cc79c2f949e206962be9052da29b0a24e351c176a53d
+  metadata.gz: 17111c38b461ecdf683d2813284279b4bced3296d97dc9aebdf17797955affea2ad275bd21f5935680c09a8f08234ebac9c5bbb67ce197fdfe6c3e0a6489d0cf
+  data.tar.gz: 9022e918187212aa81f4f02b28c9a9ac11d7b8d36c6afb36835346298309ec2204430478032c406177315ee9807d0513bb52f0d8581dfec9c3df13e91b42f5f8

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

@@ -178,6 +178,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 +214,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/cube.rb

@@ -101,6 +101,11 @@ module JennCad::Primitives
     end
 
     def inner_anchors(dist, prefix=:inner_, recreate=false)
+      if dist.nil?
+        $log.error "Distance of nil passed to inner anchors. Please check the variable name you passed along"
+        return self
+      end
+
       @inner_anchor_defs ||= []
       @inner_anchor_defs << { "dist": dist, "prefix": prefix } unless recreate
 

data/lib/jenncad/primitives/cylinder.rb

@@ -139,6 +139,14 @@ module JennCad::Primitives
       end
     end
 
+    def z=(val)
+      @z = val
+      @h = val
+      opts[:h] = val
+      opts[:z] = val
+      set_anchors
+    end
+
     def h
       z + z_margin
     end

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,11 @@
 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
+      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/rounded_cube.rb

@@ -64,18 +64,20 @@ module JennCad::Primitives
       res
     end
 
-    def flat(edge)
+    def flat(*edges)
       @opts[:flat_edges] ||= []
-      @opts[:flat_edges] << edge
+      edges.each do |edge|
+        @opts[:flat_edges] << edge
+      end
       self
     end
 
     private
     def apply_flat_edge(edge)
       case edge
-      when :up
+      when :up, :top
         cube(x: @x, y: @y/2.0, z: @z).nc.moveh(y:@y)
-      when :down
+      when :down, :bottom
         cube(x: @x, y: @y/2.0, z: @z).nc
       when :right
         cube(x: @x/2.0, y: @y, z: @z).nc.moveh(x:@x)

data/lib/jenncad/primitives/slot.rb

@@ -14,16 +14,21 @@ module JennCad::Primitives
         args = [:d, :z].zip(args.flatten).to_h
         args.deep_merge!(m)
       end
-
-      args[:z] ||= args[:h]
+      args = parse_xyz_shortcuts(args)
+      if args[:z].to_d > 0
+        args[:h] = args[:z]
+      else
+        args[:z] = nil
+      end
 
       @opts = {
         d: 0,
         a: 0,
-        z: nil,
         r: nil,
         x: 0,
         y: 0,
+        z: nil,
+        cz: false,
         margins: {
           r: 0,
           d: 0,
@@ -33,9 +38,13 @@ module JennCad::Primitives
 
       super(opts)
 
-      @d = @opts[:d]
-      @a = @opts[:a]
-      @h = @opts[:h]
+      @d = @opts[:d].to_d
+      @a = @opts[:a].to_d
+      @h = @opts[:h].to_d
+      @z = @h
+      @x = @opts[:x].to_d
+      @y = @opts[:y].to_d
+
       @r = @opts[:r] || nil
       if @r
         @d = @r * 2
@@ -54,7 +63,61 @@ module JennCad::Primitives
 
       # TODO: this needs anchors like cube
       # TODO: color on this needs to apply to hull, not on the cylinders.
+      set_anchors
+    end
+
+    def cz
+      @opts[:cz] = true
+      @transformations << Move.new(z: -@z / 2.0)
+      set_anchors
+      self
+    end
+
+
+    def set_anchors
+      @anchors = {} # reset anchors
+      if @opts[:d]
+        rad = @opts[:d] / 2.0
+      else
+        rad = @opts[:r]
+      end
 
+      if @x > 0
+        set_anchor :left, x: - rad
+        set_anchor :right, x: @x + rad
+      elsif @x < 0
+        set_anchor :left, x: @x - rad
+        set_anchor :right, x: rad
+      else
+        set_anchor :left, x: -rad
+        set_anchor :right, x: rad
+      end
+      if @y > 0
+        set_anchor :bottom, y: - rad
+        set_anchor :top, y: @y + rad
+      elsif @y < 0
+        set_anchor :bottom, y: @y - rad
+        set_anchor :top, y: rad
+      else
+        set_anchor :bottom, y: -rad
+        set_anchor :top, y: rad
+      end
+
+      set_anchor :center1, xy: 0
+      set_anchor :center2, x: @x, y: @y
+
+      # 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 to_openscad

data/lib/jenncad/primitives/subtract_object.rb

@@ -57,6 +57,7 @@ module JennCad::Primitives
       others.each do |part|
         #puts part.inspect
         #puts "#{part.calc_z+part.calc_h} ; #{compare_h}"
+        add_z = nil
         if part.respond_to? :z
           part.opts[:margins] ||= {}
           if part.referenced_z && part.z != 0.0
@@ -64,28 +65,40 @@ module JennCad::Primitives
             when JennCad::Circle
             when JennCad::BooleanObject
             else
-              $log.debug part if part.opts[:debug]
+              # $log.debug part if part.opts[:debug]
               part.opts[:margins][:z] ||= 0.0
               unless part.opts[:margins][:z] == 0.2
+                $log.debug "fixing possible z fighting for referenced object: #{part.class} #{part.z} 0.1 down" if part.opts[:debug]
                 part.opts[:margins][:z] = 0.2
                 part.mz(-0.1)
               end
             end
           elsif part.z == compare_h
             $log.debug "fixing possible z fighting: #{part.class} #{part.z}" if part.opts[:debug]
-            part.opts[:margins][:z] += 0.008
-            part.mz(-0.004)
+            add_z = 0.008
+            move_z = -0.004
           elsif part.calc_z == compare_z
 #            puts "z fighting at bottom: #{part.calc_z}"
-            part.opts[:margins][:z] += 0.004
+            add_z = 0.004
            # part.z+=0.004
-            part.mz(-0.002)
+            move_z = -0.002
           elsif part.calc_z.to_d+part.calc_h.to_d == compare_h
 #            puts "z fighting at top: #{compare_h}"
             #part.z+=0.004
-            part.opts[:margins][:z] += 0.004
-            part.mz(0.002)
+            add_z = 0.004
+            move_z = 0.002
           end
+
+          if add_z
+            if part.kind_of? Part
+              part.modify_values(part, {z: add_z}, {mode: :add})
+            end
+            part.opts[:margins][:z] += add_z
+            part.mz(move_z)
+          end
+
+
+
         end
       end
     end

data/lib/jenncad/primitives.rb

@@ -5,6 +5,7 @@ require "jenncad/primitives/sphere"
 require "jenncad/primitives/cube"
 require "jenncad/primitives/rounded_cube"
 require "jenncad/primitives/polygon"
+require "jenncad/primitives/polyhedron"
 require "jenncad/primitives/slot"
 require "jenncad/primitives/boolean_object"
 require "jenncad/primitives/union_object"

data/lib/jenncad/shortcuts.rb

@@ -18,6 +18,10 @@ module JennCad
     Polygon.new(args).set_parent(self)
   end
 
+  def polyhedron(args)
+    Polyhedron.new(args).set_parent(self)
+  end
+
   def slot(*args)
     Slot.new(args).set_parent(self)
   end

data/lib/jenncad/thing.rb

@@ -35,12 +35,70 @@ module JennCad
 
     def set_flag(key)
       set_option(key, true)
+      self
     end
 
     def unset_flag(key)
       set_option(key, false)
+      self
+    end
+
+
+    def cut_to(face, part=nil, args={})
+      an = anchor(face, part)
+      unless an
+        $log.error "Cannot find anchor to cut_to"
+        return self
+      end
+      if an[:z].to_d == 0.0
+        $log.error "cut_to only supports cuts to an anchor with Z set. This anchor: #{an}"
+        return self
+      end
+      modify_values(self, z: an[:z].to_d)
+      self.name="#{self.class}_cut_to_#{an[:z].to_f}"
+      self
+    end
+
+    def modify_values(parts, value, opts = {})
+      case parts
+       when Array
+          parts.each do |pa|
+            modify_values(pa, value, opts)
+          end
+        else
+          if parts.kind_of?(BooleanObject)
+            modify_values(parts.only_additives_of(parts), value, opts)
+          elsif parts.kind_of?(Part)
+            modify_values(parts.part, value, opts)
+            modify_values(parts.get_contents, value, opts)
+            parts.modify_values!(value, opts)
+          elsif parts.kind_of?(Primitive)
+            parts.modify_values!(value, opts)
+          end
+      end
+    end
+
+    def modify_values!(values, opts)
+      $log.info "Modify value! #{self.class} #{values}" if self.debug?
+      values.each do |key, val|
+        if @opts
+          case opts[:mode]
+            when :add
+              @opts[key] = @opts[key].to_d + val.to_d
+            when :sub
+              @opts[key] = @opts[key].to_d - val.to_d
+            else
+              @opts[key] = val
+          end
+        end
+        if self.respond_to? key
+          self.send("#{key}=", @opts[key])
+        end
+      end
+      $log.info "Modified value now: #{self.inspect}" if self.debug?
     end
 
+
     def debug?
       option(:debug) || false
     end
@@ -55,20 +113,22 @@ module JennCad
       self
     end
 
-    def anchor(name, thing=nil)
+    def anchor(name, thing=nil, args={})
       if thing
-        res = thing.anchor(name)
+        res = thing.anchor(name, nil, args)
         return res unless res.nil?
       end
       @anchors ||= {}
       if anch = @anchors[name]
         return anch
+      elsif args[:fail_quick] && args[:fail_quick] == true
+        return
       elsif @parent
         return @parent.anchor(name)
       elsif self.respond_to? :get_contents
         con = get_contents
         if con.respond_to? :anchor
-          con.anchor(name)
+          con.anchor(name, nil, fail_quick: true)
         end
       end
     end
@@ -82,9 +142,19 @@ module JennCad
     alias :sa :set_anchor
 
     def set_anchor_from(name, new_name, args={})
-      a = anchor(name).dup
+      unless name.kind_of? Symbol or name.kind_of? String
+        $log.error "set_anchor_from: name must be a string or symbol. Supplied: #{name}"
+        return
+      end
+      unless new_name.kind_of? Symbol or new_name.kind_of? String
+        $log.error "set_anchor_from: new_name must be a string or symbol. Supplied: #{new_name}"
+        return
+      end
+
+
+      a = anchor(name, args[:from]).dup
       if !a
-        log.error "set_anchor_from couldn't find anchor #{name}"
+        $log.error "set_anchor_from couldn't find anchor #{name}"
         return
       end
 
@@ -213,6 +283,27 @@ module JennCad
      return args
     end
 
+    # reset last move
+    def reset_last_move
+      lt = @transformations.last
+      unless lt.class == Move
+        $log.error "Tried to call rst_move but last object is a #{lt.class}"
+        return self
+      end
+      @transformations.delete_at(-1)
+
+      self
+    end
+    alias :rstlm :reset_last_move
+
+    # resets all transformations
+    def reset
+      @transformations = []
+      self
+    end
+    alias :rst :reset
+
+
     def move(args={})
       return self if args.nil? or args.empty?
 
@@ -275,7 +366,7 @@ module JennCad
         thing = nil
       end
 
-      an = anchor(key, thing)
+      an = anchor(key, thing, args)
 
       unless an
         $log.error "Error: Anchor #{key} not found"
@@ -293,6 +384,7 @@ module JennCad
         end
       end
     end
+    alias :ma :movea
 
     # move to anchor - inverted
     def moveai(key, thing=nil, args={})
@@ -303,7 +395,7 @@ module JennCad
       args[:inverted] = true
       movea(key, thing, args)
     end
-
+    alias :mai :moveai
 
     # move half
     def moveh(args={})
@@ -549,7 +641,7 @@ module JennCad
       return @parts unless @parts.nil?
 
       if @cache
-        return @cache
+        return @cache unless option(:no_cache) == true
       end
 
       if self.respond_to? :part
@@ -661,5 +753,12 @@ module JennCad
       end
     end
 
+
+    def to_mod(name)
+      a = Aggregation.new(name, self)
+      a.transformations = @transformations
+      a
+    end
+
   end
 end

data/lib/jenncad/version.rb

@@ -1,3 +1,3 @@
 module JennCad
-  VERSION = "1.0.0-alpha15"
+  VERSION = "1.0.0-alpha16"
 end

data/lib/jenncad.rb

@@ -6,7 +6,6 @@ require "geo3d"
 require "deep_merge"
 require "fileutils"
 require "observr"
-require "hanami/cli"
 require "active_support"
 
 include Math

data/todo.txt

@@ -11,16 +11,6 @@
 Features wanted
 ===================
 28.4.22:
-- Parts often come with 4 holes around a center, and I often do something like:
-
-[-1, 1].each do |i|
-	[-1, 1].each do |j|
-		res += @bolt.cut.move(x: @hole_center*i, y: @hole_center*j)
-	end
-end
-
-there should be a shorter way to do this.
-
 
 - instead of moving Bolts output, make it the default to make their positions an anchor
 
@@ -34,6 +24,12 @@ there should be a shorter way to do this.
 	 - but also, when you have a part that can be mounted in any top/bottom direction, 	you always end up having the bolts facing the wrong direction..
 - Bolts should be able to also make thread inserts
 
+8.5.22:
+- need an easy way to switch between faces on an object to work efficiently in a 2.5D way
+	i.e. I worked on a part stacking a few things, added a cube along and now wanted to use inner_anchors for the y face for screws. it was easier to make anchors manually for the prototype
+
+
+
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha15
+  version: 1.0.0.pre.alpha16
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -137,6 +137,7 @@ files:
 - lib/jenncad/primitives/intersection_object.rb
 - lib/jenncad/primitives/linear_extrude.rb
 - lib/jenncad/primitives/polygon.rb
+- lib/jenncad/primitives/polyhedron.rb
 - lib/jenncad/primitives/primitive.rb
 - lib/jenncad/primitives/projection.rb
 - lib/jenncad/primitives/rotate_extrude.rb