jenncad 1.0.0.pre.alpha2 → 1.0.0.pre.alpha6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef018e45bc6303b2a45c2ad3340d714cb340288465936f23293961fbc2615cd4
-  data.tar.gz: 1ee41eb205053ad3ea4e0d1b8c76b4fa13c98f212393e71008e96f1303b0f9c7
+  metadata.gz: 8dc72aa8cfaaa41cf4b96038f454073f708502cea9d9ce84a13fc28203ff4dc2
+  data.tar.gz: c5f0cbe4442bf7b59c39ee2f69e2096d0166fa4ae336c48029f8856606da3d9a
 SHA512:
-  metadata.gz: b9541672a102b371b7a517be6d015ca1bc6e4f81fae97761399514733870bc1b0c67094b6a6e177c1c5af7d85416067e9b6dab024bff275b4537013f88072fc2
-  data.tar.gz: 44d0ae2e9aefb56e1964cf2e0fdf0590be5fc600abea1d65f3edcf40fca03a57bf6e107020dd26ec2ffac6a3f4c9f6b6f3688cdbcb72489766984b3011c8abd3
+  metadata.gz: 425dda2b4dda1793baa9ef4d6f30155325acc949df98c2ca214b7abb931a1a9aa7757f6b906a89cf12d7a17c4447ef3b92b3b999120d455cfb8693a2b5cfe0af
+  data.tar.gz: 706f8e591aab9c10702577c09fc95a4e5e7cd1444cb3fbda88e715872e4aab67fb8b35449a97a27a1b874325e3804cf20377884ebb67896484e9bc9cee5a6625

data/README.md

@@ -0,0 +1,83 @@
+
+# jenncad
+Create physical objects in Ruby, OpenScad export
+
+This is a successor to my older project CrystalScad. 
+
+# Installation
+
+A packaged release is not yet available, please build your own package in the meantime:
+
+    $ git clone git@github.com:jglauche/jenncad.git
+    $ cd jenncad
+    $ rake install
+
+This will create a gem and a binary jenncad. 
+
+# Using Jenncad
+
+**To create a new project directory, run:**
+
+    $ jenncad create meow
+   
+
+
+
+This will generate a directory meow/ and an executable ruby file meow.rb in its directory
+
+    $ cd meow
+    $ ./meow
+
+This will generate a dummy project which generates a dummy cube as  OpenSCAD output:
+
+    $ cat output/meow.scad 
+> $fn=64;
+> translate([-5, -5, 0])cube([10, 10, 10.0]);
+
+**Automatically refresh OpenSCAD output while developing**
+
+Jenncad bundles the observr gem which will check if files were changed while developing. In the project directory run:
+
+    $ jenncad
+This should display something like:
+> refreshing... 
+> ok 
+> JennCad running, refreshing on file changes. Press ctrl+c to exit
+
+**Note:** This does not check for new files in the project. You will have to restart it when you create a new part in a new file
+
+**Create new part**
+
+In your project directory, run:
+
+    $ jenncad new cat
+    part parts/cat.rb created. In your meow.rb add to class Meow:
+    def cat
+      Cat.new(config)
+    end
+
+
+You will have to link the part to the project manually into the meow.rb file in your project directory. When you add it, your meow.rb should look like this:
+
+    #!/usr/bin/env ruby
+    require "jenncad"
+    include JennCad
+    
+    class Meow < Project
+      def config
+        {}
+      end
+    
+      def meow
+        cube(10,10,10)
+      end
+    
+      def cat
+        Cat.new(config)
+      end
+    
+    end
+    Meow.new.run
+
+ 
+

data/jenncad.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 2.6.0"
   gem.add_runtime_dependency "geo3d"
   gem.add_runtime_dependency "deep_merge"
-  gem.add_runtime_dependency "hanami-cli"
+  gem.add_runtime_dependency "hanami-cli", "0.3.1"
   gem.add_runtime_dependency "activesupport"
   gem.add_runtime_dependency "observr"
 end

data/lib/jenncad/commands.rb

@@ -1,6 +1,7 @@
 module JennCad
   module Commands
     extend Hanami::CLI::Registry
+    MAGIC = "jenncad-append-project-magic"
 
     class Run < Hanami::CLI::Command
       argument :name, required: false
@@ -122,10 +123,34 @@ module JennCad
           f.puts "  end"
           f.puts "end"
         end
