oozby 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5177ab35c7d24ad1b6a50713c41912560b74bbbe
-  data.tar.gz: 6014ba727a5b5d57a4db87df03f60f7af22ece0b
+  metadata.gz: a23a382871587b9a004386c00f558f07dbe317af
+  data.tar.gz: b287f6a6be40890def253994c9413f5ba3140bad
 SHA512:
-  metadata.gz: be77bb1f4e7cd3535b7a98b5172cb24b2c6ba34715bf4b8b9b16b1d760a16f15715e4f5369e8588589425106ac741cf2d1f3daf031fce47938bbe7cffeabfd31
-  data.tar.gz: 2c29b656400ec92ea95a8835585960f7edec297ada0aadb2d21d9ca61513ccb40cbc74c47e138dfe3fcc4725b726813c5323702249ebdbfc6398682de971358d
+  metadata.gz: e202ef9d0b2a7d76bf7cf885df73911e8f86f8240c6705760cccd86f34811db7ad80ae3c543b5e02145180b7fcfc888e6b3c0102cfcfd49e6f42435a312e9748
+  data.tar.gz: 52a53ae63fe96411d3b1783db58466db03e83f3d5b17c6f5819d94ec7c356e4ca0e2afc49f07a3dc093f7f87c82d83958484d87658a90192cc27d8c127b95779

data/bin/oozby

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 $:.unshift File.dirname(__FILE__) + "/../lib"
 require 'thor'
-#require 'fssm'
 require 'listen'
 require 'pp'
 require 'oozby'
@@ -47,6 +46,7 @@ class OozbyUtility < Thor
           compile File.join(*args)
         end
         
+        puts "Watching folder for changes... (CTRL+C to exit)"
         Listen.to! directory, filter: /\.oozby$/ do |modified, added, removed|
           modified.each { |path| recompile_handler[path] }
           added.each { |path| recompile_handler[path] }
@@ -58,20 +58,11 @@ class OozbyUtility < Thor
             end
           end
         end
-        
-        # FSSM.monitor(directory, File.join('**', '*.oozby')) do
-        #   create &recompile_handler
-        #   update &recompile_handler
-        #   delete do |dir, name|
-        #     puts "#{name} deleted."
-        #     if File.exists? File.join(dir, name + ".scad")
-        #       File.delete(File.join(dir, name + ".scad"))
-        #       puts "Deleted generated .scad file for obsolete #{name}"
-        #     end
-        #   end
-        # end
       end
     end
+  rescue Interrupt => e
+    puts ""
+    puts "Have a nice day!"
   end
 end
 

data/lib/oozby/base.rb

@@ -12,7 +12,7 @@ class Oozby
     
     # rescue block to filter out junk oozby library stuff from backtraces
     begin
-      compiled = eval("lambda {; #{code}; }", nil, filename)
+      compiled = eval("lambda {; #{code};\n }", nil, filename)
       env.instance_exec(&compiled)
     rescue
       warn "Recent Calls: " + env.instance_variable_get(:@method_history).last(10).reverse.inspect

data/lib/oozby/environment.rb

@@ -122,6 +122,10 @@ class Oozby::Environment
   # gets and sets resolution settings
   def resolution **settings, &proc
     warn "Setting fragments_per_turn and degrees_per_fragment together makes no sense!" if settings[:fragments_per_turn] && settings[:degrees_per_fragment]
+    settings[:fragments_per_turn] ||= settings.delete(:facets_per_turn)
+    settings[:degrees_per_fragment] ||= settings.delete(:degrees_per_facet)
+    settings[:fragments] ||= settings.delete(:facets)
+    settings.delete_if { |key,value| value == nil }
     previous_settings = @resolution
     @resolution.merge! settings
     @resolution[:degrees_per_fragment] = 360.0 / settings[:fragments_per_turn].to_f if settings[:fragments_per_turn]

data/lib/oozby/method_preprocessor.rb

@@ -69,7 +69,7 @@ class Oozby::MethodPreprocessor
     
     if info.named_args[:r] && info.named_args[:r] > 0.0
       # render rounded rectangle
-      info.replace rounded_cube(**args_parse(info, :size, :center, :r))
+      info.replace rounded_cube(**args_parse(info, :size, :center))
     end
   end
   
@@ -82,6 +82,7 @@ class Oozby::MethodPreprocessor
     info.named_args[:r2] = info.named_args.delete(:radius_2) if info.named_args[:radius_2]
     
     info.named_args[:"$fn"] = info.named_args.delete(:facets) if info.named_args[:facets]
