jenncad 1.0.0.pre.alpha1 → 1.0.0.pre.alpha4

data/lib/jenncad/transformation/color.rb

@@ -4,5 +4,184 @@ module JennCad
     def initialize(args)
       @color = args
     end
+
+    def self.parse(a)
+      case a
+      when Array
+        check_color_array(a)
+      else
+        a
+      end
+    end
+
+    def self.check_color_array(a)
+      if a.max > 1.0
+        a.map{|l| l.to_f/255.0}
+      else
+        a
+      end
+    end
+
+    def self.random
+      named_colors.random
+    end
+
+    def self.named_colors
+      named_color_values.map{|k,v| k}
+    end
+
+    def self.named_color_values
+    {
+      aliceblue: [240,248,255,0],
+      antiquewhite: [250,235,215,0],
+      aqua: [0,255,255,0],
+      aquamarine: [127,255,212,0],
+      azure: [240,255,255,0],
+      beige: [245,245,220,0],
+      bisque: [255,228,196,0],
+      black: [0,0,0,0],
+      blanchedalmond: [255,235,205,0],
+      blue: [0,0,255,0],
+      blueviolet: [138,43,226,0],
+      brown: [165,42,42,0],
+      burlywood: [222,184,135,0],
+      cadetblue: [95,158,160,0],
+      chartreuse: [127,255,0,0],
+      chocolate: [210,105,30,0],
+      coral: [255,127,80,0],
+      cornflowerblue: [100,149,237,0],
+      cornsilk: [255,248,220,0],
+      crimson: [220,20,60,0],
+      cyan: [0,255,255,0],
+      darkblue: [0,0,139,0],
+      darkcyan: [0,139,139,0],
+      darkgoldenrod: [184,134,11,0],
+      darkgray: [169,169,169,0],
+      darkgreen: [0,100,0,0],
+      darkgrey: [169,169,169,0],
+      darkkhaki: [189,183,107,0],
+      darkmagenta: [139,0,139,0],
+      darkolivegreen: [85,107,47,0],
+      darkorange: [255,140,0,0],
+      darkorchid: [153,50,204,0],
+      darkred: [139,0,0,0],
+      darksalmon: [233,150,122,0],
+      darkseagreen: [143,188,143,0],
+      darkslateblue: [72,61,139,0],
+      darkslategray: [47,79,79,0],
+      darkslategrey: [47,79,79,0],
+      darkturquoise: [0,206,209,0],
+      darkviolet: [148,0,211,0],
+      deeppink: [255,20,147,0],
+      deepskyblue: [0,191,255,0],
+      dimgray: [105,105,105,0],
+      dimgrey: [105,105,105,0],
+      dodgerblue: [30,144,255,0],
+      firebrick: [178,34,34,0],
+      floralwhite: [255,250,240,0],
+      forestgreen: [34,139,34,0],
+      fuchsia: [255,0,255,0],
+      gainsboro: [220,220,220,0],
+      ghostwhite: [248,248,255,0],
+      gold: [255,215,0,0],
+      goldenrod: [218,165,32,0],
+      gray: [128,128,128,0],
+      green: [0,128,0,0],
+      greenyellow: [173,255,47,0],
+      grey: [128,128,128,0],
+      honeydew: [240,255,240,0],
+      hotpink: [255,105,180,0],
+      indianred: [205,92,92,0],
+      indigo: [75,0,130,0],
+      ivory: [255,255,240,0],
+      khaki: [240,230,140,0],
+      lavender: [230,230,250,0],
+      lavenderblush: [255,240,245,0],
+      lawngreen: [124,252,0,0],
+      lemonchiffon: [255,250,205,0],
+      lightblue: [173,216,230,0],
+      lightcoral: [240,128,128,0],
+      lightcyan: [224,255,255,0],
+      lightgoldenrodyellow: [250,250,210,0],
+      lightgray: [211,211,211,0],
+      lightgreen: [144,238,144,0],
+      lightgrey: [211,211,211,0],
+      lightpink: [255,182,193,0],
+      lightsalmon: [255,160,122,0],
+      lightseagreen: [32,178,170,0],
+      lightskyblue: [135,206,250,0],
+      lightslategray: [119,136,153,0],
+      lightslategrey: [119,136,153,0],
+      lightsteelblue: [176,196,222,0],
+      lightyellow: [255,255,224,0],
+      lime: [0,255,0,0],
+      limegreen: [50,205,50,0],
+      linen: [250,240,230,0],
+      magenta: [255,0,255,0],
+      maroon: [128,0,0,0],
+      mediumaquamarine: [102,205,170,0],
+      mediumblue: [0,0,205,0],
+      mediumorchid: [186,85,211,0],
+      mediumpurple: [147,112,219,0],
+      mediumseagreen: [60,179,113,0],
+      mediumslateblue: [123,104,238,0],
+      mediumspringgreen: [0,250,154,0],
+      mediumturquoise: [72,209,204,0],
+      mediumvioletred: [199,21,133,0],
+      midnightblue: [25,25,112,0],
+      mintcream: [245,255,250,0],
+      mistyrose: [255,228,225,0],
+      moccasin: [255,228,181,0],
+      navajowhite: [255,222,173,0],
+      navy: [0,0,128,0],
+      oldlace: [253,245,230,0],
+      olive: [128,128,0,0],
+      olivedrab: [107,142,35,0],
+      orange: [255,165,0,0],
+      orangered: [255,69,0,0],
+      orchid: [218,112,214,0],
+      palegoldenrod: [238,232,170,0],
+      palegreen: [152,251,152,0],
+      paleturquoise: [175,238,238,0],
+      palevioletred: [219,112,147,0],
+      papayawhip: [255,239,213,0],
+      peachpuff: [255,218,185,0],
+      peru: [205,133,63,0],
+      pink: [255,192,203,0],
+      plum: [221,160,221,0],
+      powderblue: [176,224,230,0],
+      purple: [128,0,128,0],
+      rebeccapurple: [102,51,153,0],
+      red: [255,0,0,0],
+      rosybrown: [188,143,143,0],
+      royalblue: [65,105,225,0],
+      saddlebrown: [139,69,19,0],
+      salmon: [250,128,114,0],
+      sandybrown: [244,164,96,0],
+      seagreen: [46,139,87,0],
+      seashell: [255,245,238,0],
+      sienna: [160,82,45,0],
+      silver: [192,192,192,0],
+      skyblue: [135,206,235,0],
+      slateblue: [106,90,205,0],
+      slategray: [112,128,144,0],
+      slategrey: [112,128,144,0],
+      snow: [255,250,250,0],
+      springgreen: [0,255,127,0],
+      steelblue: [70,130,180,0],
+      tan: [210,180,140,0],
+      teal: [0,128,128,0],
+      thistle: [216,191,216,0],
+      tomato: [255,99,71,0],
+      turquoise: [64,224,208,0],
+      violet: [238,130,238,0],
+      wheat: [245,222,179,0],
+      white: [255,255,255,0],
+      whitesmoke: [245,245,245,0],
+      yellow: [255,255,0,0],
+      yellowgreen: [154,205,50,0],
+      transparent: [0,0,0,0],
+    }
+    end
   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-alpha1"
