crystalscad 0.5.7 → 0.5.8

data/examples/nut_support.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/ruby1.9.3
+require "rubygems"
+require "crystalscad"
+include CrystalScad
+
+
+
+
+res = cube([160,20,20]).center_y.translate(x:-5)
+[2.5,3,4,5,6,8,10,12].each do |size|
+	b = Bolt.new(size,40)
+	n = Nut.new(size)
+	res -= b.output
+	res -= n.output	
+	res += n.add_support(0.2)
+
+	res.translate(x:-20)
+end
+
+
+
+
+res.save("nut_support.scad","$fn=64;")
+

data/lib/crystalscad/CrystalScad.rb

@@ -11,7 +11,7 @@
 #    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/>.
+#    along with CrystalScad.  If not, see <http://www.gnu.org/licenses/>fre.
 
 require "rubygems"
 require "rubyscad"
@@ -265,6 +265,8 @@ module CrystalScad
 				rescue NoMethodError	
 				end
 			end
+			#puts @children.map{|l| l.walk_tree_classes}.inspect
+
 			ret +="}"			
 		end
 	end	
@@ -297,8 +299,26 @@ module CrystalScad
 		end
 	end
 
+	def optimize_union(top, child)
+		if top.kind_of? Union and not child.kind_of? Union
+			top.children << child
+			return top
+		else
+			return Union.new(top,child)
+		end
+	end
+
+	def optimize_difference(top, child)
+		if top.kind_of? Difference and not child.kind_of? Difference
+			top.children << child
+			return top
+		else
+			return Difference.new(top,child)
+		end
+	end
+
 	def +(args)	
-		return args	 if self == nil		
+		return Union.new(nil,args)	 if self == nil		
 		if args.kind_of? Array
 			r = self			
 			args.each do |a|
@@ -310,7 +330,7 @@ module CrystalScad
 			end
 			r
 		else
-			Union.new(self,args)
+			optimize_union(self,args)
 		end		
 	end
 
@@ -327,7 +347,7 @@ module CrystalScad
 			end
 			r
 		else
-			Difference.new(self,args)
+			optimize_difference(self,args)
 		end
 	end
 	
@@ -344,7 +364,8 @@ module CrystalScad
 	class Import < Primitive
 		def initialize(args)
 			@transformations = []
-			
+			@children = []			
+		
 			if args.kind_of? String
 			  filename = args
 			else # assume hash otherwise
@@ -363,7 +384,12 @@ module CrystalScad
 		  if @layer
 		    layer = ",layer=\"#{@layer}\""
 		  end
-			return RubyScadBridge.new.import("file=\""+@filename.to_s+"\"#{layer}") # apparently the quotes get lost otherwise
+			res = self.children.map{|l| l.walk_tree}
+			if res == []
+				res = ""
+			end
+ 			res += RubyScadBridge.new.import("file=\""+@filename.to_s+"\"#{layer}") # apparently the quotes get lost otherwise
+			res		
 		end	
 	end
 
@@ -371,6 +397,31 @@ module CrystalScad
 		Import.new(filename)
 	end
 
+	class Render < Primitive
+		def initialize(object, attributes)
+			@operation = "render"
+			@children = [object]
+			super(object, attributes)
+		end		
+
+		def to_rubyscad	
+		  layer = ""
+		  if @layer
+		    layer = ",layer=\"#{@layer}\""
+		  end
+			res = ""			
+			self.children.map{|l| res += l.walk_tree}
+ 			res += RubyScadBridge.new.render
+			res		
+		end	
+
+	end
+	
+	def render(args={})
+		return Render.new(self,args)		
+	end
+
+
 	class CSGModifier < Primitive
 		def initialize(object, attributes)
 			@transformations = []
@@ -412,7 +463,7 @@ module CrystalScad
 			super(object, attributes)
 		end
 	end
-	
+
 	class LinearExtrude < CSGModifier
 		def initialize(object, attributes)
 			@operation = "linear_extrude"
@@ -438,6 +489,7 @@ module CrystalScad
 		return Color.new(self,args)		
 	end
 
