crystalscad 0.2.4 → 0.2.5

data/examples/stack.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/ruby1.9.3
+require "rubygems"
+require "crystalscad"
+include CrystalScad
+
+
+parts = [ 
+			Washer.new(4.3),
+			Nut.new(4),		
+			Washer.new(4.3),
+			Nut.new(4)		
+		]
+bolt = Bolt.new(4,16).show
+bolt_assembly = bolt
+bolt_assembly += stack({method:"output"}, *parts)
+
+x,y,z = position(bolt)
+bolt_assembly.translate(x:x*-1,y:y*-1,z:z*-1)
+
+puts bolt_assembly.scad_output
+
+

data/lib/crystalscad/Assembly.rb

@@ -1,5 +1,7 @@
 module CrystalScad
 	class Assembly
+		attr_accessor :height
+
 	  def initialize(args={})
 	    @args = args if @args == nil
       @@bom.add(description) unless args[:no_bom] == true

data/lib/crystalscad/CrystalScad.rb

@@ -22,7 +22,7 @@ module CrystalScad
 	include CrystalScad::LinearBearing
 	
 	
-	class ScadObject
+	class CrystalScadObject
 		attr_accessor :args		
     attr_accessor :transformations
 		def initialize(*args)
@@ -51,7 +51,8 @@ module CrystalScad
 	
 	end
 
-	class Primitive < ScadObject
+	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
@@ -80,21 +81,7 @@ module CrystalScad
 
   end
 
-	class TransformedObject < Primitive
-		attr_accessor :scad
-		def initialize(string)
-			@scad = string
-			@transformations = []
-		end		
-	
-		def to_rubyscad
-			return @scad		
-		end
-		alias :output :walk_tree
-	
-	end
-
-	class Transformation < ScadObject
+	class Transformation < CrystalScadObject
 	end
 
 	class Rotate < Transformation
@@ -132,7 +119,6 @@ module CrystalScad
 	  def initialize(*args)
 	    super(args)
 	    @x,@y,@z = args[0][:size].map{|l| l.to_f}
-    
 	  end
 	
 		def to_rubyscad
@@ -195,48 +181,177 @@ module CrystalScad
 		end
 	end
 
-  	
-	def csg_operation(operation, code1, code2)
-		ret = "#{operation}(){"
-		ret +=code1
-		ret +=code2
-		ret +="}"
-		return TransformedObject.new(ret)
+
+	class CSGModelling < Primitive
+		def initialize(*list)
+			@transformations = []
+			@children = list
+		end
+
+		def to_rubyscad
+			@children ||= []			
+			ret = "#{@operation}(){"
+			@children.each do |child|	
+				begin
+					ret +=child.walk_tree
+				rescue NoMethodError
+				end
+			end
+			ret +="}"			
+		end
+	end	
+
+	class Union < CSGModelling		
+		def initialize(*list)
+			@operation = "union"
+			super(*list)
+		end
 	end
 
+	class Difference < CSGModelling		
+		def initialize(*list)
+			@operation = "difference"
+			super(*list)
+		end
+	end
+
+	class Intersection < CSGModelling		
+		def initialize(*list)
+			@operation = "intersection"
+			super(*list)
+		end
+	end
+
+	class Hull < CSGModelling		
+		def initialize(*list)
+			@operation = "hull"
+			super(*list)
+		end
+	end
+
+
 	def +(args)	
 		return args	 if self == nil		
-		csg_operation("union",self.walk_tree,args.walk_tree)
+		Union.new(self,args)
 	end
 
 	def -(args)
 		return args	 if self == nil		
-		csg_operation("difference",self.walk_tree,args.walk_tree)		
+		Difference.new(self,args)
 	end
 	
 	def *(args)
 		return args	 if self == nil		
-		csg_operation("intersection",self.walk_tree,args.walk_tree)		
+		Intersection.new(self,args)
 	end
 	
