jenncad 1.0.0.pre.alpha8 → 1.0.0.pre.alpha9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f2310cb82dee6ece32a91135d15ffe4c6d69695e4af8ed9aabd91906ce22088
-  data.tar.gz: b36e9d1c8f926fb2858fb017aaced7cfe363b9c7e26fa3bd071eb677bff90e3c
+  metadata.gz: 93ed5b4cc8c786d306d9fbaa7c0518a607b20c76f08538a0882584ec34955ac4
+  data.tar.gz: 5394a9131feb628a3d8f4a1d099ce75b104d0f0674c4dbb9d57db19fc555486a
 SHA512:
-  metadata.gz: e1877c0c6f9f7bc509b8aacc97383ed451bc50b7de61c6dafd49e2b25ec51da4b877b683ddbe0563c69c771aba4e8a543c71aee9be0708d5b08ef593b0053d23
-  data.tar.gz: 0a25cd07dd118d1beb5f819f3ec60262cabb9793b5867d93d642ee95e64ff2f8229d72283ad98ca6d197b79e273f4a00e4aba2c9e709dcb7c17dd7b7e4f4a6e9
+  metadata.gz: 29deaf817dfce550a7a3038454ddbca39c520ae1964526f7f7ebcf06edca9dbe056ec13d1f84e4390d3dbe0f043324f48c220e8bcb5a38e201b47853603bcca2
+  data.tar.gz: c4e3a0e515ad6586fbc9919a6f0608375bf4d2babf21b8de202b308227050fae25e3db2d44ca0f4271c67854d9f57508aa5dbf04c576d562b6515ed9da6419d4

data/lib/jenncad/features/aggregation.rb

@@ -6,6 +6,7 @@ module JennCad::Features
       super({})
       @name = name
       @parts = [part] # NOTE: single length arrayto make checking children easier
+      @z = part.z
     end
 
     def part

data/lib/jenncad/features/path.rb

