jenncad 1.0.0.pre.alpha10 → 1.0.0.pre.alpha13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14729ddf8a7adb190fd55bd555bff63515420acd3468daaa2d254a06069f213d
-  data.tar.gz: 41237b37c2a7bb301981fce8a44d7772e37fcd75880dba73b47872d4f9729dbe
+  metadata.gz: c4383fe5f1fe2d17d69eccd66bd28db4678281fd542bd13434064d4051044727
+  data.tar.gz: 0eb4435e845c47ec9b75d113c04b7beae9ce762a2dfa57b598412a243ded0163
 SHA512:
-  metadata.gz: 58e2c3db175c7fdbcdc34817460f44460766c4469dca347fe4a98163c2dd212e9510069f458ee152475385bb56d80f5a62b119002b8debd9c41b7a05ec567fe0
-  data.tar.gz: d094fd51199bb1de45d3952f9fc66f4f2aa685177f3c4064c984459b95ad4082d1af52b202bedf71a749e5a9c8347eea334042703aea5c229e591537fb9e2a5b
+  metadata.gz: 35001c199911e59f66a2ef3ce3b8c6193e5654ebc5463f52add3cb11a5aa3c1684c51dbaad7a3edaf4c0042cf2b2d35410ea01bfdce45e5adc72a96f30ec002b
+  data.tar.gz: 163e8e50aa1dd6ba930fd41e93075aca9f8bed93c6650f3a9984fbc86ddb34f0ae4a499d7fc981a38dfe9bdb1f56a0667a4cec018a530b701f4707141d79233c

data/lib/jenncad/exporters/openscad.rb

@@ -1,8 +1,10 @@
 module JennCad::Exporters
   class OpenScadObject
-    def initialize(cmd, args, children=[])
+    def initialize(cmd, args, children=[], modifier=nil)
       @command = cmd
       @args = args
+      @modifier = modifier || ""
+
       case children
       when Array
         @children = children
@@ -43,11 +45,11 @@ module JennCad::Exporters
     def handle_command(i=1)
       case @children.size
       when 0
-        "#{@command}(#{handle_args});"
+        "#{@modifier}#{@command}(#{handle_args});"
       when 1
-        "#{@command}(#{handle_args})#{@children.first.handle_command(i+1)}"
+        "#{@modifier}#{@command}(#{handle_args})#{@children.first.handle_command(i+1)}"
       when (1..)
-        res = "#{@command}(#{handle_args}){"
+        res = "#{@modifier}#{@command}(#{handle_args}){"
         res += nl
         inner = @children.map do |c|
           next if c == nil
@@ -185,7 +187,8 @@ module JennCad::Exporters
     def new_obj(part, cmd, args=nil, children=[])
       transform(part) do
         apply_color(part) do
-          OpenScadObject.new(cmd, args, children)
+          modifier = part.openscad_modifier || nil
+          OpenScadObject.new(cmd, args, children, modifier)
         end
       end
     end
@@ -242,7 +245,8 @@ module JennCad::Exporters
 
     def handle_aggregation(part, tabindex=0)
       register_module(part) unless @modules[part.name]
-      transform(part) do
+      $log.debug "aggregation #{part.name} transformations: #{part.transformations.inspect}" if part && part.option(:debug)
+      transform(part.clone) do
         new_obj(part, part.name, nil)
       end
     end

data/lib/jenncad/features/aggregation.rb

@@ -5,7 +5,7 @@ module JennCad::Features
     def initialize(name=nil, part=nil)
       super({})
       @name = name.gsub(".","_")
-      @parts = [part] # NOTE: single length arrayto make checking children easier
+      @parts = [part]
     end
 
     def z

data/lib/jenncad/part.rb

@@ -3,9 +3,13 @@ module JennCad
   class Part < Thing
 
     def to_openscad
-      a = Aggregation.new(self.class.to_s, self.part)
+      a = Aggregation.new(self.class.to_s, self.get_contents)
       a.transformations = @transformations
-      a.color(:auto)
+      if self.has_explicit_color?
+        a.color(self.color)
+      else
+        a.color(:auto)
+      end
       a
     end
 

data/lib/jenncad/primitives/boolean_object.rb

@@ -7,6 +7,7 @@ module JennCad::Primitives
       else
         @parts = parts
       end
+
       @parent = @parts.first.parent
 
       after_add
