crystalscad 0.2.3 → 0.2.4

data/crystalscad.gemspec

@@ -12,7 +12,8 @@ Gem::Specification.new do |gem|
   gem.homepage    = "http://github.com/Joaz/CrystalScad"
   gem.summary     = %q{Generate OpenSCAD scripts with ruby}
   gem.description = %q{Inspired by SolidPython, based on RubyScad}
-
+		
+	gem.license 		= 'GPL-3'
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/lib/crystalscad/Assembly.rb

@@ -0,0 +1,55 @@
+module CrystalScad
+	class Assembly
+	  def initialize(args={})
+	    @args = args if @args == nil
+      @@bom.add(description) unless args[:no_bom] == true
+	  end
+	  
+	  def description
+	    "No description set for Class #{self.class.to_s}"
+	  end
+	  
+	  def show
+	    ScadObject.new
+	  end
+	  
+	  def output
+	    show
+	  end
+	  
+	  def walk_tree
+	    return output.walk_tree
+	  end
+	  
+	  def +(args)
+	    return self.output+args
+	  end
+
+	  def -(args)
+	    return self.output-args
+	  end
+
+	  def *(args)
+	    return self.output*args
+	  end
+	  
+	  def translate(args)
+	    return self.output.translate(args)
+	  end 
+
+	  def mirror(args)
+	    return self.output.mirror(args)
+	  end 
+
+	  def rotate(args)
+	    return self.output.rotate(args)
+	  end 
+
+	  def scad_output()
+	    return self.output.scad_output
+	  end 
+
+
+	end
+end
+

data/lib/crystalscad/CrystalScad.rb

@@ -19,10 +19,12 @@ require "rubyscad"
 module CrystalScad 
 	include CrystalScad::BillOfMaterial
 	include CrystalScad::Hardware
-
+	include CrystalScad::LinearBearing
+	
+	
 	class ScadObject
 		attr_accessor :args		
-  	attr_accessor :transformations
+    attr_accessor :transformations
 		def initialize(*args)
 			@transformations = []
 			@args = args.flatten
@@ -41,7 +43,7 @@ module CrystalScad
 			res += self.to_rubyscad.to_s+ "\n"
 			res
 		end
-		alias :output :walk_tree		
+		alias :scad_output :walk_tree		
 		
 		def to_rubyscad
 			""
@@ -52,6 +54,11 @@ module CrystalScad
 	class Primitive < ScadObject
 
 		def rotate(args)
+		  # always make sure we have a z parameter; otherwise RubyScad will produce a 2-dimensional output
+		  # which can result in openscad weirdness
+		  if args[:z] == nil
+		    args[:z] = 0
+		  end
 			@transformations << Rotate.new(args)	
 			self
 		end
@@ -66,6 +73,11 @@ module CrystalScad
 			self			
 		end
 
+		def mirror(args)
+			@transformations << Mirror.new(args)		
+			self			
+		end
+
   end
 
 	class TransformedObject < Primitive
@@ -96,7 +108,14 @@ module CrystalScad
 			return RubyScadBridge.new.translate(@args)		
 		end	
 	end
-
+	
+ 	class Mirror < Transformation
+		def to_rubyscad
+			return RubyScadBridge.new.mirror(@args)		
+		end	
+	end
+	
+	
 	class Cylinder < Primitive
 		def to_rubyscad	
 			return RubyScadBridge.new.cylinder(@args)		
@@ -108,6 +127,14 @@ module CrystalScad
 	end
 	
 	class Cube < Primitive
+	  attr_accessor :x,:y,:z
+	  
+	  def initialize(*args)
+	    super(args)
+	    @x,@y,@z = args[0][:size].map{|l| l.to_f}
+    
+	  end
+	
 		def to_rubyscad
 			return RubyScadBridge.new.cube(@args)		
 		end	
@@ -166,11 +193,9 @@ module CrystalScad
 		def format_block(output_str)
 			return output_str
 		end