+  VERSION = "1.0.0-alpha4"
 end
 

data/lib/jenncad.rb

@@ -20,30 +20,8 @@ require "jenncad/part"
 require "jenncad/project"
 require "jenncad/commands"
 
-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"
-require "jenncad/primitives/cube"
-require "jenncad/primitives/rounded_cube"
-require "jenncad/primitives/polygon"
-require "jenncad/primitives/slot"
-
-require "jenncad/primitives/boolean_object"
-require "jenncad/primitives/union_object"
-require "jenncad/primitives/subtract_object"
-require "jenncad/primitives/hull_object"
-require "jenncad/primitives/intersection_object"
-require "jenncad/primitives/projection"
-require "jenncad/primitives/linear_extrude"
-require "jenncad/primitives/rotate_extrude"
-
-
-
+require "jenncad/features"
+require "jenncad/primitives"
 
 
 require "jenncad/transformation/transformation"
@@ -55,9 +33,7 @@ require "jenncad/transformation/color"
 require "jenncad/transformation/multmatrix"
 
 
-
-
-
+# TODO: extras need be split from the package to external hardware lib
 require "jenncad/extras/hardware"
 require "jenncad/extras/din912"
 require "jenncad/extras/din933"
@@ -66,8 +42,7 @@ require "jenncad/extras/iso7380"
 
 
 
-
 require "jenncad/register"
 require "jenncad/shortcuts"
-require "jenncad/jenncad"
-require "jenncad/openscad"
+require "jenncad/exporters/openscad"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha1
+  version: 1.0.0.pre.alpha4
 platform: ruby
 authors:
 - Jennifer Glauche
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: observr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: TBD
 email:
 - "=^.^=@jenncad.kittenme.ws"
@@ -74,6 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - Rakefile
 - bin/jenncad
 - examples/old/cube.rb
