jenncad 1.0.0.pre.alpha21 → 1.0.0.pre.alpha22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf38a53bfb5d20ab5af97d24c948792ae3e5d577d63806f4a9d7008b5429f507
-  data.tar.gz: aae023c68738b1aee605fff567b3d0792f98753252858e1ee2569a18dd470daf
+  metadata.gz: 655d1eab8f78d92f18915154cdc36a57fecfcb222e40dc69e663c974d5d85052
+  data.tar.gz: 79bd0ecee0ea0b3b691c4953ec33e68e1783248899d1e9417fe9cfac80e6fc46
 SHA512:
-  metadata.gz: fe8765bc981516be5fe1e94212e946a32d14baf295e0995be9820589dbe31b1be430a1792c1c8bd57ceaeab132ae495668ba8852fa7dbd16676b3345d3c4c8e8
-  data.tar.gz: 5667ae97532fa9094125d65603f8542a2cef77621c082ff2c097eebc3865ae5ca683ac16cc5cc9b2a3a09042ca6bd678cadd351f0fa468698e94fc56cf3bedfc
+  metadata.gz: 77c14e0645ff92f85f8746830469707d91495b7cf57d8d64210a0c2da7d7a6b0f9c27c3b4eb6fdcfdcd983a6d647b54309d4e10d2d407d70f7e55d02cd72ec9f
+  data.tar.gz: dd7538fb2068d4cb15326af37f7324d19c31828e3584b700f78ea585004790ee9033576e235e17774f007722f3b5a729d4a6a4c75f9c9fd2a0e2b0ee33e59bb4

data/lib/jenncad/exporters/openscad.rb

@@ -95,6 +95,9 @@ module JennCad::Exporters
           if v == nil
             next
           end
+          if v.kind_of?(Symbol)
+            v = v.to_s
+          end
           if v.kind_of?(Array)
             v = handle_args(v)
           elsif !v.kind_of?(TrueClass) && !v.kind_of?(FalseClass) && v == v.to_i
@@ -172,6 +175,8 @@ module JennCad::Exporters
         prim('circle', part)
       when JennCad::Primitives::Square
         prim('square', part)
+      when JennCad::Primitives::Text
+        prim('text', part)
       when JennCad::Primitives::LinearExtrude
         new_obj(part, :linear_extrude, part.openscad_params, parse(part.parts))
       when JennCad::Primitives::RotateExtrude

data/lib/jenncad/position.rb

@@ -0,0 +1,138 @@
+module JennCad
+  class Size
+    attr_accessor :size
+    def initialize(args={})
+      @size = {
+        x: args[:x].to_d,
+        y: args[:y].to_d,
+        z: (args[:z] || args[:h]).to_d,
+        d: args[:d].to_d,
+      }
+    end
+
+    def add(other)
+      return self if other.nil?
+      @size[:x] += other.x
+      @size[:y] += other.y
+      @size[:z] += other.z
+      @size[:d] += other.d
+      self
+    end
+
+    def union(other)
+      @size[:x] = [@size[:x], other.x].max
+      @size[:y] = [@size[:y], other.y].max
+      @size[:z] = [@size[:z], other.z].max
+      @size[:d] = [@size[:d], other.d].max
+      self
+    end
+
+    def to_point
+      Point.new(x: @size[:x], y: @size[:y], z: @size[:z])
+    end
+
+    def set(a, to)
+      @size[a] = to
+    end
+
+    def x
+      @size[:x]
+    end
+
+    def y
+      @size[:y]
+    end
+
+    def z
+      @size[:z]
+    end
+
+    def d
+      @size[:d]
+    end
+
+  end
+
+  class Point
+    attr_accessor :pos
+    def initialize(args={})
+      @pos = {x: 0.to_d, y: 0.to_d, z: 0.to_d}
+      add(args)
+    end
+
+    def x
+      @pos[:x]
+    end
+
+    def y
+      @pos[:y]
+    end
+
+    def z
+      @pos[:z]
+    end
+
+    def zero?
+      return true if x == 0.0 && y == 0.0 && z == 0.0
+      false
+    end
+
+    def to_a
+      if @z != 0.0
+        [@pos[:x], @pos[:y], @pos[:z]]
+      else
+        [@pos[:x], @pos[:y]]
+      end
+    end
+
+    def to_h
+      @pos.clone.delete_if{|k,v| v.to_d == 0.0}
+    end
+
+    def add(args)
+      if args.kind_of? Point
+        @pos[:x] += args.x
+        @pos[:y] += args.y
+        @pos[:z] += args.z
+        return self
+      end
+
+      args.each do |k, val|
+        if [:chain, :debug].include? k
+          next
+        end
+        unless val.kind_of? Numeric
+          next
+        end
+        if val.to_d == 0.0
+          next
+        end
+
+        keys = k.to_s.chars
+        axis = []
+        axis << keys.delete("x")
+        axis << keys.delete("y")
+        axis << keys.delete("z")
+        multi = 1
+
+        if keys.size > 0
+          if keys.include?("h")
+            multi = 0.5
+          elsif keys.include?("q")
+            multi = 0.25
+          elsif keys.include?("d")
+            multi = 2.0
+          end
+          if keys.include?("n") || keys.include?("i")
+            multi *= -1
+          end
+        end
+        axis.compact.each do |a|
+          @pos[a.to_sym] += val.to_d * multi.to_d
+        end
+      end
+      self
+    end
+  end
+
+end