+    info.named_args[:"$fn"] = info.named_args.delete(:fragments) if info.named_args[:fragments]
     
     # let users specify diameter instead of radius - convert it
     {  diameter: :r,                    dia: :r,               d: :r,
@@ -124,26 +125,28 @@ class Oozby::MethodPreprocessor
     
     if info[:named_args][:r] and info.named_args[:r] > 0.0
       # render rounded rectangle
-      info.replace rounded_rect(**args_parse(info, :size, :center, :r))
+      info.replace rounded_rect(**args_parse(info, :size, :center).merge(facets: info.named_args["$fn"]))
     end
   end
   
-  def rounded_rect size: [1,1], center: false, r: 0.0
+  def rounded_rect size: [1,1], center: false, r: 0.0, facets: nil
     diameter = r * 2
     circle_x = (size[0] / 2.0) - r
     circle_y = (size[1] / 2.0) - r
     
     capture do
-      translate(if center then [0,0] else [size[0].to_f / 2.0, size[1].to_f / 2.0] end) do
-        union do
-          square([size[0], size[1] - diameter], center = true)
-          square([size[0] - diameter, size[1]], center = true)
-          preprocessor true do
-            resolution(fragments: (_fragments_for(radius: r).to_f / 4.0).round * 4.0) do
-              translate([ circle_x,  circle_y]) { circle(r: r) }
-              translate([ circle_x, -circle_y]) { circle(r: r) }
-              translate([-circle_x, -circle_y]) { circle(r: r) }
-              translate([-circle_x,  circle_y]) { circle(r: r) }
+      resolution(fragments: (facets || 0)) do
+        translate(if center then [0,0] else [size[0].to_f / 2.0, size[1].to_f / 2.0] end) do
+          union do
+            square([size[0], size[1] - diameter], center = true)
+            square([size[0] - diameter, size[1]], center = true)
+            preprocessor true do
+              resolution(fragments: (_fragments_for(radius: r).to_f / 4.0).round * 4.0) do
+                translate([ circle_x,  circle_y]) { circle(r: r) }
+                translate([ circle_x, -circle_y]) { circle(r: r) }
+                translate([-circle_x, -circle_y]) { circle(r: r) }
+                translate([-circle_x,  circle_y]) { circle(r: r) }
+              end
             end
           end
         end
@@ -151,44 +154,46 @@ class Oozby::MethodPreprocessor
     end
   end
   
-  def rounded_cube size: [1,1,1], center: false, r: 0.0
+  def rounded_cube size: [1,1,1], center: false, r: 0.0, facets: nil
     size = [size[0] || 1, size[1] || 1, size[2] || 1]
     diameter = r.to_f * 2.0
     
     preprocessor = self
     # use rounded rect to create the body shape
     capture do
-      offset = if center then [0,0,0] else [size[0].to_f / 2.0, size[1].to_f / 2.0, size[2].to_f / 2.0] end
-      translate(offset) do
-        # extrude the main body parts using rounded_rect as the basis
-        linear_extrude(height: size[2] - diameter, center: true) {
-          inject_abstract_tree(preprocessor.rounded_rect(size: [size[0], size[1]], center: true, r: r)) }
-        rotate([90,0,0]) { linear_extrude(height: size[1] - diameter, center: true) {
-          inject_abstract_tree(preprocessor.rounded_rect(size: [size[0], size[2]], center: true, r: r)) }}
-        rotate([0,90,0]) { linear_extrude(height: size[0] - diameter, center: true) {
-          inject_abstract_tree(preprocessor.rounded_rect(size: [size[2], size[1]], center: true, r: r)) }}
+      resolution(fragments: (facets || 0)) do
+        offset = if center then [0,0,0] else [size[0].to_f / 2.0, size[1].to_f / 2.0, size[2].to_f / 2.0] end
+        translate(offset) do
+          # extrude the main body parts using rounded_rect as the basis
+          linear_extrude(height: size[2] - diameter, center: true) {
+            inject_abstract_tree(preprocessor.rounded_rect(size: [size[0], size[1]], center: true, r: r)) }
+          rotate([90,0,0]) { linear_extrude(height: size[1] - diameter, center: true) {
+            inject_abstract_tree(preprocessor.rounded_rect(size: [size[0], size[2]], center: true, r: r)) }}
+          rotate([0,90,0]) { linear_extrude(height: size[0] - diameter, center: true) {
+            inject_abstract_tree(preprocessor.rounded_rect(size: [size[2], size[1]], center: true, r: r)) }}
         
-        # fill in the corners with spheres
-        xr, yr, zr = size.map { |x| (x / 2) - r }
-        corner_coordinates = [
-          [ xr, yr, zr],
-          [ xr, yr,-zr],
-          [ xr,-yr, zr],
-          [ xr,-yr,-zr],
-          [-xr, yr, zr],
-          [-xr, yr,-zr],
-          [-xr,-yr, zr],
-          [-xr,-yr,-zr]
-        ]
-        preprocessor true do
-          resolution(fragments: (_fragments_for(radius: r).to_f / 4.0).round * 4.0) do
-            corner_coordinates.each do |coordinate|
-              translate(coordinate) do
-                # generate sphere shape
-                rotate_extrude do
-                  intersection do
-                    circle(r: r)
-                    translate([r, 0, 0]) { square([r * 2, r * 4], center: true) }
+          # fill in the corners with spheres
+          xr, yr, zr = size.map { |x| (x / 2) - r }
+          corner_coordinates = [
+            [ xr, yr, zr],
+            [ xr, yr,-zr],
+            [ xr,-yr, zr],
+            [ xr,-yr,-zr],
+            [-xr, yr, zr],
+            [-xr, yr,-zr],
+            [-xr,-yr, zr],
+            [-xr,-yr,-zr]
+          ]
+          preprocessor true do
+            resolution(fragments: (_fragments_for(radius: r).to_f / 4.0).round * 4.0) do
+              corner_coordinates.each do |coordinate|
+                translate(coordinate) do
+                  # generate sphere shape
+                  rotate_extrude do
+                    intersection do
+                      circle(r: r)
+                      translate([r, 0, 0]) { square([r * 2, r * 4], center: true) }
+                    end
                   end
                 end
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oozby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Bluebie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen