jenncad 1.0.0.pre.alpha14 → 1.0.0.pre.alpha15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb1887d6ae1d3fc87da9c816de1cd2cb54ea5fb3ce7f1277ca6af8bcfc4e687
-  data.tar.gz: 5cc6fd0fc52de9b8b9087dfadd0387122014b157c9573b091aa7c4570a5f2c6a
+  metadata.gz: 3eebd115b8e6783b61fff33f1b002f935f3d2c2023df70df9ff3b9850f12245f
+  data.tar.gz: 806a99e1195f98ee1e8450030f9e2809c11217af7bf19e8cac88ad9408146a40
 SHA512:
-  metadata.gz: 8f86a697557b258219756ba02c0bb0e478d1c240c05fd53ecb1221749caedd4e7bf7c3395c439f9c0d426e33366d104e71c20a89bca894ee8e0c843733a0446d
-  data.tar.gz: 4ee555b106f36751024a876ece4880b3cea9138e606c541457a809828645f399f3a417cc0f40256e7363bf20f2b212a20f27166429337062a297caddb21931e1
+  metadata.gz: a120ac12bfe18f3532560c10452ae9460d21bd8ba2e4d287669b9b23cdf903476541fed341b81ce7feb8e906ccc8087a7a0f46f5f49e63d66b6421cd8e4d0984
+  data.tar.gz: 06e239cea5a153ecb3b8ab1873574bc8d9a03e51d1c0d75e5fe72f393e1584971bbc2ba388d9da82ce58cc79c2f949e206962be9052da29b0a24e351c176a53d

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/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/cube.rb

@@ -82,6 +82,13 @@ module JennCad::Primitives
       set_anchor :top_right, x: right, y: top
       set_anchor :bottom_left, x: left, y: bottom
       set_anchor :bottom_right, x: right, y: bottom
+      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
 
       # we need to re-do the inner ones, if they were defined
       if @inner_anchor_defs && @inner_anchor_defs.size > 0

data/lib/jenncad/primitives/cylinder.rb

@@ -1,6 +1,6 @@
 module JennCad::Primitives
   class Cylinder < Primitive
-    attr_accessor :d, :d1, :d2, :r, :fn
+    attr_accessor :d, :d1, :d2, :r, :fn, :anchors
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
         args = args.first
@@ -24,6 +24,7 @@ module JennCad::Primitives
         r2: nil,
         z: nil,
         r: 0,
+        cz: false,
         margins: {
           r: 0,
           d: 0,
@@ -41,6 +42,35 @@ module JennCad::Primitives
       handle_radius_diameter
       handle_fn
       super(args)
+      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
+
+      # 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
@@ -60,7 +90,9 @@ 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
       @transformations << Move.new(z: -@z / 2.0)
+      set_anchors
       self
     end
 

data/lib/jenncad/shortcuts.rb

@@ -93,8 +93,8 @@ module JennCad
   private
   def boolean_operation(part, klass)
     if part.respond_to? :transformations
-      # Since ruby doesn't provide a way to make a deep clone, this seems to be the simplest solution that will effectively do that:
-      part = Marshal.load(Marshal.dump(part))
+      # Clone the part in place
+      part = part.fix
     end
 
     case self
@@ -103,7 +103,12 @@ module JennCad
     when klass
       add_or_new(part)
     else
-      klass.new(self,part)
+      own_part = if self.respond_to? :transformations
+        self.fix # clone self
+      else
+        self
+      end
+      klass.new(own_part,part)
     end
   end
 end

data/lib/jenncad/thing.rb

@@ -33,6 +33,23 @@ module JennCad
       @opts[key] = val
     end
 
+    def set_flag(key)
+      set_option(key, true)
+    end
+
+    def unset_flag(key)
+      set_option(key, false)
+    end
+
+    def debug?
+      option(:debug) || false
+    end
+
+    def fixate
+      Marshal.load(Marshal.dump(self))
+    end
+    alias :fix :fixate
+
     def set_parent(parent)
       @parent = parent
       self
@@ -64,6 +81,22 @@ module JennCad
     end
     alias :sa :set_anchor
 
+    def set_anchor_from(name, new_name, args={})
+      a = anchor(name).dup
+      if !a
+        log.error "set_anchor_from couldn't find anchor #{name}"
+        return
+      end
+
+      [:x, :y, :z, :xy, :xz, :xyz, :yz].each do |key|
+        a[key] ||= 0.to_d
+        args[key] ||= 0.to_d
+        a[key] += args[key]
+      end
+      set_anchor new_name, a
+    end
+    alias :saf :set_anchor_from
+
     def auto_extrude
       ret = self.extrude
       ret.set_option(:auto_extrude, true)
@@ -206,10 +239,12 @@ module JennCad
         end
 
         if lt && lt.class == Move && chain == false
+          $log.debug "#{self} at move: Adding to previous move #{lt.inspect} , args: #{args}" if self.debug?
           lt.x += args[:x].to_d
           lt.y += args[:y].to_d
           lt.z += args[:z].to_d
         else
+          $log.debug "#{self} at move: Adding move of #{args} to transformations" if self.debug?
           @transformations << Move.new(args)
         end
       end
@@ -488,6 +523,8 @@ module JennCad
         return "##{args}"
       when String
         return args
+      when Symbol
+        return args.to_s
       end
       nil
     end

data/lib/jenncad/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha14
+  version: 1.0.0.pre.alpha15
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -122,6 +122,7 @@ files:
 - lib/jenncad/features/climb.rb
 - lib/jenncad/features/cuttable.rb
 - lib/jenncad/features/feature.rb
+- lib/jenncad/features/multiples_of.rb
 - lib/jenncad/features/openscad_include.rb
 - lib/jenncad/features/path.rb
 - lib/jenncad/features/stl_import.rb