@@ -23,6 +24,7 @@ module JennCad::Primitives
     end
 
     def add(part)
+      return if part.nil?
       @parts << part
       after_add
     end
@@ -30,10 +32,17 @@ module JennCad::Primitives
     def after_add
       @parts.flatten!
       @parts.compact!
+      inherit_debug
       inherit_z
       inherit_zref
     end
 
+    def inherit_debug
+      if @parts.map{|l| l.option(:debug)}.include? true
+        set_option(:debug, true)
+      end
+    end
+
     def inherit_z
       heights = @parts.map{|l| l.calc_z.to_f}.uniq
       if heights.size > 1
@@ -77,6 +86,8 @@ module JennCad::Primitives
       when Array
         res << obj.map{|l| only_additives_of(l)}
       when SubtractObject
+        # include the thing that something was subtracted from to get the Z height if that is behind another layer of SubtractObject
+        res << only_additives_of(obj.parts.first)
       when IntersectionObject
       else
         res << obj

data/lib/jenncad/primitives/cube.rb

@@ -2,6 +2,7 @@ module JennCad::Primitives
   class Cube < Primitive
     extend JennCad::Features::Cuttable
 
+    attr_accessor :corners, :sides
 
     def feed_opts(args)
       # FIXME: this doesn't seem to work
@@ -47,6 +48,7 @@ module JennCad::Primitives
       @h = @z.dup
       @calc_h = @z.dup
 
+
       set_anchors
     end
 
@@ -56,28 +58,91 @@ module JennCad::Primitives
       if @opts[:center] || @opts[:center_x]
         left = -@opts[:x] / 2.0
         right = @opts[:x] / 2.0
+        mid_x = 0
       else
         left = 0
         right =  @opts[:x]
+        mid_x = @opts[:x] / 2.0
       end
       if @opts[:center] || @opts[:center_y]
         bottom = -@opts[:y] / 2.0
         top = @opts[:y] / 2.0
+        mid_y = 0
       else
         bottom = 0
         top = @opts[:y]
+        mid_y = @opts[:y] / 2.0
       end
 
-      set_anchor :left, x: left
-      set_anchor :right, x: right
-      set_anchor :top, y: top
-      set_anchor :bottom, y: bottom
+      set_anchor :left, x: left, y: mid_y
+      set_anchor :right, x: right, y: mid_y
+      set_anchor :top, x: mid_x, y: top
+      set_anchor :bottom, x: mid_x, y: bottom
       set_anchor :top_left, x: left, y: top
       set_anchor :top_right, x: right, y: top
       set_anchor :bottom_left, x: left, y: bottom
       set_anchor :bottom_right, x: right, y: bottom
+
+      # we need to re-do the inner ones, if they were defined
+      if @inner_anchor_defs && @inner_anchor_defs.size > 0
+        @inner_anchor_defs.each do |anch|
+         inner_anchors(anch[:dist], anch[:prefix], true)
+        end
+      end
+
+      self
     end
 
+    def inner_anchors(dist, prefix=:inner_, recreate=false)
+      @inner_anchor_defs ||= []
+      @inner_anchor_defs << { "dist": dist, "prefix": prefix } unless recreate
+
+#      $log.info "dist: #{dist}, prefix: #{prefix}"
+      sides = {
+        left: {x: dist, y: 0},
+        right: {x: -dist, y: 0},
+        top: {x: 0, y: -dist},
+        bottom: {x: 0, y: dist},
+      }
+      corners = {
+        top_left: {x: dist, y: -dist},
+        top_right: {x: -dist, y: -dist},
+        bottom_left: {x: dist, y: dist},
+        bottom_right: {x: -dist, y: dist},
+      }
+      new_sides = []
+      new_corners = []
+
+      sides.merge(corners).each do |key, vals|
+        new_dist = anchor(key).dup
+        new_dist[:x] += vals[:x]
+        new_dist[:y] += vals[:y]
+        name = [prefix, key].join.to_sym
+#        $log.info "Set anchor #{name} , new dist #{new_dist}"
+        set_anchor name, new_dist
+        if sides.include? key
+          new_sides << name
+        end
+        if corners.include? key
+          new_corners << name
+        end
+      end
+
+      sides_name = [prefix, "sides"].join
+      corners_name = [prefix, "corners"].join
+      all_name = [prefix, "all"].join
+      self.class.__send__(:attr_accessor, sides_name.to_sym)
+      self.class.__send__(:attr_accessor, corners_name.to_sym)
+      self.class.__send__(:attr_accessor, all_name.to_sym)
+      self.__send__("#{sides_name}=", new_sides)
+      self.__send__("#{corners_name}=", new_corners)
+      self.__send__("#{all_name}=", new_corners+new_sides)
+
+
+      self
+    end
+
+
     # used for openscad export
     def size
       [@x, @y, z+z_margin]

