jenncad 1.0.0.pre.alpha2 → 1.0.0.pre.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef018e45bc6303b2a45c2ad3340d714cb340288465936f23293961fbc2615cd4
-  data.tar.gz: 1ee41eb205053ad3ea4e0d1b8c76b4fa13c98f212393e71008e96f1303b0f9c7
+  metadata.gz: b3b2667c6121606bece58cc0edbb2d7c0e0f2454dc175b62c3749209c1eef266
+  data.tar.gz: d8dbc84a707b0767374830df107ebcb098b89591664f0f7062468404b0c512e2
 SHA512:
-  metadata.gz: b9541672a102b371b7a517be6d015ca1bc6e4f81fae97761399514733870bc1b0c67094b6a6e177c1c5af7d85416067e9b6dab024bff275b4537013f88072fc2
-  data.tar.gz: 44d0ae2e9aefb56e1964cf2e0fdf0590be5fc600abea1d65f3edcf40fca03a57bf6e107020dd26ec2ffac6a3f4c9f6b6f3688cdbcb72489766984b3011c8abd3
+  metadata.gz: e512b91a4c6355cfd1b516bc52e434b1670e5aae02b39d75581e423a6242a90b11257a4c4902e30db74de0d4c1693aa7608829393df45806ecf56fc3e409bce9
+  data.tar.gz: 26fad5ebe17ad65610283315c2c33d9d7842717b78ad8560029038238b18c88aa351667a395f24ef134cf3f9fce298fcb1528ca459c7aeebfe618d71a5186233

data/lib/jenncad.rb

@@ -20,10 +20,10 @@ require "jenncad/part"
 require "jenncad/project"
 require "jenncad/commands"
 
+require "jenncad/features"
 require "jenncad/primitives"
 
 
-
 require "jenncad/transformation/transformation"
 require "jenncad/transformation/move"
 require "jenncad/transformation/rotate"

data/lib/jenncad/exporters/openscad.rb

@@ -221,6 +221,8 @@ module JennCad::Exporters
         OpenScadObject.new(:translate, t.coordinates, transform(part, &block))
       when JennCad::Rotate, JennCad::Mirror
         OpenScadObject.new(demodulize(t.class).downcase, t.coordinates, transform(part, &block))
+      when JennCad::Scale
+        OpenScadObject.new(:scale, t.scale, transform(part, &block))
       when JennCad::Multmatrix
         OpenScadObject.new(:multmatrix, t.m, transform(part, &block))
       else

data/lib/jenncad/features.rb

@@ -0,0 +1,9 @@
+require "jenncad/features/feature"
+require "jenncad/features/aggregation"
+require "jenncad/features/cuttable"
+require "jenncad/features/openscad_include"
+require "jenncad/features/climb"
+
+module JennCad
+  include Features
+end

data/lib/jenncad/{primitives → features}/aggregation.rb

@@ -1,5 +1,5 @@
-module JennCad::Primitives
-  class Aggregation < Primitive
+module JennCad::Features
+  class Aggregation < Feature
     attr_accessor :part
 
     def initialize(name=nil, part=nil)

data/lib/jenncad/features/climb.rb