-        puts "part #{filename} created. In your #{executable} add to class #{executable_class}:"
-        puts "  def #{name}"
-        puts "    #{classname}.new(config)"
-        puts "  end"
+
+        lines  = File.readlines(executable)
+        magic_line = nil;
+        lines.each_with_index do |l, i|
+          if l.rindex(MAGIC)
+            magic_line = i
+          end
+        end
+        puts "part #{filename} created."
+        if !magic_line
+          puts "In your #{executable} add to class #{executable_class}:"
+          puts "  def #{name}"
+          puts "    #{classname}.new(config)"
+          puts "  end"
+          puts ""
+          puts "For jenncad to insert this line automatically, add this line to your project file before the \"end\"-statement of your class:"
+          puts "##{MAGIC}"
+        else
+          data  = "\n"
+          data += "  def #{name}\n"
+          data += "    #{classname}.new(config)\n"
+          data += "  end\n"
+          lines.insert(magic_line, data)
+          f = File.open(executable, "w")
+          f.write(lines.join)
+          f.close
+        end
+
 
       end
 
@@ -152,9 +177,7 @@ module JennCad
           f.puts "    {}"
           f.puts "  end"
           f.puts ""
-          f.puts "  def #{name}"
-          f.puts "    cube(10,10,10)"
-          f.puts "  end"
+          f.puts "  # #{MAGIC}"
           f.puts "end"
           f.puts ""
           f.puts "#{classname}.new.run"

data/lib/jenncad/exporters/openscad.rb

@@ -94,7 +94,12 @@ module JennCad::Exporters
           if !v.kind_of?(Array) && !v.kind_of?(TrueClass) && !v.kind_of?(FalseClass) && v == v.to_i
             v = v.to_i
           end
-          res << "#{k}=#{v}"
+          if v.kind_of? String
+            q = "\""
+          else
+            q = ""
+          end
+          res << "#{k}=#{q}#{v}#{q}"
         end
         res.join(",").gsub("size=","")
       else
@@ -165,6 +170,8 @@ module JennCad::Exporters
         new_obj(part, :projection, collect_params(part), parse(part.parts))
       when JennCad::Primitives::Polygon
         new_obj(part, :polygon, collect_params(part))
+      when JennCad::StlImport
+        new_obj(part, :import, collect_params(part))
       when JennCad::Part
         parse(part.part)
       when nil
@@ -192,8 +199,11 @@ module JennCad::Exporters
     end
 
     def collect_params(part)
+      if part.respond_to? :openscad_params
+        return part.openscad_params
+      end
       res = {}
-      [:d, :h, :d1, :d2, :size, :fn, :points].each do |var|
+      [:d, :h, :d1, :d2, :size, :fn, :points, :file].each do |var|
         if part.respond_to? var
           res[var] = part.send var
         end
@@ -221,6 +231,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
@@ -237,7 +249,7 @@ module JennCad::Exporters
 
     # accept aggregation
     def register_module(part)
-      @modules[part.name] = OpenScadObject.new(:module,part.name, parse(part.part))
+      @modules[part.name] = OpenScadObject.new(:module, part.name, parse(part.part))
     end
 
     def handle_import(part)

data/lib/jenncad/features/aggregation.rb

@@ -0,0 +1,16 @@
+module JennCad::Features
+  class Aggregation < Feature
+    attr_accessor :parts
+
+    def initialize(name=nil, part=nil)
+      super({})
+      @name = name
+      @parts = [part] # NOTE: single length arrayto make checking children easier
+    end
+
+    def part
+      @parts.first
+    end
+
+  end
+end

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/features/stl_import.rb

@@ -0,0 +1,10 @@
+module JennCad::Features
+  class StlImport < Feature
+    attr_accessor :file, :args
+
+    def initialize(file, args={})
+      @file = file
+      @args = args
+    end
+  end
+end

data/lib/jenncad/features.rb

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

data/lib/jenncad/part.rb

@@ -2,11 +2,10 @@ module JennCad
   # Part should be inherited from the user when making parts
   class Part < Thing
 
-    def to_openscad #make_openscad_compatible
-      auto_color
-      a = Aggregation.new(self.class.to_s, self.part) #make_openscad_compatible!(self.part))
+    def to_openscad
+      a = Aggregation.new(self.class.to_s, self.part)
       a.transformations = @transformations
-      a.color(color)
+      a.color(:auto)
       a
     end
 

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

@@ -1,10 +1,10 @@
 module JennCad::Primitives
   class Cube < Primitive
+    extend JennCad::Features::Cuttable
 
-    def initialize(args)
-      if args.kind_of?(Array) && args[0].kind_of?(Hash)
-        args = args.first
-      end
+
+    def feed_opts(args)
+      # FIXME: this doesn't seem to work
       if args.kind_of? Array
         m = {}
         if args.last.kind_of? Hash
