jenncad 1.0.0.pre.alpha19 → 1.0.0.pre.alpha22

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

@@ -17,10 +17,18 @@ module JennCad
       run_exports
     end
 
+    def run_export!(part, file)
+      part.openscad([output_dir,file].join("/"))
+    end
+
     def run_exports
       outputs.each do |name|
         part = self.send(name)
-        part.openscad([output_dir,"#{name}.scad"].join("/"))
+        run_export!(part, "#{name}.scad")
+        if part.respond_to? :print
+          part = self.send(name).print
+          run_export!(part, "#{name}_print.scad")
+        end
       end
     end
 

data/lib/jenncad/shared/circle_ish.rb

@@ -0,0 +1,65 @@
+module CircleIsh
+
+  def radius
+    if @opts[:d]
+      @opts[:d].to_d / 2.0
+    else
+      @opts[:r].to_d
+    end
+  end
+
+  def set_anchors_2d
+    @anchors = {} # reset anchors
+    rad = radius
+    # 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 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

data/lib/jenncad/shared/cube_ish.rb

@@ -0,0 +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

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

data/lib/jenncad/shortcuts.rb

@@ -2,6 +2,7 @@ module JennCad
   def circle(args)
     Circle.new(args).set_parent(self)
   end
+  alias :ci :circle
 
   def square(args)
     Square.new(args).set_parent(self)
@@ -22,14 +23,17 @@ module JennCad
   def polygon(args)
     Polygon.new(args).set_parent(self)
   end
+  alias :pg :polygon
 
   def polyhedron(args)
     Polyhedron.new(args).set_parent(self)
   end
+  alias :phd :polyhedron
 
   def slot(*args)
     Slot.new(args).set_parent(self)
   end
+  alias :sl :slot
 
   def cube(*args)
     Cube.new(args).set_parent(self)
@@ -55,14 +59,23 @@ module JennCad
   def extrude(args={})
     LinearExtrude.new(self, args)
   end
+  alias :e :extrude
+  alias :ex :extrude
 
   def rotate_extrude(args={})
     RotateExtrude.new(self, args)
   end
+  alias :re :rotate_extrude
+  alias :rex :rotate_extrude
 
   def to_2d(args={})
     Projection.new(self, args)
   end
+  alias :as_2d :to_2d
+
+  def text(txt, args={})
+    Text.new(args.merge({text: txt}))
+  end
 
   def union(*args)
     UnionObject.new(*args)

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,10 @@ module JennCad
       self
     end
 
+    def dbg
+      set_flag(:debug)
+      self
+    end
 
     def cut_to(face, part=nil, args={})
       an = anchor(face, part)
@@ -145,6 +153,20 @@ module JennCad
     end
     alias :sa :set_anchor
 
+    def copy_anchors(thing)
+      @anchors = thing.anchors
+    end
+
+    def copy_anchor(name, thing=nil)
+      # since it might be confusing to use / use shortcuts for copy_anchor and copy_anchors, let copy_anchor copy all of them when only one parameter is given
+      if thing.nil?
+        return copy_anchors(name)
+      end
+      @anchors ||= {}
+      @anchors[name] = thing.anchor(name)
+    end
+    alias :cpa :copy_anchor
+
     def set_anchor_from(name, new_name, args={})
       unless name.kind_of? Symbol or name.kind_of? String
         $log.error "set_anchor_from: name must be a string or symbol. Supplied: #{name}"
@@ -196,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
@@ -250,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}"
@@ -315,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
@@ -363,6 +410,33 @@ module JennCad
       move(z:v)
     end
 
+    # Perform something at an anchor location block
+    def at(keys, thing=nil, args={}, &block)
+      unless keys.kind_of? Array
+        keys = [keys]
+      end
+
+      part = self
+      keys.each do |key|
+        if key.kind_of? Hash
+          an = key
+        else
+          thing ||= self
+          an = anchor(key, thing, args)
+        end
+        unless an
+          $log.error "at on #{thing.class} could not find anchor #{key}"
+          an = {} # this will move by 0,0 and still display the block
+        end
+        part.movei(an)
+        bl = block.yield
+        unless bl == nil
+          part = bl.move(an)
+        end
+      end
+      part
+    end
+
     # move to anchor
     def movea(key, thing=nil, args={})
       if thing.kind_of? Hash # if you leave out thing, args may be interpreted as thing
@@ -407,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
 
@@ -429,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-alpha19"
+  VERSION = "1.0.0-alpha22"
 end

data/lib/jenncad.rb

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

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.alpha19
+  version: 1.0.0.pre.alpha22
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-16 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,10 +147,15 @@ 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
 - lib/jenncad/register.rb
+- 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