jenncad 1.0.0.pre.alpha16 → 1.0.0.pre.alpha17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef20af7d3fc9a11140dacb23030a9ba671a80cbd39491caed609d6755f8bc85c
-  data.tar.gz: 4e515e6fbedcfa16b315b8ea02cafe8a6d41207fbdd9aece996165edee7f9214
+  metadata.gz: be56296dfd0c04706441288172b3493d918f76a05ee92fa1004ce0c619e6d1c0
+  data.tar.gz: 7b1130259db67a2a0e75e8074265958fac8ada1dbd6a3ce34de2dc4050a1d7a9
 SHA512:
-  metadata.gz: 17111c38b461ecdf683d2813284279b4bced3296d97dc9aebdf17797955affea2ad275bd21f5935680c09a8f08234ebac9c5bbb67ce197fdfe6c3e0a6489d0cf
-  data.tar.gz: 9022e918187212aa81f4f02b28c9a9ac11d7b8d36c6afb36835346298309ec2204430478032c406177315ee9807d0513bb52f0d8581dfec9c3df13e91b42f5f8
+  metadata.gz: 76e84ad22e862bc9b961d4e96382d0c40ebdfe6ab2ff2ee709c5e90faf7eb01b5199612abb4c0950c193cef97c4a43a895b2e071c306a9036d018ac135416adc
+  data.tar.gz: df24c4d80c52738a6223dd0ac7d20a8448c06839c7c448e436afa0501d659276d7e28dc5c0a23cf2742babd13475e5afb1be8aa13bf69916fc8b4844306b006e

data/lib/jenncad/exporters/openscad.rb

@@ -162,14 +162,16 @@ module JennCad::Exporters
         bool('intersection', part)
       when JennCad::HullObject
         bool('hull', part)
-      when JennCad::Primitives::Circle
-        prim('circle', part)
       when JennCad::Primitives::Cylinder
         prim('cylinder', part)
       when JennCad::Primitives::Sphere
         prim('sphere', part)
       when JennCad::Primitives::Cube
         prim('cube', part)
+       when JennCad::Primitives::Circle
+        prim('circle', part)
+      when JennCad::Primitives::Square
+        prim('square', part)
       when JennCad::Primitives::LinearExtrude
         new_obj(part, :linear_extrude, part.openscad_params, parse(part.parts))
       when JennCad::Primitives::RotateExtrude

data/lib/jenncad/primitives/circle.rb

@@ -2,10 +2,108 @@ module JennCad::Primitives
   class Circle < Primitive
     attr_accessor :d, :r, :fn
     def initialize(args)
-      super
-      @d = args[:d]
-      @r = args[:r]
-      @fn = args[:fn]
+      if args.kind_of?(Array) && args[0].kind_of?(Hash)
+        args = args.first
+      end
+      if args.kind_of? Array
+        m = {}
+        if args.last.kind_of? Hash
+          m = args.last
+        end
+        args = [:d, :z].zip(args.flatten).to_h
+        args.deep_merge!(m)
+      end
+
+
+      @opts = {
+        d: 0,
+        d1: nil,
+        d2: nil,
+        r1: nil,
+        r2: nil,
+        z: nil,
+        r: 0,
+        cz: false,
+        margins: {
+          r: 0,
+          d: 0,
+          z: 0,
+        },
+        fn: nil,
+      }.deep_merge!(args)
+      init(args)
+      @dimensions = [:x, :y]
+      handle_radius_diameter
+      handle_fn
+      set_anchors_2d
     end
+
+    def set_anchors_2d
+      @anchors = {} # reset anchors
+      if @opts[:d]
+        rad = @opts[:d] / 2.0
+      else
+        rad = @opts[:r]
+      end
+
+      # Similar to cube
+      set_anchor :left, x: -rad
+      set_anchor :right, x: rad
+      set_anchor :top, y: rad
+      set_anchor :bottom, y: -rad
+    end
+
+    def openscad_params
+      res = {}
+      [:d, :fn].each do |n|
+        res[n] = self.send n
+      end
+      res
+    end
+
+    def handle_fn
+      case @opts[:fn]
+        when nil, 0
+          $fn = auto_dn!
+        else
+          @fn = @opts[:fn]
+      end
+    end
+
+    def auto_dn!
+      case @d
+        when (16..)
+          @fn = (@d*4).ceil
+        else
+          @fn = 64
+      end
+    end
+
+    def handle_radius_diameter
+      case @opts[:d]
+      when 0, nil
+        @r = @opts[:r].to_d + @opts[:margins][:r].to_d
+        @d = @r * 2.0
+      else
+        @d = @opts[:d].to_d + @opts[:margins][:d].to_d
+        @r = @d / 2.0
+      end
+
+      case @opts[:d1]
+      when 0, nil
+      else
+        @d1 = @opts[:d1].to_d + @opts[:margins][:d].to_d
+        @d2 = @opts[:d2].to_d + @opts[:margins][:d].to_d
+      end
+
+      case @opts[:r1]
+      when 0, nil
+      else
+        @d1 = 2 * @opts[:r1].to_d + @opts[:margins][:d].to_d
+        @d2 = 2 * @opts[:r2].to_d + @opts[:margins][:d].to_d
+      end
+    end
+
+
   end
 end