@@ -0,0 +1,95 @@
+module JennCad::Features
+  class Climb < Feature
+    def initialize(opts, block)
+      @opts = {
+        offset: :auto,
+        step: nil,
+        steps: nil,
+        bottom: nil,
+        top: nil,
+        z: nil,
+      }.deep_merge!(opts)
+      if @opts[:step].nil? && @opts[:steps].nil?
+        raise "please define at least one of :step or :steps for climb"
+      end
+      super(@opts)
+      @block = block
+    end
+
+    def z_or_referenced
+      case z = @opts[:z]
+      when nil
+        referenced_z.z
+      else
+        z
+      end
+    end
+
+    def get_step(z)
+      case step = @opts[:step]
+      when nil, :auto, 0, 0.0
+        steps = @opts[:steps]
+        (z  / steps).floor
+      else
+        step.to_f
+      end
+    end
+
+    def get_offset(z)
+      case offset = @opts[:offset]
+      when :auto
+        step = get_step(z)
+        ((z % step) + step) / 2.0
+      when nil, 0, 0.0
+        0.0
+      else
+        offset
+      end
+    end
+
+    def climb_from_bottom(offset, step, n)
+      n.times.map{ |i| @block.yield.mz(offset+step*i) }.union
+    end
+
+    def climb_from_top(z, offset, step, n)
+      n.times.map{ |i| @block.yield.mz(z-offset-step*i) }.union
+    end
+
+    def to_openscad
+      ref_z = z_or_referenced
+      step = get_step(ref_z)
+      steps, top, bottom = @opts.values_at(:steps, :top, :bottom)
+
+      offset = get_offset(ref_z)
+
+      lo = (ref_z-offset*2).to_f % step.to_f
+      unless lo.to_f == 0.0
+        puts "[Warning]: climb has leftover offset #{lo}"
+      end
+
+      if steps
+        top = steps
+        bottom = steps
+      end
+
+      unless top or bottom
+        climb_from_bottom(offset, step, ((ref_z-offset*2) / step).floor + 1 )
+      else
+        res = nil
+        if top
+          res += climb_from_top(ref_z, offset, step, top)
+        end
+        if bottom
+          res += climb_from_bottom(offset, step, bottom)
+        end
+        res
+      end
+    end
+
+  end
+
+  def climb(args, &block)
+    Climb.new(args, block)
+  end
+
+end

data/lib/jenncad/features/cuttable.rb

@@ -0,0 +1,35 @@
+module JennCad::Features
+  module Cuttable
+    def cut(args, &block)
+      if args[:x]
+        l = args[:x].min * @opts[:y] / 2.0
+        r = args[:x].max * @opts[:y] / 2.0
+        prepare_cut(l, r, &block).flip_x
+      elsif args[:y]
+        l = args[:y].min * @opts[:y] / 2.0
+        r = args[:y].max * @opts[:y] / 2.0
+        prepare_cut(l, r, &block).flip_y
+      elsif args[:z]
+        raise "cut for Z is not implemented yet"
+      end
+    end
+
+    def prepare_cut(l, r, &block)
+      part = block.call
+      if part.z.to_f > 0.0
+        part.opts[:margins][:z] = 0.2
+        if l == 0.0
+          part.mz(r+0.1)
+        else
+          part.mz(l+part.z.to_f-0.2)
+        end
+      else
+        part.opts[:margins][:z] = 0.2
+        part.z = l.abs + r.abs + 0.2
+        part.mz(-0.1)
+      end
+    end
+
+
+  end
+end

data/lib/jenncad/features/feature.rb

@@ -0,0 +1,4 @@
+module JennCad::Features
+  class Feature < JennCad::Thing
+  end
+end

data/lib/jenncad/{primitives → features}/openscad_include.rb

@@ -1,4 +1,4 @@
-module JennCad::Primitives
+module JennCad::Features
   class OpenScadImport < Aggregation
     attr_accessor :import, :args
 

data/lib/jenncad/patches/array.rb

@@ -12,8 +12,7 @@ class Array
       else
         res = part
       end
-      # FIXME: I added 0.01 to all for now to fix z-fighting issues; this should not be hardcoded like this
-      res, z = res.move(z:z), z + res.z.to_f + 0.01 unless skip_z
+      res, z = res.mz(z), z + res.z.to_f unless skip_z
       res
     end
     .union

data/lib/jenncad/primitives.rb

@@ -1,6 +1,4 @@
 require "jenncad/primitives/primitive"
-require "jenncad/primitives/aggregation"
-require "jenncad/primitives/openscad_include"
 require "jenncad/primitives/circle"
 require "jenncad/primitives/cylinder"
 require "jenncad/primitives/sphere"