-	def hull(part1,part2)
-	  csg_operation("hull",part1.walk_tree,part2.walk_tree)		  
+	def hull(*parts)
+	  Hull.new(parts)	  
+	end
+
+	class CSGModifier < Primitive
+		def initialize(object, attributes)
+			@transformations = []
+			@children = [object]
+			@attributes = attributes
+		end
+
+		def to_rubyscad		
+			ret = "#{@operation}(#{@attributes}){"
+			@children ||= []			
+			@children.each do |child|	
+				begin
+					ret +=child.walk_tree
+				rescue NoMethodError
+				end
+			end
+			ret +="}"			
+		end
+	end	
+
+	class Color < CSGModifier
+		def initialize(object, attributes)
+			@operation = "color"
+			if attributes.kind_of? String
+				attributes = "\"#{attributes}\""			
+			elsif attributes.kind_of? Hash
+				# FIXME
+			end
+			
+			super(object, attributes)
+		end
+	end
+	
+	class LinearExtrude < CSGModifier
+		def initialize(object, attributes)
+			@operation = "linear_extrude"
+			super(object, attributes)
+		end
+	end
+
+	class RotateExtrude < CSGModifier
+		def initialize(object, attributes)
+			@operation = "rotate_extrude"
+			super(object, attributes)
+		end
 	end
 	
-	# Fixme: currently just accepting named colors
 	def color(args)
-	  ret = "color(\"#{args}\"){"
-		ret +=self.walk_tree
-		ret +="}"
-		return TransformedObject.new(ret)		
+		return Color.new(self,args)		
 	end
 
 	def linear_extrude(args)
 		args = args.collect { |k, v| "#{k} = #{v}" }.join(', ')
-		ret = "linear_extrude(#{args}){"
-		ret +=self.walk_tree
-		ret +="}"
-		return TransformedObject.new(ret)				
+		return LinearExtrude.new(self,args)				
+	end
+
+	def rotate_extrude(args)
+		args = args.collect { |k, v| "#{k} = #{v}" }.join(', ')
+		return RotateExtrude.new(self,args)				
+	end
+	
+
+	#	Stacks parts along the Z axis
+	# works on all Assemblies that have a @height definition
+	def stack(args={}, *parts)
+		args[:method] ||= "show"
+		args[:additional_spacing] ||= 0
+		@assembly = nil		
+		z = 0
+		parts.each do |part|
+			@assembly += (part.send args[:method]).translate(z:z)
+			z+= part.height	+ args[:additional_spacing]
+		end
+		@assembly
+	end
+
+	def get_position_rec(obj, level=0)
+		position = [0,0,0]
+		return position if obj == nil
+		obj.each do |o|
+			o.transformations.each do |t|
+				if t.class == Translate
+					t.args[:x] ||= 0
+					t.args[:y] ||= 0
+					t.args[:z] ||= 0
+					position[0] += t.args[:x]
+					position[1] += t.args[:y]
+					position[2] += t.args[:z]
+				end
+			end		
+	#		puts "  " * level + position.inspect
+			x,y,z = get_position_rec(o.children,level+1)
+			position[0] += x
+			position[1] += y
+			position[2] += z
+		end
+		return position
+	end
+
+	#	this is experimental, does only work on simple parts. example:
+	# The bolt head is on the -z plane, this will move it to "zero"
+	def position(obj)
+		get_position_rec(obj.children)
 	end
 
 end

data/lib/crystalscad/Hardware.rb

@@ -97,7 +97,7 @@ module CrystalScad::Hardware
 												5.3 => {outer_diameter:10, height:1.0},
 
 											}
-
+			@height = @chart_din125[@size][:height]
 			super(args)		
 		end
 
@@ -184,8 +184,8 @@ module CrystalScad::Hardware
 			end
 			@@bom.add(description) unless args[:no_bom] == true
 
-			return TransformedObject.new(single_profile.output)	 if @args[:configuration] == 1 		
-			return TransformedObject.new(multi_profile.output)	 				
+			return single_profile	 if @args[:configuration] == 1 		
+			return multi_profile	 				
 		end
 		
     alias :show :output
@@ -232,7 +232,7 @@ module CrystalScad::Hardware
 		alias tslot_output output
 
 		def output(length=nil)
-			tslot_output(length)-bolts		
+			tslot_output(length)-bolts()		
 		end
 
 		def show(length=nil)
@@ -240,7 +240,7 @@ module CrystalScad::Hardware
 		end
 
 		def bolts
-			bolt = ScadObject.new
+			bolt = CrystalScadObject.new
 			return bolt if @args[:holes] == nil
 		
 			if @args[:holes].include?("front")

data/lib/crystalscad/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystalscad
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Joachim Glauche
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-13 00:00:00 Z
+date: 2013-09-14 00:00:00 Z
 dependencies: []
 
 description: Inspired by SolidPython, based on RubyScad
@@ -33,6 +33,7 @@ files:
 - README.md
 - Rakefile
 - crystalscad.gemspec
+- examples/stack.rb
 - lib/crystalscad.rb
 - lib/crystalscad/Assembly.rb
 - lib/crystalscad/BillOfMaterial.rb