crystalscad 0.5.1 → 0.5.3

data/lib/crystalscad/CrystalScad.rb

@@ -455,7 +455,10 @@ module CrystalScad
 			@attributes = attributes
 		end
 
-		def to_rubyscad		
+		def to_rubyscad	
+ 			#	Apparently this doesn't work for CSGModifiers, like it does for other things in RubyScad?
+		  # also this is a dirty, dirty hack. 	
+			@attributes = @attributes.gsub("fn","$fn").gsub("$$","$") 
 			ret = "#{@operation}(#{@attributes}){"
 			@children ||= []			
 			@children.each do |child|	
@@ -521,12 +524,12 @@ module CrystalScad
 		return LinearExtrude.new(self,args)				
 	end
 
-	def rotate_extrude(args)
+	def rotate_extrude(args={})
 		if args[:h]	# rename to height
 			args[:height] = args[:h]
 			args.delete(:h)
 		end
-		args = args.collect { |k, v| "#{k} = #{v}" }.join(', ')
+		args = args.collect { |k, v| "#{k} = #{v}" }.join(', ')	
 		return RotateExtrude.new(self,args)				
 	end
 

data/lib/crystalscad/Pipe.rb

@@ -17,19 +17,33 @@
 
 module CrystalScad
 	class Pipe
-		attr_accessor :x,:y, :pipe
+		attr_accessor :x,:y, :sum_x, :sum_y, :pipe, :bent_segments
+		# Warning: sum_x and sum_y are both a quick hack at the moment
+		# 				 They will ONLY work on bends if you do same thing in the other direction 
+		#					 for example 
+		#					 pipe.cw(20,30)
+		#					 pipe.ccw(20,30)
+		#	This might be fixed in the future.
+
 		def radians(a)
 		  a/180.0 * Math::PI
 		end
 
 		def initialize(args={})
-			@diameter = args[:diameter]
+			# parameters
+			@diameter = args[:diameter] || 1
+			@fn = args[:fn] || 64
+			@bent_segments = args[:bent_segments] || 128
+			@line_rotation = args[:line_rotation] || 0 # z rotation in case needed with fn values
+
+			# variable initialization
 			@pipe = nil	
-			@line_rotation = 0 # z rotation in case needed with fn values
+			@sum_x = 0
+			@sum_y = 0
 		end
 
 		def shape
-			res = circle(d:@diameter)
+			res = circle(d:@diameter,fn:@fn)
 		end
 		
 		def inner_shape
@@ -85,7 +99,7 @@ module CrystalScad
 			else
 				@pipe = @pipe.translate(x:length) + create_line(length,color)				
 			end
-
+			@sum_x += length
 		end
 
 		private
@@ -101,8 +115,8 @@ module CrystalScad
 		end
 	
 		def bent_cw(radius,angle)	
-			res = shape.translate(x:radius).rotate_extrude(convexity:10)
-			res -= inner_shape.translate(x:radius).rotate_extrude(convexity:10) unless inner_shape == nil
+			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
 
 			len = radius+@diameter/2.0
 			@x = Math::sin(radians(angle))*len
@@ -114,6 +128,8 @@ module CrystalScad
 			@x = Math::sin(radians(angle))*len
 			@y = Math::cos(radians(angle))*len
 	
+			@sum_x += @x
+			@sum_y += @y	
 
 			res *= cut.linear_extrude(h:100).translate(z:-50)
 		
@@ -123,8 +139,8 @@ module CrystalScad
 		end
 
 		def bent_ccw(radius,angle)	
-			res = shape.translate(x:radius).rotate_extrude(convexity:10)
-			res -= inner_shape.translate(x:radius).rotate_extrude(convexity:10) unless inner_shape == nil
+			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
 
 			len = radius+@diameter/2.0
 			@x = Math::sin(radians(angle))*len
@@ -136,6 +152,8 @@ module CrystalScad
 			@x = Math::sin(radians(angle))*len
 			@y = -1*Math::cos(radians(angle))*len
 	
+			@sum_x += @x
+			@sum_y += @y	
 
 			res *= cut.linear_extrude(h:100).translate(z:-50)
 			res = res.mirror(y:1)	

data/lib/crystalscad/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystalscad
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Joachim Glauche
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-04-09 00:00:00 Z
+date: 2015-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyscad