crystalscad 0.5.3 → 0.5.5

data/bin/crystalgen

@@ -45,6 +45,7 @@ res.save(\"#{name}.scad\",\"$fn=64;\")
 		empty_directory("#{name}/lib/hardware/")
 		empty_directory("#{name}/lib/printed/")
 		empty_directory("#{name}/lib/lasercut/")
+		empty_directory("#{name}/output")
 
 		
 		create_file("#{name}/lib/assemblies/#{name}_assembly.rb") do

data/lib/crystalscad/CrystalScad.rb

@@ -25,87 +25,9 @@ module CrystalScad
 	include CrystalScad::PrintedThreads
 
 	
-	class CrystalScadObject
-		attr_accessor :args		
-    attr_accessor :transformations
-		def initialize(*args)
-			@transformations = []
-			@args = args.flatten
-			if @args[0].kind_of? Hash
-				@args = @args[0]			
-			end		
-		end		
-
-		def walk_tree
-			res = ""			
-			
-			@transformations.reverse.each{|trans|
-				res += trans.walk_tree 
-			}
-			res += self.to_rubyscad.to_s+ "\n"
-			res
-		end
-		alias :scad_output :walk_tree		
-		
-		def to_rubyscad
-			""
-		end
-		
-		def save(filename,start_text=nil)
-      file = File.open(filename,"w")
-      file.puts start_text unless start_text == nil
-      file.puts scad_output
-      file.close		
-		end
-
-		def method_missing(meth, *args, &block)		
-		end
-	
-	end
 
-	class Primitive < CrystalScadObject
-		attr_accessor :children		
 
-		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
 
-		def rotate_around(point,args)
-			x,y,z= point.x, point.y, point.z
-			self.translate(x:-x,y:-y,z:-z).rotate(args).translate(x:x,y:y,z:z)
-		end
-
-		def translate(args)
-			@transformations << Translate.new(args)		
-			self			
-		end
-		
-		def union(args)
-			@transformations << Union.new(args)		
-			self			
-		end
-
-		def mirror(args)
-			@transformations << Mirror.new(args)		
-			self			
-		end
-
-		def scale(args)
-			if args.kind_of? Numeric or args.kind_of? Array
-					args = {v:args}
-			end
-			@transformations << Scale.new(args)		
-			self			
-		end
-
-
-  end
 
 	class Transformation < CrystalScadObject
 	end
@@ -597,6 +519,28 @@ module CrystalScad
 	  a*180 /  Math::PI
   end
 
+		
+	# Saves all files generated of a CrystalScad file
+	# Saves outputs of 
+	# - show
+	# - output
+	# - view* 
+	def save_all(class_name)
+		res = class_name.send :new
+		(res.methods.grep(/view/)+[:show,:output]).each do |i|
+			res.send :initialize # ensure default values are loaded at each interation
+			res.send i unless i == :show or i == :output # call the view method
+			unless i == :output	
+				output = res.show
+			else
+				output = res.output
+			end
+
+			output.save("output/#{res.class}_#{i}.scad","fn=64;")
+		end
+	
+	end
+
 end
 
 

data/lib/crystalscad/CrystalScadObject.rb

@@ -0,0 +1,39 @@
+module CrystalScad
+	class CrystalScadObject
+		attr_accessor :args		
+    attr_accessor :transformations
+		def initialize(*args)
+			@transformations = []
+			@args = args.flatten
+			if @args[0].kind_of? Hash
+				@args = @args[0]			
+			end		
+		end		
+
+		def walk_tree
+			res = ""			
+			
+			@transformations.reverse.each{|trans|
+				res += trans.walk_tree 
+			}
+			res += self.to_rubyscad.to_s+ "\n"
+			res
+		end
+		alias :scad_output :walk_tree		
+		
+		def to_rubyscad
+			""
+		end
+		
+		def save(filename,start_text=nil)
+      file = File.open(filename,"w")
+      file.puts start_text unless start_text == nil
+      file.puts scad_output
+      file.close		
+		end
+
+		def method_missing(meth, *args, &block)		
+		end
+	
+	end
+end

data/lib/crystalscad/Hardware.rb

@@ -15,7 +15,7 @@
 
 module CrystalScad::Hardware 
 
-	class Bolt	< CrystalScad::Assembly
+	class Bolt	< CrystalScad::Primitive
 		attr_accessor :transformations
 
 		def initialize(size,length,args={})

data/lib/crystalscad/Pipe.rb

@@ -49,7 +49,12 @@ module CrystalScad
 		def inner_shape
 			nil
 		end
-	
+
+		# This will be called on bent, so this library can work with rectangle pipes, if you overwrite this and let it rotate z by 90 
+		def apply_rotation(obj)
+			return obj		
+		end	
+
 		# go clockwise
 		def cw(radius,angle,color=nil)
 			if angle > 360
@@ -115,8 +120,8 @@ module CrystalScad
 		end
 	
 		def bent_cw(radius,angle)	
-			res = shape.translate(x:radius).rotate_extrude(fn:@bent_segments)
-			res -= inner_shape.translate(x:radius).rotate_extrude(fn:@bent_segments) unless inner_shape == nil
+			res = apply_rotation(shape).translate(x:radius).rotate_extrude(fn:@bent_segments)
+			res -= apply_rotation(inner_shape).translate(x:radius).rotate_extrude(fn:@bent_segments) unless inner_shape == nil
 
 			len = radius+@diameter/2.0
 			@x = Math::sin(radians(angle))*len
@@ -139,8 +144,8 @@ module CrystalScad
 		end
 
 		def bent_ccw(radius,angle)	
-			res = shape.translate(x:radius).rotate_extrude(fn:@bent_segments)
-			res -= inner_shape.translate(x:radius).rotate_extrude(fn:@bent_segments) unless inner_shape == nil
+			res = apply_rotation(shape).translate(x:radius).rotate_extrude(fn:@bent_segments)
+			res -= apply_rotation(inner_shape).translate(x:radius).rotate_extrude(fn:@bent_segments) unless inner_shape == nil
 
 			len = radius+@diameter/2.0
 			@x = Math::sin(radians(angle))*len

data/lib/crystalscad/Primitive.rb

@@ -0,0 +1,45 @@
+module CrystalScad
+	class Primitive < CrystalScadObject
+		attr_accessor :children		
+
+		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
+
+		def rotate_around(point,args)
+			x,y,z= point.x, point.y, point.z
+			self.translate(x:-x,y:-y,z:-z).rotate(args).translate(x:x,y:y,z:z)
+		end
+
+		def translate(args)
+			@transformations << Translate.new(args)		
+			self			
+		end
+		
+		def union(args)
+			@transformations << Union.new(args)		
+			self			
+		end
+
+		def mirror(args)
+			@transformations << Mirror.new(args)		
+			self			
+		end
+
+		def scale(args)
+			if args.kind_of? Numeric or args.kind_of? Array
+					args = {v:args}
+			end
+			@transformations << Scale.new(args)		
+			self			
+		end
+
+
+  end
+end

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.5.3"
+  VERSION = "0.5.5"
 end
 

data/lib/crystalscad.rb

@@ -1,7 +1,10 @@
 require 'crystalscad/version'
 require 'crystalscad/BillOfMaterial'
+require 'crystalscad/CrystalScadObject'
 require 'crystalscad/Assembly'
+require 'crystalscad/Primitive'
 require 'crystalscad/Hardware'
+
 require 'crystalscad/LinearBearing'
 require 'crystalscad/Gears'
 require 'crystalscad/ScrewThreads'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystalscad
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Joachim Glauche
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-04-10 00:00:00 Z
+date: 2015-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyscad
@@ -113,10 +113,12 @@ files:
 - lib/crystalscad/Assembly.rb
 - lib/crystalscad/BillOfMaterial.rb
 - lib/crystalscad/CrystalScad.rb
+- lib/crystalscad/CrystalScadObject.rb
 - lib/crystalscad/Gears.rb
 - lib/crystalscad/Hardware.rb
 - lib/crystalscad/LinearBearing.rb
 - lib/crystalscad/Pipe.rb
+- lib/crystalscad/Primitive.rb
 - lib/crystalscad/PrintedThreads.rb
 - lib/crystalscad/Ruler.rb
 - lib/crystalscad/ScrewThreads.rb