+
 	def linear_extrude(args)
 		if args[:h]	# rename to height
 			args[:height] = args[:h]
@@ -534,9 +586,7 @@ module CrystalScad
 			output = nil
 
 			res.send :initialize # ensure default values are loaded at each interation
-			unless i == :show or i == :output # call the view method
-				output = res.send i 
-			end
+			output = res.send i 
 
 			# if previous call resulted in a CrystalScadObject, don't call the show method again,
 			# otherwise call it.
@@ -554,6 +604,23 @@ module CrystalScad
 	
 	end
 
+	def get_classes_from_file(filename)
+		classes = []
+		File.readlines(filename).find_all{|l| l.include?("class")}.each do |line|
+			# strip all spaces, tabs
+			line.strip!			
+			# ignore comments (Warning: will not worth with ruby multi line comments)
+			next if line[0..0] == "#"
+			#	strip class definition
+			line = line[6..-1]
+			# strip until space appears - or if not, to the end
+			classes << Object.const_get(line[0..line.index(" ").to_i-1])		
+		end
+
+		return classes
+	end
+
+
 end
 
 

data/lib/crystalscad/Extras.rb

@@ -65,7 +65,6 @@ module CrystalScad::Extras
 		res = cube(([x,y,height]))
 		res -= cylinder(d:0.9,h:height*1.42,fn:16).rotate(y:45).translate(x:0)
 		res -= cylinder(d:0.9,h:height*1.42,fn:16).rotate(y:-45).translate(x:1.5)
-
 		res
 	end
 	

data/lib/crystalscad/Hardware.rb

@@ -230,14 +230,14 @@ module CrystalScad::Hardware
 		end
 
 		def prepare_data
-			chart_934 = {2.5=> {side_to_side:5,height:2}, 
-										3 => {side_to_side:5.5,height:2.4},
-									  4 => {side_to_side:7,height:3.2},
-										5 => {side_to_side:8,height:4},
-										6 => {side_to_side:10,height:5},
-										8 => {side_to_side:13,height:6.5},
-									 10 => {side_to_side:17,height:8},
-									 12 => {side_to_side:19,height:10},
+			chart_934 = {2.5=> {side_to_side:5,height:2, support_diameter:2.8}, 
+										3 => {side_to_side:5.5,height:2.4, support_diameter:3.5},
+									  4 => {side_to_side:7,height:3.2, support_diameter:4.4},
+										5 => {side_to_side:8,height:4, support_diameter:5.3},
+										6 => {side_to_side:10,height:5, support_diameter:6.3},
+										8 => {side_to_side:13,height:6.5, support_diameter:8.3},
+									 10 => {side_to_side:17,height:8, support_diameter:10.3},
+									 12 => {side_to_side:19,height:10, support_diameter:12.3},
 
 									}
 			# for securing nuts
@@ -250,6 +250,7 @@ module CrystalScad::Hardware
 
 			@s = chart_934[@size][:side_to_side]
 			@height = chart_934[@size][:height]
+			@support_diameter = chart_934[@size][:support_diameter]
 
 			if @type == "985"
 				@height = chart_985[@size][:height]			
@@ -257,6 +258,15 @@ module CrystalScad::Hardware
 	
 		end
 
+		def add_support(layer_height=0.2)
+			res = cylinder(d:@support_diameter,h:@height-layer_height)
+			# on very small nuts, add a support base of one layer height, so the support won't fall over
+			if @size < 6 
+				res += cylinder(d:@s-1,h:layer_height)
+			end	
+			res
+		end
+
 		def output(margin=0.3)	
 			add_to_bom
 			return nut_934(false,margin)

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystalscad
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Joachim Glauche
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-04-20 00:00:00 Z
+date: 2015-04-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyscad
@@ -97,6 +97,7 @@ files:
 - crystalscad.gemspec
 - examples/gear.rb
 - examples/knurls.rb
+- examples/nut_support.rb
 - examples/openscad_examples/example001.rb
 - examples/openscad_examples/example002.rb
 - examples/openscad_examples/example003.rb