-
-
 	end
 
-	
+  	
 	def csg_operation(operation, code1, code2)
 		ret = "#{operation}(){"
 		ret +=code1
@@ -180,20 +205,27 @@ module CrystalScad
 	end
 
 	def +(args)	
+		return args	 if self == nil		
 		csg_operation("union",self.walk_tree,args.walk_tree)
 	end
 
 	def -(args)
+		return args	 if self == nil		
 		csg_operation("difference",self.walk_tree,args.walk_tree)		
 	end
 	
 	def *(args)
+		return args	 if self == nil		
 		csg_operation("intersection",self.walk_tree,args.walk_tree)		
 	end
 	
+	def hull(part1,part2)
+	  csg_operation("hull",part1.walk_tree,part2.walk_tree)		  
+	end
+	
 	# Fixme: currently just accepting named colors
 	def color(args)
-		ret = "color(\"#{args}\"){"
+	  ret = "color(\"#{args}\"){"
 		ret +=self.walk_tree
 		ret +="}"
 		return TransformedObject.new(ret)		

data/lib/crystalscad/Hardware.rb

@@ -13,53 +13,107 @@
 #    You should have received a copy of the GNU General Public License
 #    along with CrystalScad.  If not, see <http://www.gnu.org/licenses/>.
 
-module CrystalScad::Hardware
+module CrystalScad::Hardware 
+
+	class Bolt	< CrystalScad::Assembly
+		def initialize(size,length,args={})
+			@args = args
+			@args[:type] ||= "912"
+			@args[:material] ||= "8.8"
+			@args[:surface] ||= "zinc plated"
+			# options for output only:	
+			@args[:additional_length] ||= 0
+			@args[:additional_diameter] ||= 0.2 
 
-	class Bolt	
-		def initialize(size,length, type="912", material="8.8", surface="zinc plated")
 			@size = size
 			@length = length
-			@type = type
-			@material = material
-			@surface = surface
+
 
 			@@bom.add(description)
 		end
 
 		def description
-			"M#{@size}x#{@length} Bolt, DIN #{@type}, #{@material} #{@surface}"
+			"M#{@size}x#{@length} Bolt, DIN #{@args[:type]}, #{@args[:material]} #{@args[:surface]}"
 		end
 
 		def output
-			return bolt_912
+			return bolt_912(@args[:additional_length],@args[:additional_diameter])
+		end
+
+		def show
+			return bolt_912(0,0)
 		end
 
 		# currently only din912	