@@ -12,7 +12,13 @@ module JennCad::Primitives
         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,
         y: 0,
@@ -26,10 +32,18 @@ module JennCad::Primitives
         center_y: false,
         center_x: false,
         center_z: false,
-      }.deep_merge!(args)
-      handle_margins
+      }
+      if args.kind_of? Array
+        args.each do |a|
+          feed_opts(parse_xyz_shortcuts(a))
+        end
+      else
+        feed_opts(parse_xyz_shortcuts(args))
+      end
+
 
-      super(args)
+      handle_margins
+      super(z: @opts[:z])
       @h = @z.dup
       @calc_h = @z.dup
     end
@@ -41,30 +55,34 @@ module JennCad::Primitives
 
     def not_centered
       @opts[:center] = false
+      self
     end
     alias :nc :not_centered
 
     def cx
       nc
       @opts[:center_x] = true
+      self
     end
 
     def cy
       nc
       @opts[:center_y] = true
+      self
     end
 
     def cz
       nc
       @opts[:center_z] = true
+      self
     end
 
     def centered_axis
       return [:x, :y] if @opts[:center]
       a = []
       a << :x if @opts[:center_x]
-      a << :y if @opts[:center_x]
-      a << :z if @opts[:center_x]
+      a << :y if @opts[:center_y]
+      a << :z if @opts[:center_z]
       a
     end
 

data/lib/jenncad/primitives/cylinder.rb

@@ -1,6 +1,6 @@
 module JennCad::Primitives
   class Cylinder < Primitive
-    attr_accessor :d, :r, :fn
+    attr_accessor :d, :d1, :d2, :r, :fn
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
         args = args.first
@@ -43,6 +43,20 @@ module JennCad::Primitives
       super(args)
     end
 
+    def openscad_params
+      res = {}
+      if @opts[:d1]
+        [:d1, :d2, :h, :fn].each do |n|
+          res[n] = self.send n
+        end
+      else
+        [:d, :h, :fn].each do |n|
+          res[n] = self.send n
+        end
+      end
+      res
+    end
+
     def handle_fn
       case @opts[:fn]
         when nil, 0
@@ -70,6 +84,20 @@ module JennCad::Primitives
         @d = @opts[:d].to_f + @opts[:margins][:d].to_f
         @r = @d / 2.0
       end
+
+      case @opts[:d1]
+      when 0, nil
+      else
+        @d1 = @opts[:d1].to_f + @opts[:margins][:d].to_f
+        @d2 = @opts[:d2].to_f + @opts[:margins][:d].to_f
+      end
+
+      case @opts[:r1]
+      when 0, nil
+      else
+        @d1 = 2 * @opts[:r1].to_f + @opts[:margins][:d].to_f
+        @d2 = 2 * @opts[:r2].to_f + @opts[:margins][:d].to_f
+      end
     end
 
     def h

data/lib/jenncad/primitives/linear_extrude.rb

@@ -1,10 +1,10 @@
 module JennCad::Primitives
-  attr_accessor :center_bool, :convexity, :twist, :slices, :height
+  attr_accessor :center_bool, :convexity, :twist, :slices
   class LinearExtrude < JennCad::Thing
-    def initialize(part, args)
+    def initialize(part, args={})
       @transformations = []
       @parts = [part]
-      @height = args[:h] || args[:height]
+      @z = args[:h] || args[:height]
       @center_bool = args[:center]
       @convexity = args[:convexity]
       @twist = args[:twist]
@@ -12,6 +12,10 @@ module JennCad::Primitives
       @fn = args[:fn]
     end
 
+    def height
+      @z
+    end
+
     def openscad_params
       res = {}
       [:height, :convexity, :twist, :slices, :fn].each do |n|

data/lib/jenncad/primitives/rotate_extrude.rb

@@ -1,5 +1,5 @@
 module JennCad::Primitives
-  attr_accessor :convexity
+  attr_accessor :cut, :convexity
   class RotateExtrude < JennCad::Thing
     def initialize(part, args)
       @transformations = []

data/lib/jenncad/primitives/rounded_cube.rb

@@ -1,6 +1,7 @@
 module JennCad::Primitives
-  class RoundedCube < Primitive
+  class RoundedCube < Cube
     attr_accessor :d, :r
+    include JennCad::Features::Cuttable
 
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
@@ -22,6 +23,10 @@ module JennCad::Primitives
         z: nil,
         r: nil,
         flat_edges: nil,
