jenncad 1.0.0.pre.alpha3 → 1.0.0.pre.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b2667c6121606bece58cc0edbb2d7c0e0f2454dc175b62c3749209c1eef266
-  data.tar.gz: d8dbc84a707b0767374830df107ebcb098b89591664f0f7062468404b0c512e2
+  metadata.gz: ea1fa04592f59d248c5801c3b645f16429bd7ae9f0b754aa467c8a401c89ec4b
+  data.tar.gz: 4df185f63b22b5945784cf820b4af937e4fbc660875f36093bbd5ebe9baa2aa9
 SHA512:
-  metadata.gz: e512b91a4c6355cfd1b516bc52e434b1670e5aae02b39d75581e423a6242a90b11257a4c4902e30db74de0d4c1693aa7608829393df45806ecf56fc3e409bce9
-  data.tar.gz: 26fad5ebe17ad65610283315c2c33d9d7842717b78ad8560029038238b18c88aa351667a395f24ef134cf3f9fce298fcb1528ca459c7aeebfe618d71a5186233
+  metadata.gz: '0809987ec1b33518b17402acb27b659da2dc7b97ee304d1549abd857ae4448e0342d6ee4523e8d2277d7ce765e1278f996af9882b5da91b71c93acec8bd9ffd9'
+  data.tar.gz: e412b05272163c37096d36a44d83ac3d3c5ae07089d7d8d7236c1c53a263c24742566b691efbb5a03c9148960cb7734eb2859bc279e450e34c131fda2ae85af5

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/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
@@ -239,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

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

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

@@ -3,6 +3,8 @@ 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

data/lib/jenncad/part.rb

@@ -3,10 +3,10 @@ module JennCad
   class Part < Thing
 
     def to_openscad #make_openscad_compatible
-      auto_color
+#      auto_color
       a = Aggregation.new(self.class.to_s, self.part) #make_openscad_compatible!(self.part))
       a.transformations = @transformations
-      a.color(color)
+      a.color(:auto)
       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/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/shortcuts.rb

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

data/lib/jenncad/thing.rb

@@ -251,38 +251,109 @@ module JennCad
       item
     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?(self.parts)
+            set_option :color, ac
+            set_option :auto_color, true
+          else
+            set_auto_color_for_children(ac, self.parts)
+          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

data/lib/jenncad/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha3
+  version: 1.0.0.pre.alpha4
 platform: ruby
 authors:
 - Jennifer Glauche
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-30 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -88,6 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - Rakefile
 - bin/jenncad
 - examples/old/cube.rb
@@ -114,6 +115,7 @@ files:
 - 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
@@ -151,7 +153,7 @@ homepage: ''
 licenses:
 - LGPL-3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,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: []