crystalscad 0.3.4 → 0.3.5

data/lib/crystalscad/Assembly.rb

@@ -1,3 +1,18 @@
+#    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
 	class Assembly
 		attr_accessor :height

data/lib/crystalscad/BoltHoles.rb

@@ -0,0 +1,92 @@
+#    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::BoltHoles
+	class BoltHole
+		# I would name this Thread but that's already taken by something else
+
+		attr_accessor :x,:y,:z,:size, :depth
+
+		def initialize(args={})
+			@x = args[:x] || 0
+			@y = args[:y] || 0
+			@z = args[:z] || 0
+			@depth = args[:depth] 		
+			@size = args[:size]
+		end
+
+	end
+
+	def create_bolts(face,obj1,obj2,args={})
+		# make a obj1-=obj2 with bolts corresponding to the heigh tof obj1
+		
+		if face == nil or obj1 == nil or obj2 == nil
+			raise "usage: create_bolts(face,obj1,obj2,args={})  - args can include (obj1.)height and bolt_height"
+			return			
+		end			
+
+		# we need to know obj1 height (if not supplied by user)
+		height ||= args[:height]			
+		height ||= obj1.z rescue nil
+		height ||= obj1.height rescue nil
+		if height == nil
+			raise "the object we're substracting from doesn't have a height defined; please define manually"
+			return
+		end			
+		
+		# lets check if the obj2 responds to the bolt_holes_[face] method
+		
+		meth = "bolt_holes_#{face}"
+		
+		unless obj2.respond_to?(meth)
+			raise "The object you're trying to get bolts holes from doesn't supply any on the face '#{face}'. Please add a method #{meth} to this object"				
+			return
+		end
+		holes = obj2.send(meth)		
+		
+
+		# let the user either define bolt_heights as integer, array or none (will be guessed)
+		if args[:bolt_height].kind_of? Array
+			bolt_heights = args[:bolt_height]
+			if bolt_heights.size != holes.size
+				raise "object has #{holes.size} threads for bolts but you supplied #{bolt_heights.size}"
+				return
+			end
+		else			
+			bolt_heights = []
+			holes.each do |hole|
+				if args[:bolt_height]
+					bolt_heights << args[:bolt_height] 
+				else
+					bolt_heights << (height+hole.depth).floor
+				end
+			end
+		end
+
+		ret = []
+		holes.each_with_index do |hole,i|
+			bolt = Bolt.new(hole.size,bolt_heights[i])
+
+		  # FIXME: this all currently only works for "top"	
+			bolt.transformations << Rotate.new(x:180)	
+			bolt.transformations << Translate.new({x:hole.x,y:hole.y,z:hole.z+height})		
+
+			ret << bolt
+		end
+		
+		ret
+end	
+
+end

data/lib/crystalscad/CrystalScad.rb

@@ -21,6 +21,7 @@ module CrystalScad
 	include CrystalScad::Hardware
 	include CrystalScad::LinearBearing
 	include CrystalScad::Gears
+	include CrystalScad::BoltHoles
 
 	
 	class CrystalScadObject
@@ -267,12 +268,36 @@ module CrystalScad
 
 	def +(args)	
 		return args	 if self == nil		
-		Union.new(self,args)
+		if args.kind_of? Array
+			r = self			
+			args.each do |a|
+				if a.respond_to? :show
+					r = Union.new(r,a.show)	
+				else
+					r = Union.new(r,a)	
+				end
+			end
+			r
+		else
+			Union.new(self,args)
+		end		
 	end
 
 	def -(args)
 		return args	 if self == nil		
-		Difference.new(self,args)
+		if args.kind_of? Array
+			r = self			
+			args.each do |a|
+				if a.respond_to? :output
+					r = Difference.new(r,a.output)	
+				else
+					r = Difference.new(r,a)	
+				end
+			end
+			r
+		else
+			Difference.new(self,args)
+		end
 	end
 	
 	def *(args)

data/lib/crystalscad/Gears.rb

@@ -29,14 +29,11 @@ module CrystalScad::Gears
       @height = args[:height] || 3.0
 			@hub_dia = args[:hub_dia] || 0.0
 			@hub_height = args[:hub_height] || 0.0
+			@output_margin_dia = args[:output_margin_dia] || 2
+			@output_margin_height = args[:output_margin_height] || 1
     end 
     
     def show
-      output
-    end
-    
-    # very simple output
-    def output
       res = cylinder(d:@module*@teeth,h:@height)
 
 			if @hub_height.to_f > 0 && @hub_dia.to_f > 0
@@ -48,6 +45,15 @@ module CrystalScad::Gears
       end
       res.color("darkgray")
     end
+
+		def output
+			res = cylinder(d:@module*@teeth+@output_margin_dia,h:@height+@output_margin_height)
+			if @hub_height.to_f > 0 && @hub_dia.to_f > 0
+				res += cylinder(d:@hub_dia+@output_margin_dia,h:@hub_height+@output_margin_height).translate(z:@height+@output_margin_height)
+			end   
+
+			res   
+		end
     
     def distance_to(other_gear)
       if @module != other_gear.module

data/lib/crystalscad/Hardware.rb

@@ -16,6 +16,8 @@
 module CrystalScad::Hardware 
 
 	class Bolt	< CrystalScad::Assembly
+		attr_accessor :transformations
+
 		def initialize(size,length,args={})
 			@args = args
 			@args[:type] ||= "912"
@@ -27,7 +29,7 @@ module CrystalScad::Hardware
 
 			@size = size
 			@length = length
-
+			@transformations ||= []
 
 			@@bom.add(description)
 		end
@@ -44,14 +46,22 @@ module CrystalScad::Hardware
 		end
 
 		def output
-			return bolt_912(@args[:additional_length],@args[:additional_diameter]) if @args[:type] == "912"
-			return bolt_7380(@args[:additional_length],@args[:additional_diameter]) if @args[:type] == "7380"
+			return transform(bolt_912(@args[:additional_length],@args[:additional_diameter])) if @args[:type] == "912"
+			return transform(bolt_7380(@args[:additional_length],@args[:additional_diameter])) if @args[:type] == "7380"
 		end
 
 		def show
-			return bolt_912(0,0) if @args[:type] == "912"
-			return bolt_7380(0,0) if @args[:type] == "7380"
+			return transform(bolt_912(0,0)) if @args[:type] == "912"
+			return transform(bolt_7380(0,0)) if @args[:type] == "7380"
 		end 
+
+		def transform(obj)	
+			@transformations.each do |t|
+				obj.transformations << t
+			end
+			
+			return obj
+		end
   
     # ISO 7380
   	def bolt_7380(additional_length=0, addtional_diameter=0)

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end
 

data/lib/crystalscad.rb

@@ -4,5 +4,6 @@ require 'crystalscad/Assembly'
 require 'crystalscad/Hardware'
 require 'crystalscad/LinearBearing'
 require 'crystalscad/Gears'
+require 'crystalscad/BoltHoles'
 require 'crystalscad/CrystalScad'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystalscad
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Joachim Glauche
@@ -67,6 +67,7 @@ files:
 - lib/crystalscad.rb
 - lib/crystalscad/Assembly.rb
 - lib/crystalscad/BillOfMaterial.rb
+- lib/crystalscad/BoltHoles.rb
 - lib/crystalscad/CrystalScad.rb
 - lib/crystalscad/Gears.rb
 - lib/crystalscad/Hardware.rb