@@ -88,16 +103,22 @@ files:
 - lib/jenncad.rb
 - lib/jenncad/commands.rb
 - lib/jenncad/default_profile.rb
+- lib/jenncad/exporters/openscad.rb
 - lib/jenncad/extras/din912.rb
 - lib/jenncad/extras/din933.rb
 - lib/jenncad/extras/din934.rb
 - lib/jenncad/extras/hardware.rb
 - lib/jenncad/extras/iso7380.rb
-- lib/jenncad/jenncad.rb
-- lib/jenncad/openscad.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/aggregation.rb
+- lib/jenncad/primitives.rb
 - lib/jenncad/primitives/boolean_object.rb
 - lib/jenncad/primitives/circle.rb
 - lib/jenncad/primitives/cube.rb
@@ -105,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
@@ -133,7 +153,7 @@ homepage: ''
 licenses:
 - LGPL-3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,15 +161,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !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/jenncad.rb

@@ -1,3 +0,0 @@
-module JennCad
-  include Primitives
-end

data/lib/jenncad/openscad.rb

@@ -1,274 +0,0 @@
-module JennCad
-
-  class OpenScad
-    def initialize(part, fn=64)
-      @imports = []
-      @modules = {}
-      part = part.make_openscad_compatible
-      @main = root(part, "$fn=#{fn};\n")
-
-      @export = ""
-      @imports.uniq.each do |val|
-        @export += "use <#{val}.scad>\n"
-      end
-      @modules.each do |key, val|
-        @export += val
-      end
-      @export += @main
-    end
-
-    def save(file)
-      File.open(file,"w") do |f|
-        f.puts @export
-      end
-    end
-
-    def root(part, head="", tabindex=0)
-      res = head
-
-      res += transform(part) do
-        parse(part, tabindex)
-      end
-      res
-    end
-
-    def transform(part, &block)
-      res += handle_color(part)
-      if part.transformations
-        part.transformations.reverse.each do |trans|
-          res += transformation(trans)
-        end
-      end
-      res += block.yield
-    end
-
-    def print_tree(part, level=0)
-      arr = []
-      arr << parse(part) unless level == 0
-      if part.respond_to?(:parts)
-        part.parts.each do |p|
-          arr << print_tree(p,level+1)
-        end
-      end
-      arr
-    end
-
-
-    def parse(part, tabindex=0)
-      case part
-      when JennCad::OpenScadImport
-        handle_import(part)
-      when JennCad::Aggregation
-        handle_aggregation(part)
-      when JennCad::UnionObject
-        cmd('union', nil, part.parts, tabindex)
-      when JennCad::SubtractObject
-        part.analyze_z_fighting
-        cmd('difference', nil, part.parts, tabindex)
-      when JennCad::IntersectionObject
-        cmd('intersection', nil, part.parts, tabindex)
-      when JennCad::HullObject
-        cmd('hull', nil, part.parts, tabindex)
-      when JennCad::Primitives::Circle
-        cmd('circle', collect_params(part), nil, tabindex)
-      when JennCad::Primitives::Cylinder
-        cmd('cylinder', collect_params(part), nil, tabindex)
-      when JennCad::Primitives::Sphere
-        cmd('sphere', collect_params(part), nil, tabindex)
-      when JennCad::Primitives::Cube
-        handle_cube(part, tabindex)
-      when JennCad::Primitives::LinearExtrude
-        cmd('linear_extrude', part.openscad_params, part.parts, tabindex)
-      when JennCad::Primitives::RotateExtrude
-        cmd('rotate_extrude', part.openscad_params, part.parts, tabindex)
-      when JennCad::Primitives::Projection
-        cmd('projection', collect_params(part), part.parts, tabindex)
-      when JennCad::Primitives::Polygon
-        cmd('polygon', collect_params(part), nil, tabindex)
-      else
-        if part.respond_to?(:parts) && part.parts != nil && !part.parts.empty?
-          res = ""
-          part.parts.each do |p|
-              res += root(p, "", tabindex)
-            end
-          return res
-        elsif part.respond_to?(:part)
-          return root(part.part, "", tabindex)
-        end
-        puts "no idea what to do with #{part.inspect}"
-        return ""
-      end
-    end
-
-    def fmt_params(args)
-      return "" if args == nil
-      if args.kind_of? String
-        return "\"#{args}\""
-      elsif args.kind_of? Array
-        return args.map do |l|
-          if l == nil
-            0
-          elsif l.kind_of? Array
-            l # skipping check of 2-dmin Arrays for now (used in multmatrix)
-          elsif l.to_i == l.to_f
-            l.to_i
-          else
-            l.to_f
-          end
-        end
-      else
-        res = []
-        args.each do |k,v|
-          if k.to_s == "fn"
-            k = "$fn"
-          end
-          if v == nil
-            next
-          end
-          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}"
-        end
-        res.join(",")
-      end
-    end
-
-    def cmd(name, args, items, tabindex = 0)
-      items ||= []
-      res = cmd_call(name,args)
-      if items.size > 1
-        res << "\n"
-        res << tabs(tabindex) { "{\n" }
-        items.each do |item|
-          res << tabs(tabindex+1) do
-            transform(item) do
-              parse(item, tabindex+1)
-            end
-          end
-        end
-        res << tabs(tabindex) { "}\n" }
-      elsif items.size == 1
-        item = items.first
-        res << transform(item) do
-          parse(item, tabindex)
-        end
-        res << ";\n"
-      else
-        res << ";\n"
-      end
-      return res
-    end
-
-    def tabs(i, &block)
-      "  " * i + block.yield
-    end
-
-    def handle_import(part, tabindex=0)
-      @imports << part.import
-      return tabs(tabindex){ "#{part.name}(#{fmt_params(part.args)});\n" }
-    end
-
-    def handle_aggregation(part, tabindex=0)
-      register_module(part) unless @modules[part.name]
-      use_module(part.name, tabindex)
-    end
-
-    # check children for color values
-      # if none of the children has a color value, we can apply color to this object and all children
-    # if any of the children (excluding children of the kind of BooleanObject) has a color value (that is different from ours), we will apply a fallback color to all children that do not have a color value themselves.
-
-    def handle_color(part)
-      if part && part.respond_to?(:color) && part.color
-        if part.respond_to?(:parts)
-          if part.children_list(JennCad::Aggregation).map{|l| l.color != nil && l.color != part.color}.include?(true)
-            part.children_list(JennCad::Aggregation).each do |child|
-              if child.color == nil && child.color != part.color && !child.kind_of?(BooleanObject)
-                child.set_option :fallback_color, part.color
-              end
-            end
-            return ""
-          end
-        end
-      end
-      return apply_color(part)
-    end
-
-    def apply_color(part)
-      if part && part.respond_to?(:color_or_fallback)
-        color = part.color_or_fallback
-        return "" if color == nil
-        # Allowing color to be string, OpenScad compatible RGBA values of 0..1 or RGBA values of 0..255
-        if color.kind_of?(Array) && color.map{|l| l.to_f > 1.0 ? true : false}.include?(true)
-          color = color.map{|l| l.to_f/255.0}
-        end
-        return cmd_call("color", color)
-      end
-      return ""
-    end
-
-    def register_module(part)
-      # can only accept aggregation
-      @modules[part.name] = "module #{part.name}(){\n"
-      @modules[part.name] += root(part.part)
-      @modules[part.name] += "}\n"
-    end
-
-    def use_module(name, tabindex)
-      tabs(tabindex){ cmd_call(name, nil).to_s+";" }
-    end
-
-    def cmd_call(name, args)
-      args = fmt_params(args)
-      return "#{name}(#{args})"
-    end
-
-    def collect_params(part)
-      res = {}
-      [:d, :r, :h, :r1, :r2, :d1, :d2, :size, :fn, :points].each do |var|
-        if part.respond_to? var
-          res[var] = part.send var
-        end
-      end
-      res
-    end
-
-    def transformation(trans)
-      case trans
-      when JennCad::Move
-        cmd_call("translate",trans.coordinates)
-      when JennCad::Rotate
-        cmd_call("rotate",trans.coordinates)
-      when JennCad::Mirror
-        cmd_call("mirror",trans.coordinates)
-      when JennCad::Multmatrix
-        cmd_call("multmatrix",trans.m)
-      else
-        puts "[openscad exporter] Unkown transformation #{trans.class}"
-        ""
-      end
-    end
-
-    # cubes are now centered in xy by default in jenncad
-    # TODO: should this not be to_openscad in Cube?
-    def handle_cube(part, tabindex)
-      res = ""
-      if part.option(:center)
-        res += transformation(Move.new(x: -part.x/2.0, y: -part.y/2.0))
-      else
-        if part.option(:center_x)
-          res += transformation(Move.new(x: -part.x/2.0))
-        end
-        if part.option(:center_y)
-          res += transformation(Move.new(y: -part.y/2.0))
-        end
-        if part.option(:center_z)
-          res += transformation(Move.new(z: -part.z/2.0))
-        end
-      end
-
-      res += cmd('cube', collect_params(part), nil)
-    end
-
-  end
-end

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