+        center: true,
+        center_y: false,
+        center_x: false,
+        center_z: false,
         margins: {
           r: 0,
           d: 0,
@@ -40,16 +45,16 @@ 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).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, 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),
+      ).moveh(xy: @d)
 
       res += flat_edge(@opts[:flat_edges])
 
       res.transformations = @transformations
-      res
+      res.moveh(centered_axis.to_h{|a| [a, -@opts[a]] })
     end
 
     def flat_edge(edge)

data/lib/jenncad/primitives/subtract_object.rb

@@ -55,6 +55,7 @@ module JennCad::Primitives
           part.opts[:margins] ||= {}
           if part.referenced_z && part.z != 0.0
             case part
+            when JennCad::Circle
             when JennCad::BooleanObject
             when JennCad::Aggregation
             else

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

@@ -38,7 +38,11 @@ module JennCad
     OpenScadImport.new(import, name, args)
   end
 
-  def extrude(args)
+  def stl(file, args={})
+    StlImport.new(file, args)
+  end
+
+  def extrude(args={})
     LinearExtrude.new(self, args)
   end
 

data/lib/jenncad/thing.rb

@@ -6,7 +6,8 @@ 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
+    attr_accessor :anchor
 
     def initialize(args={})
       @transformations = []
@@ -28,6 +29,41 @@ module JennCad
       @opts[key] = val
     end
 
+    def set_anchor(args)
+      self.anchor ||= {}
+      args.each do |key, val|
+        self.anchor[key] = val
+      end
+    end
+
+    def movea(key)
+      a = self.anchor[key]
+      unless a
+        puts "Error: Anchor #{key} not found"
+        puts "Available anchor: #{self.anchor}"
+        return self
+      else
+        self.movei(a)
+      end
+    end
+
+    def movei(args)
+      to = {}
+      [:x, :y, :z].each do |key|
+        if args[key]
+          to[key] = args[key]*-1
+        end
+      end
+      move(to)
+    end
+
+
+    def auto_extrude
+      ret = self.extrude
+      ret.set_option(:auto_extrude, true)
+      ret
+    end
+
     def rotate(args)
       @transformations ||= []
       @transformations << Rotate.new(args)
@@ -49,17 +85,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
 
@@ -91,17 +132,43 @@ module JennCad
       [v.x,v.y,v.z]
     end
 
-    # todo: check if that works
     def rotate_around(point,args)
-      x,y,z= point.x, point.y, point.z
+      x,y,z= point[:x], point[:y], point[:z]
       self.move(x:-x,y:-y,z:-z).rotate(args).move(x:x,y:y,z:z)
     end
 
+    def parse_xyz_shortcuts(args)
+      [:x, :y, :z].each do |key|
+        args[key] ||= 0.0
+      end
+
+      if args[:xy]
+        args[:x] += args[:xy]
+        args[:y] += args[:xy]
+      end
+      if args[:xyz]
+        args[:x] += args[:xyz]
+        args[:y] += args[:xyz]
+        args[:z] += args[:xyz]
+      end
+      if args[:xz]
+        args[:x] += args[:xz]
+        args[:z] += args[:xz]
+      end
+      if args[:yz]
+        args[:y] += args[:yz]
+        args[:z] += args[:yz]
+      end
+      return args
+    end
+
     def move(args)
       if args.kind_of? Array
         x,y,z = args
         return move(x:x, y:y, z:z)
       end
+      args = parse_xyz_shortcuts(args)
+
       @transformations ||= []
       if args[:prepend]
         @transformations.prepend(Move.new(args))
@@ -134,9 +201,9 @@ module JennCad
         x,y,z = args
         args = {x: x, y: y, z: z}
       end
-      args[:x] = args[:x] / 2.0 unless args[:x] == nil
-      args[:y] = args[:y] / 2.0 unless args[:y] == nil
-      args[:z] = args[:z] / 2.0 unless args[:z] == nil
+      [:x, :y, :z, :xy, :xyz, :xz, :yz].each do |key|
+        args[key] = args[key] / 2.0 unless args[key] == nil
+      end
 
       move(args)
     end
@@ -223,8 +290,7 @@ module JennCad
       end
       res
     end
-
-    def make_openscad_compatible
+=begin    def make_openscad_compatible
       make_openscad_compatible!(self)
     end
 
@@ -245,39 +311,111 @@ module JennCad
       end
       item
     end