@@ -0,0 +1,339 @@
+module JennCad
+  class RoundCorner
+    attr_accessor :start_point, :end_point, :input_a, :output_a, :a, :l, :od, :id, :thing, :angle, :current_angle, :direction, :from, :ccw
+    def initialize(args, &thing)
+      @start_point = args[:start_point]
+      @end_point = args[:end_point]
+      @a = args[:a]
+      @ccw = args[:ccw] || false
+      @l = args[:l]
+      @od = args[:od]
+      @id = args[:id]
+      @input_a = args[:input_a] || 0
+      @output_a = args[:output_a] || 0
+      @thing = thing
+      @angle = args[:angle]
+      @current_angle = args[:current_angle]
+      @direction = args[:direction]
+      @to = args[:to]
+      @from = args[:from]
+
+      if @a < 0
+        @from = case @from
+          when :left
+            :right
+          when :right
+            :left
+          when :top, :up
+            :bottom
+          when :down, :bottom
+            :up
+          else
+            # // unimplemented
+            @from
+        end
+      end
+
+    end
+
+    def set_angles(cur, total, direction)
+      @current_angle = cur
+      @angle = normalize(total)
+      @direction = direction
+    end
+
+    def normalize(angle)
+      if angle < 0
+        angle += 360
+      end
+      if angle >= 360
+        angle -= 360
+      end
+      angle
+    end
+
+    def margin
+      return @od
+    end
+
+    def positions
+      td = thing.yield.d || thing.yield.y
+      unless td
+        puts "ERROR: cannot find diameter or y of thing #{thing.yield.inspect}"
+        return
+      end
+      l = td + @id
+      l2 = td / 2.0 + @id / 2.0
+      r = 0
+      ox = 0
+      oy = 0
+      cr = 180
+      case @from
+        when :left
+          r = 0
+          oy = -l
+        when :top, :up
+          r = -90
+          ox = -l
+          cr = 0
+        when :right
+          r = 180
+          oy = l
+        when :bottom, :down
+          cr = 0
+          r = 90
+          ox = l
+        # TODO: so this doesn't work yet,
+        #       need to figure out the maths to translate this
+        when 0..360
+          r = 180-@from
+          cr = @a
+      end
+
+      r2 = cr + r + @a   # 180+@a
+      x = - l2 * Math::sin((r2/180.0)*Math::PI)
+      y = - l2 * Math::cos((r2/180.0)*Math::PI)
+
+
+
+      return r, ox/2.0, oy/2.0, x, y
+
+    end
+
+    def part
+      d = thing.yield.d
+      len = d * 2 + @id
+      x = Math::sin((@a/180.0)*Math::PI)*len
+      y = Math::cos((@a/180.0)*Math::PI)*len
+
+      res  = circle(d: len)
+      res -= circle(d: @id)
+      points = [[0,0]]
+      points << [0, len]
+      points << [x, y]
+
+      res *= polygon(points:points)
+
+      r, ox, oy, x, y = positions
+      res = res.rotate(z: r).move(x: ox, y: oy)
+      res = res.auto_extrude#.color("red")
+
+      #res += slot(d: 1.2, y: len/2.0, h: 10).rotate(z: r_midpoint).color("red")
+      #res += cylinder(d: 1, h: 10).move(x: x+ox,y: y+oy)
+
+      #res.moveh(x: thing.yield.d, y: -thing.yield.d)
+      res.move(x: @start_point[:x], y: @start_point[:y])
+
+      #res += cylinder(d: 1, h: 15).color("red").move(x: @start_point[:x], y: @start_point[:y]).move(z:-1)
+
+
+      res
+
+    end
+
+  end
+
+  class Line
+    attr_accessor :start_point, :end_point, :l, :thing, :angle, :current_angle, :direction
+    def initialize(args, &thing)
+      @start_point = args[:start_point]
+      @end_point = args[:end_point]
+      @angle = args[:angle]
+      @current_angle = args[:current_angle]
+      @direction = args[:direction]
+      @l = args[:l]
+      @thing = thing
+    end
+
+    def sp_margin(margin)
+      @start_point[:x] -= margin[:x]
+      @start_point[:y] -= margin[:y]
+    end
+
+    def ep_margin(margin)
+      @end_point[:x] -= margin[:x]
+      @end_point[:y] -= margin[:y]
+    end
+
+    def shrink_ep(len)
+      sx, sy = @start_point[:x], @start_point[:y]
+      ex, ey = @end_point[:x], @end_point[:y]
+      vx = ex-sx
+      vy = ey-sy
+      l = Math::sqrt(vx**2 + vy**2)
+      factor = len / l
+      @end_point[:x] -= vx * factor
+      @end_point[:y] -= vy * factor
+      #puts "#{sx} x #{sy}  => #{ex} x #{ey} , shrink #{factor} "
+    end
+
+    def shrink_sp(len)
+      sx, sy = @start_point[:x], @start_point[:y]
+      ex, ey = @end_point[:x], @end_point[:y]
+      vx = ex-sx
+      vy = ey-sy
+      l = Math::sqrt(vx**2 + vy**2)
+      factor = len / l
+      @start_point[:x] -= vx * factor
+      @start_point[:y] -= vy * factor
+    end
+
+
+    def part
+      hull(
+        @thing.yield.move(x: @start_point[:x], y: @start_point[:y]),
+        @thing.yield.move(x: @end_point[:x], y: @end_point[:y])
+      )
+    end
+  end
+
+  class Path < Thing
+
+    attr_accessor :elements, :lpos, :thing, :angle, :current_angle, :direction
+    def initialize(args)
+      @thing = args[:part] #// cylinder(d: @d, z: @z)
+      @part = new_thing
+      @angle = args[:a] || 0
+      @current_angle = args[:a] || 0
+      @direction = 0
+      @name = args[:name] || "Path"
+      @calc_h = @part.z
+      @dir = 0
+      @lpos = {x: 0, y: 0, l: 0, a: 0}
+      @coords = []
+      @steps = []
+      @parts = [new_thing]
+
+      super(args)
+    end
+
+    def new_thing
+      r = @thing.clone
+      r.transformations = []
+      r
+    end
+
+    def corner(args)
+      od = args[:od]
+      id = args[:id]
+      if id.nil? && od
+        id = new_thing.d
+        #puts "od: #{od} , thing d #{new_thing.d} new id #{id}"
+      end
+      if od.nil? && id
+        od = id + new_thing.d
+      end
+      rc = RoundCorner.new(
+        start_point: { x: @lpos[:x], y: @lpos[:y] },
+        end_point: { x: @lpos[:x], y: @lpos[:y] },
+        od: od,
+        id: id,
+        ccw: args[:ccw],
+        from: args[:from],
+        to: args[:to],
+        a: args[:a],
+        direction: @direction
+      ){ new_thing }
+
+      _, ox, oy, x, y = rc.positions
+      @lpos[:x] += x + ox
+      @lpos[:y] += y + oy
+
+      @steps << rc
+    end
+
+    def line(args)
+      if args[:l]
+        args[:a] ||= 0
+        if args[:a] > 0
+          @direction = 1
+        elsif args[:a] < 0
+          @direction = -1
+        else
+          @direction = 0
+        end
+
+        @angle += args[:a]
+        @current_angle = args[:a]
+
+        l = args[:l]
+        gamma = 90
+        alpha = @angle
+        beta = gamma - alpha
+
+        case
+        when alpha == 90, alpha == -270
+          x = l
+          y = 0
+        when alpha == 180, alpha == -180
+          x = 0
+          y = -l
+        when alpha == 270, alpha == -90
+          x = -l
+          y = 0
+        when alpha == 360, alpha == 0
+          x = 0
+          y = l
+        else
+          y = l/Math::sin(radians(gamma)) * Math::sin(radians(beta))
+          x = y/Math::sin(radians(beta)) * Math::sin(radians(alpha))
+        end
+      elsif args[:x] || args[:y]
+        x = args[:x] || 0
+        y = args[:y] || 0
+
+        dx = @lpos[:x] - x
+        dy = @lpos[:y] - y
+
+        l = Math::sqrt(dx*dx + dy*dy)
+        alpha = Math::atan2(x, y)*180/Math::PI
+      else
+        puts "Error in line(): Please specify either :l, :x or :y"
+        return
+      end
+
+      @steps << Line.new(start_point: { x: @lpos[:x], y: @lpos[:y] }, end_point: { x: @lpos[:x] + x, y: @lpos[:y] + y  }, angle: @angle, current_angle: @current_angle, direction: @direction, l: l){ new_thing }
+
+      add_lpos({x: x, y: y})
+    end
+
+    def add_lpos(lpos)
+      #puts "x: #{lpos[:x]}, y: #{lpos[:y]}"
+      [:x, :y].each do |key|
+        @lpos[key] += lpos[key]
+      end
+      @coords << lpos
+    end
+
+    def pos
+      [@lpos[:x], @lpos[:y]]
+    end
+
+    def center
+      @steps << Move.new(x: @lpos[:x] * -1, y: @lpos[:y] * -1)
+      self
+    end
+
+    def assemble
+      @steps.each_with_index do |step, i|
+        if @steps[i+1] && @steps[i+1].class == Line && step.class == RoundCorner
+          step.set_angles(@steps[i+1].current_angle, @steps[i+1].angle, @steps[i+1].direction)
+        end
+      end
+      res = nil
+      @steps.each do |step|
+        if step.kind_of? Transformation
+          res.transformations << step
+        else
+          res += step.part
+        end
+      end
+      set_heights_for_auto_extrude([res], self)
+      res.transformations << @transformations
+      Aggregation.new(@name, res)
+    end
+
+  end
+end
+
+

