jenncad 1.0.0.pre.alpha17 → 1.0.0.pre.alpha20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be56296dfd0c04706441288172b3493d918f76a05ee92fa1004ce0c619e6d1c0
-  data.tar.gz: 7b1130259db67a2a0e75e8074265958fac8ada1dbd6a3ce34de2dc4050a1d7a9
+  metadata.gz: 4b40abab4dd5266ab776011e3f74da94297c9dfb0970323c5b9b07dcd6b61e8b
+  data.tar.gz: be32b5395b42f0d77d21ab0e6e5494a07d0b0716b5fc995b2838824197439c3c
 SHA512:
-  metadata.gz: 76e84ad22e862bc9b961d4e96382d0c40ebdfe6ab2ff2ee709c5e90faf7eb01b5199612abb4c0950c193cef97c4a43a895b2e071c306a9036d018ac135416adc
-  data.tar.gz: df24c4d80c52738a6223dd0ac7d20a8448c06839c7c448e436afa0501d659276d7e28dc5c0a23cf2742babd13475e5afb1be8aa13bf69916fc8b4844306b006e
+  metadata.gz: e38fafc310e30794502cec692ae8882a8335c24c332e64c13aa242bf9686d5905eef785758bc6862718e8ef8e2255d0fcf6df542dea63062b131a35fe0935adf
+  data.tar.gz: 170b50b86a8207e2875fd84943b1af9bad9a528054e947417f1c324578c50d897527d66115aa47b23307d696f205f8cd226268496f50d0ed75b40122b07e9a9e

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/primitives/boolean_object.rb

@@ -7,6 +7,11 @@ 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}")
       end

data/lib/jenncad/primitives/linear_extrude.rb

@@ -10,10 +10,15 @@ module JennCad::Primitives
       @twist = args[:twist]
       @slices = args[:slices]
       @fn = args[:fn]
+      @opts = {
+        margins: {
+          z: 0,
+        }
+      }.deep_merge(args)
     end
 
     def height
-      @z
+      @z.to_d + @opts[:margins][:z].to_d
     end
 
     def openscad_params

data/lib/jenncad/primitives/rounded_cube.rb

@@ -45,7 +45,6 @@ module JennCad::Primitives
       end
       init(args)
 
-
       handle_margins
       handle_diameter
       if @opts[:z] && opts[:z].to_d > 0
@@ -53,7 +52,7 @@ module JennCad::Primitives
       else
         @dimensions = [:x, :y]
       end
-
+      set_anchors
     end
 
     def to_openscad

data/lib/jenncad/thing.rb

@@ -47,7 +47,6 @@ module JennCad
       self
     end
 
-
     def cut_to(face, part=nil, args={})
       an = anchor(face, part)
       unless an
@@ -145,6 +144,20 @@ module JennCad
     end
     alias :sa :set_anchor
 
+    def copy_anchors(thing)
+      @anchors = thing.anchors
+    end
+
+    def copy_anchor(name, thing=nil)
+      # since it might be confusing to use / use shortcuts for copy_anchor and copy_anchors, let copy_anchor copy all of them when only one parameter is given
+      if thing.nil?
+        return copy_anchors(name)
+      end
+      @anchors ||= {}
+      @anchors[name] = thing.anchor(name)
+    end
+    alias :cpa :copy_anchor
+
     def set_anchor_from(name, new_name, args={})
       unless name.kind_of? Symbol or name.kind_of? String
         $log.error "set_anchor_from: name must be a string or symbol. Supplied: #{name}"
@@ -363,6 +376,29 @@ module JennCad
       move(z:v)
     end
 
+    # Perform something at an anchor location block
+    def at(keys, thing=nil, args={}, &block)
+      unless keys.kind_of? Array
+        keys = [keys]
+      end
+
+      part = self
+      keys.each do |key|
+        if key.kind_of? Hash
+          an = key
+        else
+          an = anchor(key, thing, args)
+        end
+        unless an
+          $log.error "at on #{thing.class} could not find anchor #{key}"
+          an = {} # this will move by 0,0 and still display the block
+        end
+        part.movei(an)
+        part = block.yield.move(an)
+      end
+      part
+    end
+
     # move to anchor
     def movea(key, thing=nil, args={})
       if thing.kind_of? Hash # if you leave out thing, args may be interpreted as thing
@@ -445,8 +481,8 @@ module JennCad
     end
     alias :mi :mirror
 
-    def miz
-      mirror(z:1)
+    def mix
+      mirror(x:1)
     end
 
     def miy

data/lib/jenncad/version.rb

@@ -1,3 +1,3 @@
 module JennCad
-  VERSION = "1.0.0-alpha17"
+  VERSION = "1.0.0-alpha20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha17
+  version: 1.0.0.pre.alpha20
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-15 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d