data/lib/jenncad/primitives/slot.rb

@@ -36,10 +36,25 @@ module JennCad::Primitives
       @d = @opts[:d]
       @a = @opts[:a]
       @h = @opts[:h]
-      @r = @opts[:r]
+      @r = @opts[:r] || nil
+      if @r
+        @d = @r * 2
+      end
       @fn = @opts[:fn]
       @len_x = @opts[:x]
       @len_y = @opts[:y]
+      tx = @opts[:tx] || @opts[:total_x] || nil
+      ty = @opts[:ty] || @opts[:total_y] || nil
+      if tx
+        @len_x = tx - @d
+      end
+      if ty
+        @len_y = ty - @d
+      end
+
+      # TODO: this needs anchors like cube
+      # TODO: color on this needs to apply to hull, not on the cylinders.
+
     end
 
     def to_openscad

data/lib/jenncad/primitives/subtract_object.rb

@@ -3,10 +3,16 @@ module JennCad::Primitives
     def inherit_z
       @z = 0
       @calc_z = parts.first.calc_z.to_f
+
       only_additives_of(@parts).each do |p|
+        if option(:debug)
+          $log.debug "inherit_z checks for: #{p}"
+        end
         z = p.z.to_f
         @z = z if z > @z
       end
+      $log.debug "inherit_z called, biggest z found: #{@z}" if option(:debug)
+
     end
 
     def get_heights(obj)
@@ -58,7 +64,7 @@ module JennCad::Primitives
             when JennCad::Circle
             when JennCad::BooleanObject
             else
-              pp 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
                 part.opts[:margins][:z] = 0.2
@@ -66,7 +72,7 @@ module JennCad::Primitives
               end
             end
           elsif part.z == compare_h
-#            puts "fixing possible z fighting: #{part.class} #{part.z}"
+            $log.debug "fixing possible z fighting: #{part.class} #{part.z}" if part.opts[:debug]
             part.opts[:margins][:z] += 0.008
             part.mz(-0.004)
           elsif part.calc_z == compare_z

data/lib/jenncad/shortcuts.rb

@@ -39,7 +39,7 @@ module JennCad
   end
 
   def stl(file, args={})
-    StlImport.new(file, args)
+    StlImport.new(file, args).set_parent(self)
   end
 
   def extrude(args={})
@@ -92,6 +92,11 @@ 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))
+    end
+
     case self
     when nil
       part

data/lib/jenncad/thing.rb

@@ -19,10 +19,8 @@ module JennCad
       @calc_h = args[:z] || 0
       @anchors = {}
       @parent = args[:parent]
-      if @parent
-        log.info "Parent: #{@parent}"
-      end
       @opts ||= args
+      @cache = nil
     end
 
     def option(key)
@@ -42,13 +40,19 @@ module JennCad
 
     def anchor(name, thing=nil)
       if thing
-        return thing.anchor(name)
+        res = thing.anchor(name)
+        return res unless res.nil?
       end
       @anchors ||= {}
       if anch = @anchors[name]
         return anch
       elsif @parent
         return @parent.anchor(name)
+      elsif self.respond_to? :get_contents
+        con = get_contents
+        if con.respond_to? :anchor
+          con.anchor(name)
+        end
       end
     end
     alias :a :anchor
@@ -212,6 +216,7 @@ module JennCad
     # move to anchor
     def movea(key, thing=nil)
       an = anchor(key, thing)
+
       unless an
         $log.error "Error: Anchor #{key} not found"
         $log.error "Available anchors: #{@anchors}"
@@ -344,36 +349,14 @@ module JennCad
     def get_children(item, stop_at)
       res = [item]
       if item.respond_to?(:parts) && item.parts != nil
