jenncad 1.0.0.pre.alpha10 → 1.0.0.pre.alpha11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14729ddf8a7adb190fd55bd555bff63515420acd3468daaa2d254a06069f213d
-  data.tar.gz: 41237b37c2a7bb301981fce8a44d7772e37fcd75880dba73b47872d4f9729dbe
+  metadata.gz: 5e77957381ff8c5d69c62508dad6309d647b56377085319443b6938c2bf88ce2
+  data.tar.gz: 0f1893fcea231e2009fc6a3b5f6224483e413e648f7681d6ae0e85be64bba92e
 SHA512:
-  metadata.gz: 58e2c3db175c7fdbcdc34817460f44460766c4469dca347fe4a98163c2dd212e9510069f458ee152475385bb56d80f5a62b119002b8debd9c41b7a05ec567fe0
-  data.tar.gz: d094fd51199bb1de45d3952f9fc66f4f2aa685177f3c4064c984459b95ad4082d1af52b202bedf71a749e5a9c8347eea334042703aea5c229e591537fb9e2a5b
+  metadata.gz: '047058746e5a8bb3c44995c5ea21edf308272844722f02820300de08493bfc24bec0cd74e26c4343d9fe2ffe514f9c8c57a3ba0981c871c0b161f18705099652'
+  data.tar.gz: 724cbde8c1efa685b3762b7a51c27efd0812a8839d7147e832bede775a695b9e05af0dfbc996b139c531b5f78af26e6560a27efc99024fbbda54f8cf2835e3ef

data/lib/jenncad/primitives/boolean_object.rb

@@ -8,7 +8,6 @@ module JennCad::Primitives
         @parts = parts
       end
       @parent = @parts.first.parent
-
       after_add
     end
 
@@ -30,10 +29,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 +83,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/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/thing.rb

@@ -19,9 +19,6 @@ module JennCad
       @calc_h = args[:z] || 0
       @anchors = {}
       @parent = args[:parent]
-      if @parent
-        log.info "Parent: #{@parent}"
-      end
       @opts ||= args
     end
 

data/lib/jenncad/version.rb

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