data/lib/jenncad/features.rb

@@ -4,6 +4,8 @@ require "jenncad/features/cuttable"
 require "jenncad/features/openscad_include"
 require "jenncad/features/climb"
 require "jenncad/features/stl_import"
+require "jenncad/features/path"
+
 
 
 module JennCad

data/lib/jenncad/primitives/subtract_object.rb

@@ -57,7 +57,6 @@ module JennCad::Primitives
             case part
             when JennCad::Circle
             when JennCad::BooleanObject
-            when JennCad::Aggregation
             else
               pp part if part.opts[:debug]
               part.opts[:margins][:z] ||= 0.0

data/lib/jenncad/thing.rb

@@ -47,7 +47,7 @@ module JennCad
       end
     end
 
-    def movei(args)
+    def movei(args={})
       to = {}
       [:x, :y, :z].each do |key|
         if args[key]
@@ -162,7 +162,7 @@ module JennCad
       return args
     end
 
-    def move(args)
+    def move(args={})
       if args.kind_of? Array
         x,y,z = args
         return move(x:x, y:y, z:z)
@@ -183,20 +183,20 @@ module JennCad
     alias :translate :move
     alias :m :move
 
-    def mx(v)
+    def mx(v=0)
       move(x:v)
     end
 
-    def my(v)
+    def my(v=0)
       move(y:v)
     end
 
-    def mz(v)
+    def mz(v=0)
       move(z:v)
     end
 
     # move half
-    def moveh(args)
+    def moveh(args={})
       if args.kind_of? Array
         x,y,z = args
         args = {x: x, y: y, z: z}
@@ -209,26 +209,26 @@ module JennCad
     end
     alias :mh :moveh
 
-    def mhx(v)
+    def mhx(v=0)
       moveh(x:v)
     end
 
-    def mhy(v)
+    def mhy(v=0)
       moveh(y:v)
     end
 
-    def mhz(v)
+    def mhz(v=0)
       moveh(z:v)
     end
 
-    def mirror(args)
+    def mirror(args={})
       @transformations ||= []
       @transformations << Mirror.new(args)
       self
     end
     alias :mi :mirror
 
-    def scale(args)
+    def scale(args={})
       if args.kind_of? Numeric or args.kind_of? Array
           args = {v:args}
       end

data/lib/jenncad/version.rb

@@ -1,4 +1,4 @@
 module JennCad
-  VERSION = "1.0.0-alpha8"
+  VERSION = "1.0.0-alpha9"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha8
+  version: 1.0.0.pre.alpha9
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-23 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -115,6 +115,7 @@ files:
 - lib/jenncad/features/cuttable.rb
 - lib/jenncad/features/feature.rb
 - lib/jenncad/features/openscad_include.rb
+- lib/jenncad/features/path.rb
 - lib/jenncad/features/stl_import.rb
 - lib/jenncad/part.rb
 - lib/jenncad/patches/array.rb