-		def bolt_912(addtional_size=0.2)
+		def bolt_912(additional_length=0, addtional_diameter=0)
 			
 	
-			chart_din912 = {3 => {head_dia:5.5,head_length:3,thread_length:18},
+			chart_din912 = {2 => {head_dia:3.8,head_length:2,thread_length:16},
+              			  2.5=> {head_dia:4.5,head_length:2.5,thread_length:17},
+			                3 => {head_dia:5.5,head_length:3,thread_length:18},
 											4 => {head_dia:7.0,head_length:4,thread_length:20},
 											5 => {head_dia:8.5,head_length:5,thread_length:22},
-											8	=> {head_dia:13,head_length:8,thread_length:28}
+											6	=> {head_dia:10,head_length:6,thread_length:24},
+											8	=> {head_dia:13,head_length:8,thread_length:28},
+	  									10=> {head_dia:16,head_length:10,thread_length:32},
+	  									12=> {head_dia:18,head_length:12,thread_length:36},
+	  									14=> {head_dia:21,head_length:14,thread_length:40},
+	  									16=> {head_dia:24,head_length:16,thread_length:44},
+	  									18=> {head_dia:27,head_length:18,thread_length:48},
+	  									20=> {head_dia:30,head_length:20,thread_length:52},
+	  									22=> {head_dia:33,head_length:22,thread_length:56},
+	  									24=> {head_dia:36,head_length:24,thread_length:60},
+	  									30=> {head_dia:45,head_length:30,thread_length:72},
+	  									36=> {head_dia:54,head_length:36,thread_length:84},
+										
+										
 										 }
 
 			res = cylinder(d:chart_din912[@size][:head_dia],h:chart_din912[@size][:head_length]).translate(z:-chart_din912[@size][:head_length]).color("Gainsboro") 
 			
+			total_length = @length + additional_length
 			thread_length=chart_din912[@size][:thread_length]		
-	    if @length.to_i <= thread_length
-				res+= cylinder(d:@size+addtional_size, h:@length).color("DarkGray")
+	    if total_length.to_f <= thread_length
+				res+= cylinder(d:@size+addtional_diameter, h:total_length).color("DarkGray")
 			else
-				res+= cylinder(d:@size+addtional_size, h:@length-thread_length).color("Gainsboro")
-				res+= cylinder(d:@size+addtional_size, h:thread_length).translate(z:@length-thread_length).color("DarkGray")		
+				res+= cylinder(d:@size+addtional_diameter, h:total_length-thread_length).color("Gainsboro")
+				res+= cylinder(d:@size+addtional_diameter, h:thread_length).translate(z:total_length-thread_length).color("DarkGray")		
 			end				
 			res
 		end
 				
 	end
+	
+	class Washer	< CrystalScad::Assembly
+		def initialize(size,args={})
+			@args=args			
+			@size = size
+			@args[:type] ||= "125"
+			@args[:material] ||= "steel"
+			@args[:surface] ||= "zinc plated"			
+
+			@chart_din125 = { 3.2 => {outer_diameter:7, height:0.5},
+ 											  4.3 => {outer_diameter:9, height:0.8},
+												5.3 => {outer_diameter:10, height:1.0},
+
+											}
+
+			super(args)		
+		end
 
+		def description
+			"Washer #{@args[:size]}, Material #{@args[:material]} #{@args[:surface]}"
+		end
+		
+		def show
+			washer = cylinder(d:@chart_din125[@size][:outer_diameter].to_f,h:@chart_din125[@size][:height].to_f)
+			washer-= cylinder(d:@size,h:@chart_din125[@size][:outer_diameter].to_f+0.2).translate(z:-0.1)
+			washer.color("Gainsboro")
+		end
+
+	end
 
-	class Nut
+	class Nut < CrystalScad::Assembly
 		attr_accessor :height
 		def initialize(size,args={})
 			@size = size
@@ -108,7 +162,7 @@ module CrystalScad::Hardware
 	end
 
 
-	class TSlot
+	class TSlot < CrystalScad::Assembly
 		# the code in this class is based on code by Nathan Zadoks 	
 		# taken from https://github.com/nathan7/scadlib
 		# Ported to CrystalScad by Joachim Glauche
@@ -128,13 +182,15 @@ module CrystalScad::Hardware
 			if length != nil
 				@args[:length] = length
 			end
-			@@bom.add(bom_string,1) unless @@bom == nil
+			@@bom.add(description) unless args[:no_bom] == true
 
 			return TransformedObject.new(single_profile.output)	 if @args[:configuration] == 1 		
 			return TransformedObject.new(multi_profile.output)	 				
 		end
+		
+    alias :show :output
 
-		def bom_string
+		def description
 			"T-Slot #{@args[:size]}x#{@args[:size]*@args[:configuration]}, length #{@args[:length]}mm"
 		end
 
@@ -151,7 +207,7 @@ module CrystalScad::Hardware
 			profile-=circle(r:gap/2,center:true);
 			profile=profile.translate(x:size/2,y:size/2);
 		
-			return profile.linear_extrude(height:@args[:length])		
+			return profile.linear_extrude(height:@args[:length],convexity:2)		
 		end
 
 		def multi_profile
@@ -175,12 +231,12 @@ module CrystalScad::Hardware
 
 		alias tslot_output output
 
-		def output(length)
+		def output(length=nil)
 			tslot_output(length)-bolts		
 		end
 
-		def show
-			output+bolts
+		def show(length=nil)
+			output(length)+bolts
 		end
 
 		def bolts
@@ -202,7 +258,7 @@ module CrystalScad::Hardware
 			bolt
 		end
 
-		def bom_string
+		def description
 			str = "T-Slot #{@args[:size]}x#{@args[:size]*@args[:configuration]}, length #{@args[:length]}mm"
 			if @args[:holes] != nil
 				str << " with holes for M#{@args[:bolt_size]} on "+ @args[:holes].split(",").join(' and ')

data/lib/crystalscad/LinearBearing.rb

@@ -0,0 +1,76 @@
+#    This file is part of CrystalScad.
+#
+#    CrystalScad is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    CrystalScad is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with CrystalScad.  If not, see <http://www.gnu.org/licenses/>.
+
+module CrystalScad::LinearBearing
+
+  class Lm_uu < CrystalScad::Assembly
+          
+    def initialize(args={inner_diameter:10})    
+      @args = args
+      @lm_uu = {
+              3  => {diameter:7, length:10},
+              4  => {diameter:8, length:12},
+              5  => {diameter:10, length:15},
+              6  => {diameter:12, length:19},
+              8  => {diameter:15, length:24},
+              10 => {diameter:19, length:29},
+              12 => {diameter:21, length:30},
+              13 => {diameter:23, length:32},
+              16 => {diameter:28, length:37},
+              20 => {diameter:32, length:42},
+              25 => {diameter:40, length:59},
+              30 => {diameter:45, length:64},
+              35 => {diameter:52, length:70},
+              40 => {diameter:60, length:80},
+              50 => {diameter:80, length:100},
+              60 => {diameter:90, length:110},
+        
+      }
+      @shell_thickness = 1.1
+      @@bom.add(description) unless args[:no_bom] == true
+    end
+   
+    def description
+			"LM#{@args[:inner_diameter]}UU Linear bearing"
+		end
+    
+    def output
+      show
+    end
+    
+    def dimensions
+      diameter = @lm_uu[@args[:inner_diameter]][:diameter]
+      length = @lm_uu[@args[:inner_diameter]][:length]
+      return diameter, length    
+    end
+    
+    def show
+      diameter, length = dimensions
+      shell=cylinder(d:diameter, h:length)
+      shell-=cylinder(d:diameter-@shell_thickness*2, h:length+0.2).translate(z:-0.1)
+      shell=shell.color("LightGrey")
+      
+      inner = cylinder(d:diameter-@shell_thickness*2, h:length)
+      inner-= cylinder(d:@args[:inner_diameter], h:length+0.2).translate(z:-0.1)
+      inner=inner.color("DimGray")
+            
+      shell+inner
+      
+    end    
+    
+    
+  end    
+    
+end

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end
 

data/lib/crystalscad.rb

@@ -1,4 +1,7 @@
 require 'crystalscad/version'
 require 'crystalscad/BillOfMaterial'
+require 'crystalscad/Assembly'
 require 'crystalscad/Hardware'
+require 'crystalscad/LinearBearing'
 require 'crystalscad/CrystalScad'
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystalscad
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Joachim Glauche
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-08 00:00:00 Z
+date: 2013-09-13 00:00:00 Z
 dependencies: []
 
 description: Inspired by SolidPython, based on RubyScad
@@ -34,13 +34,15 @@ files:
 - Rakefile
 - crystalscad.gemspec
 - lib/crystalscad.rb
+- lib/crystalscad/Assembly.rb
 - lib/crystalscad/BillOfMaterial.rb
 - lib/crystalscad/CrystalScad.rb
 - lib/crystalscad/Hardware.rb
+- lib/crystalscad/LinearBearing.rb
 - lib/crystalscad/version.rb
 homepage: http://github.com/Joaz/CrystalScad
-licenses: []
-
+licenses: 
+- GPL-3
 post_install_message: 
 rdoc_options: []