-        item.parts.each do |part|
-          unless stop_at != nil && part.kind_of?(stop_at)
-            res << get_children(part, stop_at)
+        item.parts.each do |pa|
+          unless stop_at != nil && pa.kind_of?(stop_at)
+            res << get_children(pa, stop_at)
           end
         end
       end
       res
     end
-=begin    def make_openscad_compatible
-      make_openscad_compatible!(self)
-    end
-
-    def make_openscad_compatible!(item)
-      if item.respond_to?(:parts) && item.parts != nil
-        item.parts.each_with_index do |part, i|
-          if part.respond_to? :to_openscad
-            item.parts[i] = part.to_openscad
-          else
-            item.parts[i] = part.make_openscad_compatible
-          end
-        end
-      elsif item.respond_to? :part
-        item = item.part.make_openscad_compatible
-      end
-      if item.respond_to? :to_openscad
-        item = item.to_openscad
-      end
-      item
-    end
-=end
 
     def inherit_color(other)
       self.set_option(:color, other.option(:color))
@@ -389,11 +372,14 @@ module JennCad
 
     def only_color?(parts, lvl=0)
       return true if parts == nil
+      unless parts.kind_of? Array
+        parts = [parts]
+      end
 
       parts.each do |part|
-#        puts "  " * lvl + "[only_color?] #{part}"
+        #puts "  " * lvl + "[only_color?] #{part}"
         if part.has_explicit_color?
-#          puts "  " * lvl + "found explicit color here"
+          #puts "  " * lvl + "found explicit color here: #{part.color}"
           return false
         end
         if !only_color?(part.parts, lvl+1)
@@ -409,14 +395,14 @@ module JennCad
       parts.each do |part|
         unless part.has_explicit_color?
           if only_color?(part.parts, lvl+1)
-#            puts "  " * lvl + "children have no explicit color, setting it here"
+            #puts "  " * lvl + "children have no explicit color, setting it here"
             part.set_auto_color(col)
           else
-#            puts "  " * lvl + "[set_auto_color_for_children] #{part}"
+            #puts "  " * lvl + "[set_auto_color_for_children] #{part}"
             set_auto_color_for_children(col, part.parts, lvl+1)
           end
         else
-#          puts "  " * lvl + "[set_auto_color_for_children] this part has a color, ignoring their children"
+          #puts "  " * lvl + "[set_auto_color_for_children] this part has a color #{part.color}, ignoring their children"
         end
 
       end
@@ -492,8 +478,15 @@ module JennCad
 
     def get_contents
       return @parts unless @parts.nil?
+
+      if @cache
+        return @cache
+      end
+
       if self.respond_to? :part
-        return [part]
+        # cache things to prevent calling the code in #part multiple times
+        @cache = part
+        return @cache
       end
     end
 
@@ -506,6 +499,9 @@ module JennCad
 
     def find_calculated_h(parts)
       return if parts == nil
+      unless parts.kind_of? Array
+        parts = [parts]
+      end
       parts.each do |part|
         if z = calculated_h
           return z
@@ -516,6 +512,10 @@ module JennCad
 
     def set_heights_for_auto_extrude(parts, parent=nil)
       return if parts.nil?
+      unless parts.kind_of? Array
+        parts = [parts]
+      end
+
       parts.each do |part|
         if part.option(:auto_extrude)
           part.z = parent.calculated_h
@@ -532,6 +532,37 @@ module JennCad
       JennCad::Exporters::OpenScad.new(self).save(file)
     end
 
+    def ghost
+      set_option :ghost, true
+      set_option :no_auto_color, true
+      set_option :color, nil
+      set_option :auto_color, false
+      self
+    end
+
+    def hide
+      set_option :hide, true
+      self
+    end
+
+    def only
+      set_option :only, true
+      self
+    end
+
+    def hl
+      set_option :highlight, true
+      self
+    end
+
+    def openscad_modifier
+      return "%" if option(:ghost)
+      return "#" if option(:highlight)
+      return "!" if option(:only)
+      return "*" if option(:hide)
+      nil
+    end
+
     def referenced_z
      return false if @z.to_f != 0.0
      return option(:zref) if option(:zref)

data/lib/jenncad/version.rb

@@ -1,4 +1,3 @@
 module JennCad
-  VERSION = "1.0.0-alpha10"
+  VERSION = "1.0.0-alpha13"
 end
-

metadata

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