data/lib/jenncad/primitives/cube.rb

@@ -1,24 +1,7 @@
 module JennCad::Primitives
-  class Cube < Primitive
+  class Cube < Square
     extend JennCad::Features::Cuttable
 
-    attr_accessor :corners, :sides
-
-    def feed_opts(args)
-      # FIXME: this doesn't seem to work
-      if args.kind_of? Array
-        m = {}
-        if args.last.kind_of? Hash
-          m = args.last
-        end
-        args = [:x, :y, :z].zip(args.flatten).to_h
-        args.deep_merge!(m)
-        @opts.deep_merge!(args)
-      else
-        @opts.deep_merge!(args)
-      end
-    end
-
     def initialize(args)
       @opts = {
         x: 0,
@@ -41,47 +24,20 @@ module JennCad::Primitives
       else
         feed_opts(parse_xyz_shortcuts(args))
       end
+      init
 
 
       handle_margins
-      super(z: @opts[:z])
       @h = @z.dup
       @calc_h = @z.dup
 
+      @dimensions = [:x, :y, :z]
 
       set_anchors
     end
 
     def set_anchors
-      @anchors = {} # this resets anchors
-
-      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, 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
+      set_anchors_2d
       if @opts[:center_z]
         set_anchor :bottom_face, z: -@z/2.0
         set_anchor :top_face, z: @z/2.0
@@ -90,100 +46,14 @@ module JennCad::Primitives
         set_anchor :top_face, z: @z
       end
 
-      # 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)
-      if dist.nil?
-        $log.error "Distance of nil passed to inner anchors. Please check the variable name you passed along"
-        return self
-      end
-
-      @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]
     end
 
-    def not_centered
-      @opts[:center] = false
-      set_anchors
-      self
-    end
-    alias :nc :not_centered
-
-    def cx
-      nc
-      @opts[:center_x] = true
-      set_anchors
-      self
-    end
-    alias :center_x :cx
-
-    def cy
-      nc
-      @opts[:center_y] = true
-      set_anchors
-      self
-    end
-    alias :center_y :cy
-
-
     def cz
       nc
       @opts[:center_z] = true
@@ -192,18 +62,5 @@ module JennCad::Primitives
     end
     alias :center_z :cz
 
-    def centered_axis
-      return [:x, :y] if @opts[:center]
-      a = []
-      a << :x if @opts[:center_x]
-      a << :y if @opts[:center_y]
-      a << :z if @opts[:center_z]
-      a
-    end
-
-    def to_openscad
-      self.mh(centered_axis.to_h{|a| [a, -@opts[a]] }) # center cube
-    end
-
   end
 end

data/lib/jenncad/primitives/cylinder.rb

@@ -1,5 +1,5 @@
 module JennCad::Primitives
-  class Cylinder < Primitive
+  class Cylinder < Circle
     attr_accessor :d, :d1, :d2, :r, :fn, :anchors
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
@@ -32,7 +32,7 @@ module JennCad::Primitives
         },
         fn: nil,
       }.deep_merge!(args)
-
+      init(args)
       # FIXME:
       # - margins calculation needs to go to output
       # - assinging these variables has to stop
@@ -41,24 +41,12 @@ module JennCad::Primitives
       @z = args[:z] || args[:h]
       handle_radius_diameter
       handle_fn
-      super(args)
+      @dimensions = [:x, :y, :z]
       set_anchors
     end
 
     def set_anchors
-      @anchors = {} # reset anchors
-      if @opts[:d]
-        rad = @opts[:d] / 2.0
-      else
-        rad = @opts[:r]
-      end
-
-      # Similar to cube
-      set_anchor :left, x: -rad
-      set_anchor :right, x: rad
-      set_anchor :top, y: rad
-      set_anchor :bottom, y: -rad
-
+      set_anchors_2d
       # TODO: figure out if we also want to have "corners"
       # - possibly move it like a cube
       # - points at 45 ° angles might not be that useful unless you can get the point on the circle at a given angle