data/lib/jenncad/primitives/boolean_object.rb

@@ -13,10 +13,13 @@ module JennCad::Primitives
       end
 
       if parts.first && parts.first.respond_to?(:debug?) && parts.first.debug?
-        $log.debug("Creating new #{self.class} for part #{parts}")
+        $log.debug("Creating new #{self.class} for part #{parts.pretty_inspect}")
       end
 
-      @parent = @parts.first.parent
+
+      @parent = @parts.first.parent if @parts.first
+      @csize = @parts.first.csize if @parts.first
+      @csize ||= Size.new
 
       after_add
     end

data/lib/jenncad/primitives/circle.rb

@@ -38,6 +38,7 @@ module JennCad::Primitives
       handle_radius_diameter
       handle_fn
       set_anchors_2d
+      @csize = Size.new(d: @opts[:d])
     end
 
     def openscad_params

data/lib/jenncad/primitives/cube.rb

@@ -1,6 +1,7 @@
 module JennCad::Primitives
   class Cube < Square
     extend JennCad::Features::Cuttable
+    include ZIsh
 
     def initialize(args)
       @opts = {
@@ -26,27 +27,19 @@ module JennCad::Primitives
       end
       init
 
-
       handle_margins
       @h = @z.dup
       @calc_h = @z.dup
 
       @dimensions = [:x, :y, :z]
+      @csize = Size.new(x: @opts[:x], y: @opts[:y], z: @opts[:z])
 
       set_anchors
     end
 
     def set_anchors
       set_anchors_2d
-      if @opts[:center_z]
-        set_anchor :bottom_face, z: -@z/2.0
-        set_anchor :top_face, z: @z/2.0
-      else
-        set_anchor :bottom_face, z: 0
-        set_anchor :top_face, z: @z
-      end
-
-
+      set_anchors_z
     end
 
     # used for openscad export
@@ -54,13 +47,6 @@ module JennCad::Primitives
       [@x, @y, z+z_margin]
     end
 
-    def cz
-      nc
-      @opts[:center_z] = true
-      set_anchors
-      self
-    end
-    alias :center_z :cz
 
   end
 end

data/lib/jenncad/primitives/cylinder.rb

@@ -1,5 +1,6 @@
 module JennCad::Primitives
   class Cylinder < Circle
+    include ZIsh
     attr_accessor :d, :d1, :d2, :r, :fn, :anchors
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
@@ -15,7 +16,7 @@ module JennCad::Primitives
       end
 
       args[:z] ||= args[:h]
-
+      args[:center_z] ||= args[:cz]
       @opts = {
         d: 0,
         d1: nil,
@@ -24,7 +25,7 @@ module JennCad::Primitives
         r2: nil,
         z: nil,
         r: 0,
-        cz: false,
+        center_z: false,
         margins: {
           r: 0,
           d: 0,
@@ -43,22 +44,16 @@ module JennCad::Primitives
       handle_fn
       @dimensions = [:x, :y, :z]
       set_anchors
+      @csize = Size.new(x: @opts[:d], y: @opts[:d], d: @opts[:d], z: @z)
     end
 
     def set_anchors
       set_anchors_2d
+      set_anchors_z
       # 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
       # - inner/outer points could be useful for small $fn values
-
-      if @opts[:cz]
-        set_anchor :bottom_face, z: -@z/2.0
-        set_anchor :top_face, z: @z/2.0
-      else
-        set_anchor :bottom_face, z: 0
-        set_anchor :top_face, z: @z
-      end
     end
 
     def openscad_params
@@ -78,7 +73,7 @@ module JennCad::Primitives
     # Centers the cylinder around it's center point by height
     # This will transform the cylinder around the center point.
     def cz
-      @opts[:cz] = true
+      @opts[:center_z] = true
       @transformations ||= []
       @transformations << Move.new(z: -@z / 2.0)
       set_anchors

data/lib/jenncad/primitives/linear_extrude.rb

@@ -1,5 +1,7 @@
 module JennCad::Primitives
+  include ZIsh
   attr_accessor :center_bool, :convexity, :twist, :slices
+
   class LinearExtrude < JennCad::Thing
     def initialize(part, args={})
       @transformations = []
@@ -7,22 +9,28 @@ module JennCad::Primitives
       if args.kind_of? Numeric
         args = {h: args}
       end
-
       @z = args[:h] || args[:height] || args[:z]
+      @csize = Size.new(z: @z).add(part.csize)
+
       @center_bool = args[:center]
       @convexity = args[:convexity]
       @twist = args[:twist]
       @slices = args[:slices]
       @fn = args[:fn]
       @opts = {
+        center_z: false,
         margins: {
           z: 0,
         }
       }.deep_merge(args)
+      set_anchors_z
+
+      @x = part.x
+      @y = part.y
     end
 
     def height
-      @z.to_d + @opts[:margins][:z].to_d
+      @z.to_d + z_margin
     end
 
     def openscad_params

data/lib/jenncad/primitives/rounded_cube.rb

@@ -44,6 +44,8 @@ module JennCad::Primitives
         feed_opts(parse_xyz_shortcuts(args))
       end
       init(args)
+      @d = opts[:d]
+      @csize = Size.new(x: @opts[:x], y: @opts[:y], z: @opts[:z])
 
       handle_margins
       handle_diameter
@@ -52,6 +54,7 @@ module JennCad::Primitives
       else
         @dimensions = [:x, :y]
       end
+
       set_anchors
     end
 
@@ -59,28 +62,28 @@ module JennCad::Primitives
       # FIXME: this check needs to be done on object creation
       #        otherwise it fails to position it
       if @d == 0
-        if @z.to_d > 0
+        if @csize.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
+      d = [@d, @csize.x, @csize.y].min
       res = HullObject.new(
         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),
+        circle(d: d).move(x: @csize.x - d, y: 0),
+        circle(d: d).move(x: 0, y: @csize.y - d),
+        circle(d: d).move(x: @csize.x - d, y: @csize.y - d),
       )
-      res = res.move(xy: d/2.0)
+      res = res.move(xyh: d)
 
       @opts[:flat_edges].each do |edge|
         res += apply_flat_edge(edge)
       end
 
-      if @z.to_d > 0
-        res = res.extrude(z: @z + z_margin)
+      if @csize.z.to_d > 0
+        res = res.extrude(z: @csize.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
@@ -103,13 +106,13 @@ module JennCad::Primitives
     def apply_flat_edge(edge)
       case edge
       when :up, :top
-        square(x: @x, y: @y/2.0).nc.moveh(y:@y)
+        square(x: @csize.x, y: @csize.y/2.0).nc.moveh(y:@csize.y)
       when :down, :bottom
-        square(x: @x, y: @y/2.0).nc
+        square(x: @csize.x, y: @csize.y/2.0).nc
       when :right
-        square(x: @x/2.0, y: @y).nc.moveh(x:@x)
+        square(x: @csize.x/2.0, y: @csize.y).nc.moveh(x:@csize.x)
       when :left
-        square(x: @x/2.0, y: @y).nc
+        square(x: @csize.x/2.0, y: @csize.y).nc
       else
         nil
       end

data/lib/jenncad/primitives/slot.rb

@@ -65,6 +65,11 @@ module JennCad::Primitives
       if ty
         @len_y = ty - @d
       end
+      if @opts[:z] && opts[:z].to_d > 0
+        @dimensions = [:x, :y, :z]
+      else
+        @dimensions = [:x, :y]
+      end
 
       set_anchors
     end

data/lib/jenncad/primitives/square.rb

@@ -28,6 +28,8 @@ module JennCad::Primitives
       @x = args[:x]
       @y = args[:y]
       @dimensions = [:x, :y]
+      @sits_on = :bottom
+      @csize = Size.new(x: @opts[:x], y: @opts[:y])
     end
 
 
@@ -137,8 +139,6 @@ module JennCad::Primitives
       self
     end
 
-
-
     def not_centered
       @opts[:center] = false
       set_anchors
@@ -162,8 +162,6 @@ module JennCad::Primitives
     end
     alias :center_y :cy
 
-
-
     def centered_axis
       return [:x, :y] if @opts[:center]
       a = []
@@ -174,10 +172,8 @@ module JennCad::Primitives
     end
 
     def to_openscad
-      self.mh(centered_axis.to_h{|a| [a, -@opts[a]] }) # center cube
+      self.mh(centered_axis.to_h{|a| [a, -@opts[a]] }.merge(prepend: true)) # center cube
     end
 
-
-
   end
 end

data/lib/jenncad/primitives/text.rb

@@ -0,0 +1,50 @@
+module JennCad::Primitives
+  class Text < Primitive
+    attr_accessor :text, :font, :valign, :halign, :size, :spacing, :script, :fn, :direction, :language
+
+    def initialize(args)
+      @text = args[:text]
+      @size = args[:size]
+      @font = args[:font]
+      @valign = args[:valign]
+      @halign = args[:halign]
+      @spacing = args[:spacing]
+      @script = args[:script]
+      @direction = parse_dir(args[:dir] || args[:direction])
+      case @direction
+        when "btt", "ttb"
+          @valign ||= :top
+          @halign ||= :left
+      end
+
+      @language = args[:language]
+      @fn = args[:fn]
+
+      init(args)
+    end
+
+    def parse_dir(dir)
+      case dir.to_s
+        when "x", "ltr"
+          "ltr"
+        when "-x", "xn", "nx", "xi", "rtl"
+          "rtl"
+        when "y", "btt"
+          "btt"
+        when "-y", "yn", "ny", "yi", "ttb"
+          "ttb"
+        else
+          nil
+      end
+    end
+
+    def openscad_params
+      res = {}
+      [:text, :font, :valign, :halign, :size, :spacing, :script, :direction, :language, :fn].each do |n|
+        res[n] = self.send n
+      end
+      res
+    end
+
+  end
+end

data/lib/jenncad/primitives/union_object.rb

@@ -1,5 +1,21 @@
 module JennCad::Primitives
   class UnionObject < BooleanObject
+    def initialize(*parts)
+      super(*parts)
+
+      blacklist = [SubtractObject, IntersectionObject]
+
+      @parts[1..-1].each do |part|
+        blacklist.each do |b|
+          if part.kind_of? b
+            next
+          end
+        end
+        @csize = part.csize
+#        @csize.union(part.csize.clone) if part.csize
+      end
+
+    end
 
   end
 end

data/lib/jenncad/primitives.rb

@@ -16,6 +16,7 @@ require "jenncad/primitives/intersection_object"
 require "jenncad/primitives/projection"
 require "jenncad/primitives/linear_extrude"
 require "jenncad/primitives/rotate_extrude"
+require "jenncad/primitives/text"
 
 module JennCad
   include Primitives

data/lib/jenncad/shared/cube_ish.rb

@@ -1,3 +1,5 @@
 module CubeIsh
   # TBD
+
+
 end

data/lib/jenncad/shared/z_ish.rb

@@ -0,0 +1,55 @@
+module ZIsh
+
+  def set_anchors_z
+    if @opts[:center_z]
+      set_anchor :bottom_face, z: -z/2.0
+      set_anchor :top_face, z: z/2.0
+      set_anchor :center, x: 0
+    else
+      set_anchor :bottom_face, z: 0
+      set_anchor :top_face, z: z
+      set_anchor :center,  zh: z
+    end
+  end
+
+  def cz
+    if self.respond_to? :nc
+      nc
+    end
+    @opts[:center_z] = true
+    set_anchors_z
+    self
+  end
+  alias :center_z :cz
+
+  def flip_axis(dir)
+    case dir
+      when :bottom
+        nil
+      when :top
+        :z
+      when :left, :right
+        :x
+      when :front, :back
+        :y
+    end
+  end
+
+  def flip_rotation(dir)
+    case dir
+      when :bottom
+        {}
+      when :left
+        {y: 270}
+      when :top
+        {x: 180}
+      when :right
+        {y: 90}
+      when :front
+        {x: 90}
+      when :back
+        {x: 270}
+    end
+  end
+
+end

data/lib/jenncad/shared.rb

@@ -1,3 +1,4 @@
 require "jenncad/shared/circle_ish"
 require "jenncad/shared/cube_ish"
+require "jenncad/shared/z_ish"
 

data/lib/jenncad/shortcuts.rb

@@ -73,6 +73,10 @@ module JennCad
   end
   alias :as_2d :to_2d
 
+  def text(txt, args={})
+    Text.new(args.merge({text: txt}))
+  end
+
   def union(*args)
     UnionObject.new(*args)
   end

data/lib/jenncad/thing.rb

@@ -9,17 +9,21 @@ module JennCad
     attr_accessor :angle, :fn
     attr_accessor :anchors
     attr_accessor :parent
+    attr_accessor :pos, :csize
+    attr_accessor :sits_on
 
     def initialize(args={})
       init(args)
     end
 
     def init(args={})
+      @csize = Size.new()
       @transformations = []
       # calculated origin; only works for move atm
       @calc_x = 0
       @calc_y = 0
       @calc_z = 0
+      @pos = Point.new
       @calc_h = args[:z] || 0
       @anchors = {}
       @parent = args[:parent] || nil
@@ -47,6 +51,11 @@ module JennCad
       self
     end
 
+    def dbg
+      set_flag(:debug)
+      self
+    end
+
     def cut_to(face, part=nil, args={})
       an = anchor(face, part)
       unless an
@@ -209,36 +218,50 @@ module JennCad
       rt(z:v)
     end
 
-    def flip(direction)
-      case self
-      when UnionObject
-        ref = self.parts.first
-        rz = self.z.to_d + self.calc_h.to_d
-      when BooleanObject
-        ref = self.parts.first
-        rz = ref.calc_z + ref.calc_h
-      else
-        ref = self
-        rz = self.z + self.calc_h
-      end
+    def flipc(dir, args={})
+      flip(dir, args.merge(rel: true, center: true))
+    end
+
+    def flip(dir, args={})
+      @sits_on ||= :bottom
 
-      case direction
-      when :x
-        self.ry(90).mh(x: -rz, z: ref.x)
-      when :y
-        self.rx(90).mh(y: rz, z: ref.y)
+      ro = flip_rotation(dir)
+      flip_rotation(@sits_on).each do |key, val|
+        ro[key] ||= 0
+        ro[key] -= val
+      end
+      unless ro == {}
+        self.moveai(:center).rotate(ro)
       end
-    end
 
-    def flip_x
-      flip(:x)
-    end
-    alias :fx :flip_x
+      @opts ||= {}
+
+      if args[:center]
+        if ro == {} # if we didn't move earlier, let's move it now
+          self.moveai(:center)
+        end
+        @opts[:center_z] = true
+        set_anchors_z if self.respond_to? :set_anchors_z
+      else
+        # TODO: fix anchors
+        if debug?
+          $log.info "flip_axis(#{dir}): #{flip_axis(dir)} csize: #{@csize.size}"
+        end
+
+        case flip_axis(dir)
+          when :x
+            self.move(zh: @csize.x)
+          when :y
+            self.move(zh: @csize.y)
+          when :z
+            self.move(zh: @csize.z)
+        end
+        @opts[:center_z] = false
+      end
+      @sits_on = dir
 
-    def flip_y
-      flip(:y)
+      self
     end
-    alias :fy :flip_y
 
     def radians(a)
       a.to_d/180.0*PI
@@ -263,6 +286,7 @@ module JennCad
       self.move(x:-x,y:-y,z:-z).rotate(args).move(x:x,y:y,z:z)
     end
 
+    # Deprecated, moved to Point
     def parse_xyz_shortcuts(args)
       unless args.kind_of? Hash
         $log.warn "parse_xyz_shortcuts called for type #{args.class} #{args.inspect}"
@@ -328,34 +352,44 @@ module JennCad
         x,y,z = args
         return move(x:x, y:y, z:z)
       end
-      args = parse_xyz_shortcuts(args)
 
-      if args[:x].to_d == 0.0 && args[:y].to_d == 0.0 && args[:z].to_d == 0.0
+      chain = if args[:chain]
+        args[:chain]
+      else
+        $jenncad_profile.chain_moves
+      end
+
+      point = Point.new(args)
+
+      if point.zero?
         return self
       end
+      pre = args[:prepend]
+      args = point.to_h
 
       @transformations ||= []
-      if args[:prepend]
-        @transformations.prepend(Move.new(args))
-      else
-        lt = @transformations.last
-
-        chain = if args[:chain]
-          args[:chain]
+      if pre
+        lt = @transformations.first
+        if lt && lt.class == Move && chain == false
+          $log.debug "#{self} at move(prepend): Adding to first move #{lt.inspect} , args: #{args}" if self.debug?
+          lt.pos.add(point)
         else
-          $jenncad_profile.chain_moves
+          @transformations.prepend(Move.new(pos: point))
         end
+      else
+        lt = @transformations.last
 
         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
+          lt.pos.add(point) # TODO: figure out why this doesn't work on export
         else
           $log.debug "#{self} at move: Adding move of #{args} to transformations" if self.debug?
-          @transformations << Move.new(args)
+          @transformations << Move.new(pos: point)
         end
       end
+      @pos ||= Point.new
+      @pos.add(point)
+      # NOTE: this needs more migration so everythign runs over point
       @calc_x += args[:x].to_d
       @calc_y += args[:y].to_d
       @calc_z += args[:z].to_d
@@ -387,6 +421,7 @@ module JennCad
         if key.kind_of? Hash
           an = key
         else
+          thing ||= self
           an = anchor(key, thing, args)
         end
         unless an
@@ -394,7 +429,10 @@ module JennCad
           an = {} # this will move by 0,0 and still display the block
         end
         part.movei(an)
-        part = block.yield.move(an)
+        bl = block.yield
+        unless bl == nil
+          part = bl.move(an)
+        end
       end
       part
     end
@@ -443,11 +481,14 @@ module JennCad
         x,y,z = args
         args = {x: x, y: y, z: z}
       end
-      [:x, :y, :z, :xy, :xyz, :xz, :yz].each do |key|
-        args[key] = args[key] / 2.0 unless args[key] == nil
+      to = {}
+      args.each do |key, val|
+        to[key] = val.to_d / 2.0 if val.kind_of? Numeric
       end
+      to[:chain] = args[:chain]
+      to[:prepend] = args[:prepend]
 
-      move(args)
+      move(to)
     end
     alias :mh :moveh
 
@@ -465,11 +506,9 @@ module JennCad
 
     def movei(args={})
       to = {}
-      [:x, :y, :z, :xy, :xz, :yz, :xyz].each do |key|
-        if args[key]
-          to[key] = args[key]*-1
-        end
-      end
+      args.each do |key, val|
+        to[key] = val.to_d * -1 if val.kind_of? Numeric
+       end
       to[:chain] = args[:chain]
       move(to)
     end

data/lib/jenncad/transformation/move.rb

@@ -1,7 +1,13 @@
 module JennCad
+  attr_accessor :pos
   class Move < Transformation
     def initialize(args)
-      super(args)
+      pos = args[:pos]
+      super(args.merge(pos: pos))
+    end
+
+    def coordinates
+      @pos.to_a
     end
   end
 end

data/lib/jenncad/transformation/rotate.rb

@@ -3,5 +3,9 @@ module JennCad
     def initialize(args)
       super(args)
     end
+
+    def coordinates
+      [@x, @y, @z]
+    end
   end
 end

data/lib/jenncad/transformation/transformation.rb

@@ -2,13 +2,14 @@ module JennCad
   class Transformation
     attr_accessor :x,:y,:z, :coordinates
     def initialize(args)
+      @pos = args[:pos]
       @x = args[:x]
       @y = args[:y]
       @z = args[:z]
     end
 
     def coordinates
-      [@x,@y,@z]
+      @pos.to_a
     end
   end
 end

data/lib/jenncad/version.rb

@@ -1,3 +1,3 @@
 module JennCad
-  VERSION = "1.0.0-alpha21"
+  VERSION = "1.0.0-alpha22"
 end

data/lib/jenncad.rb

@@ -1,3 +1,4 @@
+require "pp"
 require "logger"
 $log = Logger.new(STDOUT)
 
@@ -18,6 +19,7 @@ JennCad::ProfileLoader.new
 
 
 require "jenncad/patches/array"
+require "jenncad/position"
 require "jenncad/thing"
 require "jenncad/part"
 require "jenncad/project"

data/todo.txt

@@ -24,14 +24,38 @@ Features wanted
 	 - 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
 
+- Bolts / Nuts by default should be able to use as mixin, i.e.
+  cylinder(Nut::M3)
+	slot(Nut::M5, x: 10)
+
+	possbibly M* like
+  cylinder(M4)
+  or
+  cylinder(M4, h: 25)
+
+	Possibly via symbols
+	cylinder(:m4, h: 30)
+	cylinder(:m4, :nut)
+
+	slot(:m5, :nut, x: 10)
+
+
 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
+[#at functionality is half-way there; would be great to have this for rotation as well]
 
 
+23.5.22:
+- get slice of circle (input angle, output angle)
+- skip stl build for part
+- at doesn't work well if you need to mirror a part
+-> anchors need to be able to do flipping, possibly rotation
 
 
 
+24.5.22
+- multithreading output building
 
 other awful things
 ===================

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha21
+  version: 1.0.0.pre.alpha22
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-22 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -128,6 +128,7 @@ files:
 - lib/jenncad/features/stl_import.rb
 - lib/jenncad/part.rb
 - lib/jenncad/patches/array.rb
+- lib/jenncad/position.rb
 - lib/jenncad/primitives.rb
 - lib/jenncad/primitives/boolean_object.rb
 - lib/jenncad/primitives/circle.rb
@@ -146,6 +147,7 @@ files:
 - lib/jenncad/primitives/sphere.rb
 - lib/jenncad/primitives/square.rb
 - lib/jenncad/primitives/subtract_object.rb
+- lib/jenncad/primitives/text.rb
 - lib/jenncad/primitives/union_object.rb
 - lib/jenncad/profile_loader.rb
 - lib/jenncad/project.rb
@@ -153,6 +155,7 @@ files:
 - lib/jenncad/shared.rb
 - lib/jenncad/shared/circle_ish.rb
 - lib/jenncad/shared/cube_ish.rb
+- lib/jenncad/shared/z_ish.rb
 - lib/jenncad/shortcuts.rb
 - lib/jenncad/thing.rb
 - lib/jenncad/transformation/color.rb