data/lib/jenncad/primitives/cube.rb

@@ -1,5 +1,6 @@
 module JennCad::Primitives
   class Cube < Primitive
+    extend JennCad::Features::Cuttable
 
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)

data/lib/jenncad/primitives/rounded_cube.rb

@@ -1,6 +1,7 @@
 module JennCad::Primitives
   class RoundedCube < Primitive
     attr_accessor :d, :r
+    include JennCad::Features::Cuttable
 
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
@@ -40,7 +41,7 @@ module JennCad::Primitives
       # make diameter not bigger than any side
       @d = [@d, @x, @y].min
       res = HullObject.new(
-        cylinder(d:@d, h:@z+z_margin).moveh(x: -@x + @d, y: @y - @d),
+        cylinder(d:@d, h:z+z_margin).moveh(x: -@x + @d, y: @y - @d),
         cylinder(d:@d).moveh(x: @x - @d, y: @y - @d),
         cylinder(d:@d).moveh(x: -@x + @d, y: -@y + @d),
         cylinder(d:@d).moveh(x: @x - @d, y: -@y + @d),

data/lib/jenncad/thing.rb

@@ -6,7 +6,7 @@ module JennCad
     attr_accessor :x, :y, :diameter
     attr_accessor :calc_x, :calc_y, :calc_z, :calc_h
     attr_accessor :shape
-    attr_accessor :angle, :cut, :fn
+    attr_accessor :angle, :fn
 
     def initialize(args={})
       @transformations = []
@@ -49,17 +49,22 @@ module JennCad
 
     def flip(direction)
       case self
+      when UnionObject
+        ref = self.parts.first
+        rz = self.z.to_f + self.calc_h.to_f
       when BooleanObject
         ref = self.parts.first
+        rz = ref.calc_z + ref.calc_h
       else
         ref = self
+        rz = self.z + self.calc_h
       end
 
       case direction
       when :x
-        self.ry(90).mh(x: -ref.z, z: ref.x)
+        self.ry(90).mh(x: -rz, z: ref.x)
       when :y
-        self.rx(90).mh(y: ref.z, z: ref.y)
+        self.rx(90).mh(y: rz, z: ref.y)
       end
     end
 

data/lib/jenncad/transformation/scale.rb

@@ -1,7 +1,9 @@
 module JennCad
+  attr_accessor :scale
   class Scale < Transformation
     def initialize(args)
       super(args)
+      @scale = args
     end
   end
 end

data/lib/jenncad/version.rb

@@ -1,4 +1,4 @@
 module JennCad
-  VERSION = "1.0.0-alpha2"
+  VERSION = "1.0.0-alpha3"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha2
+  version: 1.0.0.pre.alpha3
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -108,10 +108,15 @@ files:
 - lib/jenncad/extras/din934.rb
 - lib/jenncad/extras/hardware.rb
 - lib/jenncad/extras/iso7380.rb
+- lib/jenncad/features.rb
+- lib/jenncad/features/aggregation.rb
+- lib/jenncad/features/climb.rb
+- lib/jenncad/features/cuttable.rb
+- lib/jenncad/features/feature.rb
+- lib/jenncad/features/openscad_include.rb
 - lib/jenncad/part.rb
 - lib/jenncad/patches/array.rb
 - lib/jenncad/primitives.rb
-- lib/jenncad/primitives/aggregation.rb
 - lib/jenncad/primitives/boolean_object.rb
 - lib/jenncad/primitives/circle.rb
 - lib/jenncad/primitives/cube.rb
@@ -119,7 +124,6 @@ files:
 - lib/jenncad/primitives/hull_object.rb
 - lib/jenncad/primitives/intersection_object.rb
 - lib/jenncad/primitives/linear_extrude.rb
-- lib/jenncad/primitives/openscad_include.rb
 - lib/jenncad/primitives/polygon.rb
 - lib/jenncad/primitives/primitive.rb
 - lib/jenncad/primitives/projection.rb