@@ -91,54 +79,12 @@ module JennCad::Primitives
     # This will transform the cylinder around the center point.
     def cz
       @opts[:cz] = true
+      @transformations ||= []
       @transformations << Move.new(z: -@z / 2.0)
       set_anchors
       self
     end
 
-    def handle_fn
-      case @opts[:fn]
-        when nil, 0
-          $fn = auto_dn!
-        else
-          @fn = @opts[:fn]
-      end
-    end
-
-    def auto_dn!
-      case @d
-        when (16..)
-          @fn = (@d*4).ceil
-        else
-          @fn = 64
-      end
-    end
-
-    def handle_radius_diameter
-      case @opts[:d]
-      when 0, nil
-        @r = @opts[:r].to_d + @opts[:margins][:r].to_d
-        @d = @r * 2.0
-      else
-        @d = @opts[:d].to_d + @opts[:margins][:d].to_d
-        @r = @d / 2.0
-      end
-
-      case @opts[:d1]
-      when 0, nil
-      else
-        @d1 = @opts[:d1].to_d + @opts[:margins][:d].to_d
-        @d2 = @opts[:d2].to_d + @opts[:margins][:d].to_d
-      end
-
-      case @opts[:r1]
-      when 0, nil
-      else
-        @d1 = 2 * @opts[:r1].to_d + @opts[:margins][:d].to_d
-        @d2 = 2 * @opts[:r2].to_d + @opts[:margins][:d].to_d
-      end
-    end
-
     def z=(val)
       @z = val
       @h = val

data/lib/jenncad/primitives/polygon.rb

@@ -5,6 +5,7 @@ module JennCad::Primitives
       @points = args[:points]
       @paths = args[:paths]
       @convexity = args[:convexity] || 10
+      @dimensions = [:x, :y]
       super
     end
   end

data/lib/jenncad/primitives/primitive.rb

@@ -1,5 +1,7 @@
 module JennCad::Primitives
   class Primitive < JennCad::Thing
+    attr_accessor :dimensions
+
     def initialize(*args)
       super(*args)
     end
@@ -7,7 +9,9 @@ module JennCad::Primitives
     def handle_margins
       @x = @opts[:x].to_d + @opts[:margins][:x].to_d
       @y = @opts[:y].to_d + @opts[:margins][:y].to_d
-      @z = @opts[:z].to_d + @opts[:margins][:z].to_d
+      if @opts[:z]
+        @z = @opts[:z].to_d + @opts[:margins][:z].to_d
+      end
     end
 
     def handle_diameter
@@ -20,5 +24,20 @@ module JennCad::Primitives
       end
     end
 
+    def feed_opts(args)
+      if args.kind_of? Array
+        m = {}
+        if args.last.kind_of? Hash
+          m = args.last
+        end
+        args = [:x, :y, :z].zip(args.flatten).to_h
+        args.deep_merge!(m)
+        @opts.deep_merge!(args)
+      else
+        @opts.deep_merge!(args)
+      end
+    end
+
+
   end
 end

data/lib/jenncad/primitives/rounded_cube.rb

@@ -4,6 +4,7 @@ module JennCad::Primitives
     include JennCad::Features::Cuttable
 
     def initialize(args)
+
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
         args = args.first
       end
@@ -35,20 +36,43 @@ module JennCad::Primitives
           z: 0,
         },
       }.deep_merge!(args)
+      if args.kind_of? Array
+        args.each do |a|
+          feed_opts(parse_xyz_shortcuts(a))
+        end
+      else
+        feed_opts(parse_xyz_shortcuts(args))
+      end
+      init(args)
+
+
       handle_margins
       handle_diameter
-      super(opts)
+      if @opts[:z] && opts[:z].to_d > 0
+        @dimensions = [:x, :y, :z]
+      else
+        @dimensions = [:x, :y]
+      end
+
     end
 
     def to_openscad
-      return cube(@opts) if @d == 0
+      # FIXME: this check needs to be done on object creation
+      #        otherwise it fails to position it
+      if @d == 0
+        if @z.to_d > 0
+          return cube(@opts)
+        else
+          return square(@opts)
+        end
+      end
       # make diameter not bigger than any side
       d = [@d, @x, @y].min
       res = HullObject.new(
-        cylinder(d: d, h:z+z_margin),
-        cylinder(d: d).move(x: @x - d, y: 0),
-        cylinder(d: d).move(x: 0, y: @y - d),
-        cylinder(d: d).move(x: @x - d, y: @y - d),
+        circle(d: d),
+        circle(d: d).move(x: @x - d, y: 0),
+        circle(d: d).move(x: 0, y: @y - d),
+        circle(d: d).move(x: @x - d, y: @y - d),
       )
       res = res.move(xy: d/2.0)
 