+=end
+
+    def has_explicit_color?
+      if option(:auto_color) == false
+        return true
+      end
+      return false
+    end
+
+    def only_color?(parts, lvl=0)
+      return true if parts == nil
+
+      parts.each do |part|
+#        puts "  " * lvl + "[only_color?] #{part}"
+        if part.has_explicit_color?
+#          puts "  " * lvl + "found explicit color here"
+          return false
+        end
+        if !only_color?(part.parts, lvl+1)
+          return false
+        end
+      end
+      true
+    end
+
+    def set_auto_color_for_children(col, parts, lvl=0)
+      return if parts == nil
+
+      parts.each do |part|
+        unless part.has_explicit_color?
+          if only_color?(part.parts, lvl+1)
+#            puts "  " * lvl + "children have no explicit color, setting it here"
+            part.set_auto_color(col)
+          else
+#            puts "  " * lvl + "[set_auto_color_for_children] #{part}"
+            set_auto_color_for_children(col, part.parts, lvl+1)
+          end
+        else
+#          puts "  " * lvl + "[set_auto_color_for_children] this part has a color, ignoring their children"
+        end
+
+      end
+    end
+
+    def set_auto_color(col)
+      set_option :color, col
+      set_option :auto_color, true
+    end
 
     def color(args=nil)
-      case args
-      when nil
+      if args == nil
         return option(:color)
-      when :auto
-        return auto_color!
+      end
+
+      if args == :auto
+        ac = auto_color
+        unless ac.nil?
+          #puts "auto color to #{ac}"
+          if only_color?(get_contents)
+            set_option :color, ac
+            set_option :auto_color, true
+          else
+            set_auto_color_for_children(ac, get_contents)
+          end
+
+        end
+        return self
+      end
+
+      c = color_parse(args)
+      unless c.nil?
+        set_option :color, c
+        set_option :auto_color, false
+      end
+
+      self
+    end
+
+    def color_parse(args=nil)
+      case args
       when :none
         set_option :no_auto_color, true
       when :random
-        set_option :color, Color.random
+        return Color.random
       when Array
-        set_option :color, Color.parse(args)
+        return Color.parse(args)
       when /(?<=#)(?<!^)(\h{6}|\h{3})/
-        set_option :color, args
+        return args
       when /(?<!^)(\h{6}|\h{3})/
-        set_option :color, "##{args}"
+        return "##{args}"
       when String
-        set_option :color, args
-      else
-        puts "meow"
+        return args
       end
-      self
+      nil
     end
 
     def auto_color
       if option(:color) == nil && !option(:no_auto_color)
-        auto_color!
+        return auto_color!
       end
+      nil
     end
 
     def auto_color!
-      color($jenncad_profile.colors.pop)
+      color_parse($jenncad_profile.colors.pop)
     end
 
     def color_or_fallback
@@ -285,12 +423,44 @@ module JennCad
       option(:color)
     end
 
-    def openscad(file)
-      if @parts == nil
-        if self.respond_to? :part
-          @parts = [part]
+    def get_contents
+      return @parts unless @parts.nil?
+      if self.respond_to? :part
+        return [part]
+      end
+    end
+
+    def calculated_h
+      return @z unless @z.nil? || @z == 0
+      return @h unless @h.nil? || @h == 0
+      return @calc_h unless @calc_h.nil? || @calc_h == 0
+      return @calc_z unless @calc_z.nil? || @calc_z == 0
+    end
+
+    def find_calculated_h(parts)
+      return if parts == nil
+      parts.each do |part|
+        if z = calculated_h
+          return z
+        end
+        get_calculated_h(part.get_contents)
+      end
+    end
+
+    def set_heights_for_auto_extrude(parts, parent=nil)
+      return if parts.nil?
+      parts.each do |part|
+        if part.option(:auto_extrude)
+          part.z = parent.calculated_h
         end
+        set_heights_for_auto_extrude(part.get_contents, part)
       end
+    end
+
+    def openscad(file)
+      set_heights_for_auto_extrude(get_contents)
+
+      @parts = get_contents
 
       JennCad::Exporters::OpenScad.new(self).save(file)
     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-alpha6"
 end
 

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"

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.alpha6
 platform: ruby
 authors:
 - Jennifer Glauche
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -42,16 +42,16 @@ dependencies:
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - Rakefile
 - bin/jenncad
 - examples/old/cube.rb
@@ -108,10 +109,16 @@ 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/features/stl_import.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 +126,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
@@ -147,7 +153,7 @@ homepage: ''
 licenses:
 - LGPL-3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,8 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: TBD
 test_files: []

data/lib/jenncad/primitives/aggregation.rb

@@ -1,12 +0,0 @@
-module JennCad::Primitives
-  class Aggregation < Primitive
-    attr_accessor :part
-
-    def initialize(name=nil, part=nil)
-      super({})
-      @name = name
-      @part = part
-    end
-
-  end
-end