crystalscad 0.3.9 → 0.3.10

data/examples/threads2.rb

@@ -79,7 +79,6 @@ pos = male.threads_bottom.first.position_on(female.threads_top.first,rotation)
 res += female.show.rotate(rotation).mirror(z:1).translate(pos)
 
 
-
 rotation = {y:-90}
 pos = male.threads_left.first.position_on(female.threads_top.first,rotation)
 res += female.show.rotate(rotation).translate(pos)

data/lib/crystalscad/Hardware.rb

@@ -21,12 +21,16 @@ module CrystalScad::Hardware
 		def initialize(size,length,args={})
 			@args = args
 			@args[:type] ||= "912"
-			@args[:material] ||= "8.8"
+			@args[:material] ||= "steel 8.8"
 			@args[:surface] ||= "zinc plated"
 			# options for output only:	
 			@args[:additional_length] ||= 0
 			@args[:additional_diameter] ||= 0.3 
 
+			if @args[:washer] == true
+				@washer = Washer.new(size,{:material => @args[:material], :surface => @args[:surface]})
+			end
+
 			@size = size
 			@length = length
 			@transformations ||= []
@@ -51,8 +55,17 @@ module CrystalScad::Hardware
 
 		def show
 			add_to_bom
-			return transform(bolt_912(0,0)) if @args[:type] == "912"
-			return transform(bolt_7380(0,0)) if @args[:type] == "7380"
+			res = bolt_912(0,0) if @args[:type] == "912"
+			res = bolt_7380(0,0) if @args[:type] == "7380"
+			raise "unkown type #{args[:type]} for Bolt!" if res == nil
+			
+			if @washer
+				res += @washer.show
+				res = res.translate(z:-@washer.height)
+			end
+	
+		
+			transform(res)			
 		end 
 
 		def transform(obj)	
@@ -126,7 +139,7 @@ module CrystalScad::Hardware
 			@args=args			
 			@size = size
 			@args[:type] ||= "125"
-			@args[:material] ||= "steel"
+			@args[:material] ||= "steel 8.8"
 			@args[:surface] ||= "zinc plated"			
 	
 			@chart_din125 = { 3.2 => {outer_diameter:7, height:0.5},

data/lib/crystalscad/ScrewThreads.rb

@@ -143,7 +143,7 @@ module CrystalScad::ScrewThreads
 
 		ret = []
 		holes.each_with_index do |hole,i|
-			bolt = Bolt.new(hole.size,bolt_heights[i])
+			bolt = Bolt.new(hole.size,bolt_heights[i],washer:args[:washer])
 		  case face
 				when "top"
 					bolt.transformations << Rotate.new(x:180)	

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystalscad
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 3
-  - 9
-  version: 0.3.9
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - Joachim Glauche
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-17 00:00:00 +01:00
-default_executable: 
+date: 2014-01-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyscad
@@ -86,7 +85,6 @@ files:
 - skeleton_project/assemblies/example.rb
 - skeleton_project/observe.sh
 - skeleton_project/skeleton.rb
-has_rdoc: true
 homepage: http://github.com/Joaz/CrystalScad
 licenses: 
 - GPL-3
@@ -118,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: CrystalScad is a framework for programming OpenScad models in Ruby