@@ -56,6 +80,10 @@ module JennCad::Primitives
         res += apply_flat_edge(edge)
       end
 
+      if @z.to_d > 0
+        res = res.extrude(z: @z + z_margin)
+      end
+
       res = union(res) # put everything we have in a parent union that we can apply the transformations of this object of
       res.transformations = @transformations
 
@@ -76,13 +104,13 @@ module JennCad::Primitives
     def apply_flat_edge(edge)
       case edge
       when :up, :top
-        cube(x: @x, y: @y/2.0, z: @z).nc.moveh(y:@y)
+        square(x: @x, y: @y/2.0).nc.moveh(y:@y)
       when :down, :bottom
-        cube(x: @x, y: @y/2.0, z: @z).nc
+        square(x: @x, y: @y/2.0).nc
       when :right
-        cube(x: @x/2.0, y: @y, z: @z).nc.moveh(x:@x)
+        square(x: @x/2.0, y: @y).nc.moveh(x:@x)
       when :left
-        cube(x: @x/2.0, y: @y, z: @z).nc
+        square(x: @x/2.0, y: @y).nc
       else
         nil
       end

data/lib/jenncad/primitives/square.rb

@@ -0,0 +1,181 @@
+module JennCad::Primitives
+  class Square < Primitive
+    attr_accessor :corners, :sides
+
+    def initialize(args)
+      @opts = {
+        x: 0,
+        y: 0,
+        margins: {
+          x: 0,
+          y: 0,
+        },
+        center: true,
+        center_y: false,
+        center_x: false,
+      }
+      if args.kind_of? Array
+        args.each do |a|
+          feed_opts(parse_xyz_shortcuts(a))
+        end
+      else
+        feed_opts(parse_xyz_shortcuts(args))
+      end
+      init(args)
+
+      handle_margins
+      set_anchors
+      @x = args[:x]
+      @y = args[:y]
+      @dimensions = [:x, :y]
+    end
+
+
+    # used for openscad export
+    def size
+      [@x, @y]
+    end
+
+    def set_anchors
+      set_anchors_2d
+    end
+
+    def set_anchors_2d
+      @anchors = {} # this resets anchors
+
+      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, 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)
+      if dist.nil?
+        $log.error "Distance of nil passed to inner anchors. Please check the variable name you passed along"
+        return self
+      end
+
+      @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
+
+
+
+    def not_centered
+      @opts[:center] = false
+      set_anchors
+      self
+    end
+    alias :nc :not_centered
+
+    def cx
+      nc
+      @opts[:center_x] = true
+      set_anchors
+      self
+    end
+    alias :center_x :cx
+
+    def cy
+      nc
+      @opts[:center_y] = true
+      set_anchors
+      self
+    end
+    alias :center_y :cy
+
+
+
+    def centered_axis
+      return [:x, :y] if @opts[:center]
+      a = []
+      a << :x if @opts[:center_x]
+      a << :y if @opts[:center_y]
+      a << :z if @opts[:center_z]
+      a
+    end
+
+    def to_openscad
+      self.mh(centered_axis.to_h{|a| [a, -@opts[a]] }) # center cube
+    end
+
+
+
+  end
+end

data/lib/jenncad/primitives/subtract_object.rb

@@ -60,9 +60,8 @@ module JennCad::Primitives
         add_z = nil
         if part.respond_to? :z
           part.opts[:margins] ||= {}
-          if part.referenced_z && part.z != 0.0
+          if part.referenced_z && part.z != 0.0 && part.is_3d?
             case part
-            when JennCad::Circle
             when JennCad::BooleanObject
             else
               # $log.debug part if part.opts[:debug]
@@ -89,7 +88,7 @@ module JennCad::Primitives
             move_z = 0.002
           end
 
-          if add_z
+          if add_z && part.is_3d?
             if part.kind_of? Part
               part.modify_values(part, {z: add_z}, {mode: :add})
             end

data/lib/jenncad/primitives.rb

@@ -1,5 +1,6 @@
 require "jenncad/primitives/primitive"
 require "jenncad/primitives/circle"
+require "jenncad/primitives/square"
 require "jenncad/primitives/cylinder"
 require "jenncad/primitives/sphere"
 require "jenncad/primitives/cube"

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
@@ -36,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)

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
@@ -753,12 +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-alpha16"
+  VERSION = "1.0.0-alpha17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha16
+  version: 1.0.0.pre.alpha17
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-14 00:00:00.000000000 Z
+date: 2022-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -144,6 +144,7 @@ files:
 - 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