jenncad 1.0.0.pre.alpha14 → 1.0.0.pre.alpha17

data/lib/jenncad/shortcuts.rb

@@ -3,6 +3,11 @@ module JennCad
     Circle.new(args).set_parent(self)
   end
 
+  def square(args)
+    Square.new(args).set_parent(self)
+  end
+  alias :sq :square
+
   def cylinder(*args)
     Cylinder.new(args).set_parent(self)
   end
@@ -18,6 +23,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
@@ -32,6 +41,7 @@ module JennCad
   end
   alias :rcube :rounded_cube
   alias :rc :rounded_cube
+  alias :rsq :rounded_cube
 
   # import/use OpenScad library
   def import(import,name,args)
@@ -93,8 +103,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 +113,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

@@ -11,6 +11,10 @@ module JennCad
     attr_accessor :parent
 
     def initialize(args={})
+      init(args)
+    end
+
+    def init(args={})
       @transformations = []
       # calculated origin; only works for move atm
       @calc_x = 0
@@ -18,7 +22,7 @@ module JennCad
       @calc_z = 0
       @calc_h = args[:z] || 0
       @anchors = {}
-      @parent = args[:parent]
+      @parent = args[:parent] || nil
       @opts ||= args
       @cache = nil
     end
@@ -33,25 +37,102 @@ module JennCad
       @opts[key] = val
     end
 
+    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
+
+    def fixate
+      Marshal.load(Marshal.dump(self))
+    end
+    alias :fix :fixate
+
     def set_parent(parent)
       @parent = parent
       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
@@ -64,6 +145,32 @@ module JennCad
     end
     alias :sa :set_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}"
+        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}"
+        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)
@@ -180,6 +287,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?
 
@@ -206,10 +334,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
@@ -240,7 +370,7 @@ module JennCad
         thing = nil
       end
 
-      an = anchor(key, thing)
+      an = anchor(key, thing, args)
 
       unless an
         $log.error "Error: Anchor #{key} not found"
@@ -258,6 +388,7 @@ module JennCad
         end
       end
     end
+    alias :ma :movea
 
     # move to anchor - inverted
     def moveai(key, thing=nil, args={})
@@ -268,7 +399,7 @@ module JennCad
       args[:inverted] = true
       movea(key, thing, args)
     end
-
+    alias :mai :moveai
 
     # move half
     def moveh(args={})
@@ -488,6 +619,8 @@ module JennCad
         return "##{args}"
       when String
         return args
+      when Symbol
+        return args.to_s
       end
       nil
     end
@@ -512,7 +645,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
@@ -624,5 +757,25 @@ module JennCad
       end
     end
 
+    def to_mod(name)
+      a = Aggregation.new(name, self)
+      a.transformations = @transformations
+      a
+    end
+
+    def is_2d?
+      !is_3d?
+    end
+
+    def is_3d?
+      if self.respond_to?(:dimensions) && self.dimensions
+        return true if self.dimensions && self.dimensions.include?(:z)
+      else
+        # assume true if not set
+        return true
+      end
+      false
+    end
+
   end
 end

data/lib/jenncad/version.rb

@@ -1,3 +1,3 @@
 module JennCad
-  VERSION = "1.0.0-alpha14"
+  VERSION = "1.0.0-alpha17"
 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.alpha14
+  version: 1.0.0.pre.alpha17
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-05-15 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
@@ -136,12 +137,14 @@ 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
 - lib/jenncad/primitives/rounded_cube.rb
 - lib/jenncad/primitives/slot.rb
 - lib/jenncad/primitives/sphere.rb
+- lib/jenncad/primitives/square.rb
 - lib/jenncad/primitives/subtract_object.rb
 - lib/jenncad/primitives/union_object.rb
 - lib/jenncad/profile_loader.rb