jenncad 1.0.0.pre.alpha12 → 1.0.0.pre.alpha13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceeccb1511db4a12b24c38116c2daa1835f9a64f3c62fe8446feea6712c9f200
-  data.tar.gz: 5b25c737ac0ba61039f7a54d8810a6fd94f2057ca2c482027683105adc767e54
+  metadata.gz: c4383fe5f1fe2d17d69eccd66bd28db4678281fd542bd13434064d4051044727
+  data.tar.gz: 0eb4435e845c47ec9b75d113c04b7beae9ce762a2dfa57b598412a243ded0163
 SHA512:
-  metadata.gz: e509d98347b1a96093fb62ccea12c3e71733f3af4e946694286783e54958245b99373c9721b338bc4da17ddac531a7b215b8394364b4af31aa82c3be8a183cc0
-  data.tar.gz: 14ecaa2c0698e5fad95d311f373f2399f98eaa5b1e0220dce807053ce7ea0b505f879dce042006232cac8b6d25dd6e9c08eb1a713f78a09aba9c47c1e9bbdf08
+  metadata.gz: 35001c199911e59f66a2ef3ce3b8c6193e5654ebc5463f52add3cb11a5aa3c1684c51dbaad7a3edaf4c0042cf2b2d35410ea01bfdce45e5adc72a96f30ec002b
+  data.tar.gz: 163e8e50aa1dd6ba930fd41e93075aca9f8bed93c6650f3a9984fbc86ddb34f0ae4a499d7fc981a38dfe9bdb1f56a0667a4cec018a530b701f4707141d79233c

data/lib/jenncad/exporters/openscad.rb

@@ -245,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,7 +7,9 @@ module JennCad::Primitives
       else
         @parts = parts
       end
+
       @parent = @parts.first.parent
+
       after_add
     end
 
@@ -22,6 +24,7 @@ module JennCad::Primitives
     end
 
     def add(part)
+      return if part.nil?
       @parts << part
       after_add
     end

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

@@ -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

@@ -20,6 +20,7 @@ module JennCad
       @anchors = {}
       @parent = args[:parent]
       @opts ||= args
+      @cache = nil
     end
 
     def option(key)
@@ -39,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
@@ -209,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}"
@@ -341,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))
@@ -386,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)
@@ -406,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
@@ -489,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
 
@@ -503,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
@@ -513,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

data/lib/jenncad/version.rb

@@ -1,4 +1,3 @@
 module JennCad
-  VERSION = "1.0.0-alpha12"
+  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.alpha12
+  version: 1.0.0.pre.alpha13
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-30 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d