crystalscad 0.4.2 → 0.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjZhYjQ1ZDg1OTI4YzAyODE5ZDAxZWMwYmRjYTQ2NzYwMGQyMGMwOA==
+  data.tar.gz: !binary |-
+    MDk5ZWIzOTRhNTZlZDBhMmE4MzJmYTdlNTZjMDUwNDUxNTA0NWYwNA==
+SHA512:
+  metadata.gz: !binary |-
+    NzBmZGEyMmEwNmQzZThlMjZlM2E1MDU5YTJiODMyNjE2YzkwNWM2MjI5Y2Yz
+    ODdiNDg3ZWJjODU2NTkxNjQ0MDg3ZDgyZWY5NTdlNjY3OGRhOGJkMGU1ODFi
+    OGQ0NTZiYzQzMzQ1YTA4ZWZiOWMwYzFmNjdkN2Q1ZDgyNTAyMTY=
+  data.tar.gz: !binary |-
+    MDlkMTA2OTY3M2JhMzgwN2QzNDMwOTQyMDdmNDVjMWFiNjM2MWRkODg0OTZk
+    ZWQzZmExMGE3M2YwYTdlOWZhNmQ4ZTc5N2Q2ZGUwN2U1MDNjNTYzZjRkNzll
+    OTQ1ODA1MjYzMTdhMGU3YWU0NDhkYWMxMzNlYzU5N2ZiODU3NTI=

data/examples/openscad_examples/example002.rb

@@ -17,7 +17,6 @@ res2+= cube([10,10,50]).center
 
 res = res1-res2
 res*=cylinder(r1:20,r2:5,h:50,center:true).translate(z:5)
-
 res.save("example002.scad")
 
 

data/examples/pipe.rb

@@ -0,0 +1,41 @@
+#!/usr/bin/ruby1.9.3
+require "rubygems"
+require "crystalscad"
+include CrystalScad
+
+
+class MyPipe < CrystalScad::Pipe
+	def shape
+		@line_rotation = 30
+		return circle(d:@diameter,fn:6)
+	end	
+
+	def inner_shape
+		circle(d:6)
+	end
+end
+
+pipe = MyPipe.new(diameter:10)
+
+pipe.line(10)
+pipe.ccw(20,30,"yellow")
+pipe.line(30)
+
+pipe.cw(30,60,"blue")
+pipe.ccw(30,45,"green")
+pipe.line(3)
+pipe.ccw(30,160,"blue")
+pipe.ccw(30,60,"green")
+
+
+#pipe.cw(30,60,"blue")
+#pipe.cw(20,60,"green")
+#pipe.cw(10,60,"black")
+#pipe.line(33)
+#pipe.cw(30,90,"white")
+#pipe.cw(15,95,"silver")
+#pipe.line(10,"pink")
+res = pipe.pipe
+
+res.save("pipe.scad","$fn=64;")
+

data/examples/printed_gear.rb

@@ -4,11 +4,11 @@ require "crystalscad"
 include CrystalScad
 
   
-g1 = PrintedGear.new(module:2.0,teeth:40,bore:5,height:4)
+g1 = PrintedGear.new(module:2.0,teeth:40,bore:8,height:4)
 g2 = PrintedGear.new(module:2.0,teeth:20,bore:5,height:4,rotation:0.5) # rotation in number of teeth
 
-res = g1.show.color("red").rotate(z:"$t*360")
-res += g2.show.rotate(z:"-$t*360*#{g1.ratio(g2)}").translate(x:g1.distance_to(g2))
+res = g1.show.color("red")
+res += g2.show.translate(x:g1.distance_to(g2))
 
-res.save("printed_gear.scad")
+res.save("printed_gear.scad","$fn=64;")
 

data/examples/printed_thread2.rb

@@ -4,16 +4,11 @@ require "crystalscad"
 include CrystalScad
 
   
-t1 = PrintedThread.new(diameter:20, pitch:5, length:22.5, internal:true)
-t2 = PrintedThread.new(diameter:20, pitch:5, length:20, internal:false)
-
-#t1 = PrintedThread.new(diameter:12, pitch:1.75, length:22.5, internal:true)
-#t2 = PrintedThread.new(diameter:12, pitch:1.75, length:20, internal:false)
-
-
-res = cube([25,25,z=26]).center_xy.color(a:40)
-res -= t1.output.translate(z:0)
+t1 = PrintedThread.new(diameter:20, pitch:2.5, length:22.5, internal:true)
+t2 = PrintedThread.new(diameter:20, pitch:2.5, length:20, internal:false)
 
+res = cube([25,25,z=26]).center_xy
+res -= t1.output
 res += t2.output.translate(z:z)
 
 res.save("printed_thread2.scad")

data/lib/crystalscad.rb

@@ -6,5 +6,6 @@ require 'crystalscad/LinearBearing'
 require 'crystalscad/Gears'
 require 'crystalscad/ScrewThreads'
 require 'crystalscad/PrintedThreads'
+require 'crystalscad/Pipe'
 require 'crystalscad/CrystalScad'
 

data/lib/crystalscad/CrystalScad.rb

@@ -219,7 +219,12 @@ module CrystalScad
 	class Square < Primitive
 	  def initialize(*args)
 	    super(args)
-	    @x,@y = args[0][:size].map{|l| l.to_f}
+			if args[0][:size].kind_of? Array
+		    @x,@y = args[0][:size].map{|l| l.to_f}
+			else
+				@x = args[0][:size].to_f
+				@y = @x
+			end		
 	  end
 
 		def to_rubyscad

data/lib/crystalscad/Pipe.rb

@@ -0,0 +1,150 @@
+#    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 Pipe
+		attr_accessor :x,:y, :pipe
+		def radians(a)
+		  a/180.0 * Math::PI
+		end
+
+		def initialize(args={})
+			@diameter = args[:diameter]
+			@pipe = nil	
+			@line_rotation = 0 # z rotation in case needed with fn values
+		end
+
+		def shape
+			res = circle(d:@diameter)
+		end
+		
+		def inner_shape
+			nil
+		end
+	
+		# go clockwise
+		def cw(radius,angle,color=nil)
+			if angle > 360
+				return false		
+			end		
+			# since bent can only do up to 90°, splitting it up in chunks in order to grow it 
+			if angle > 90
+				return cw(radius,90,color) + cw(radius,angle-90,color)	
+			end
+
+			if @pipe == nil
+				@pipe = bent_cw(radius,angle)	
+				@pipe = @pipe.color(color) unless color == nil
+			else
+				rotated_pipe = @pipe.rotate(z:-angle)	
+				pipe_piece = bent_cw(radius,angle)
+				pipe_piece = pipe_piece.color(color) unless color == nil
+				@pipe = pipe_piece + rotated_pipe.translate(x:x,y:y-radius)
+			end	
+		end
+
+		# go counter clockwise
+		def ccw(radius,angle,color=nil)
+			if angle > 360
+				return false		
+			end		
+			# since bent can only do up to 90°, splitting it up in chunks in order to grow it 
+			if angle > 90
+				return ccw(radius,90,color) + ccw(radius,angle-90,color)	
+			end
+
+			if @pipe == nil
+				@pipe = bent_ccw(radius,angle)	
+				@pipe = @pipe.color(color) unless color == nil
+			else
+				rotated_pipe = @pipe.rotate(z:angle)	
+				pipe_piece = bent_ccw(radius,angle)
+				pipe_piece = pipe_piece.color(color) unless color == nil
+				@pipe = pipe_piece + rotated_pipe.translate(x:x,y:y+radius)
+			end	
+	
+		end
+
+		def line(length,color=nil)
+			if @pipe == nil
+				@pipe = create_line(length,color) 
+			else
+				@pipe = @pipe.translate(x:length) + create_line(length,color)				
+			end
+
+		end
+
+		private
+		def create_line(length,color=nil)
+			res = shape.linear_extrude(h:length)
+			if inner_shape 
+				res -= inner_shape.linear_extrude(h:length+0.2).translate(z:-0.1)
+			end
+			if color
+				res = res.color(color)		
+			end
+			res.rotate(z:@line_rotation).rotate(y:90)
+		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
+
+			len = radius+@diameter/2.0
+			@x = Math::sin(radians(angle))*len
+			@y = Math::cos(radians(angle))*len
+			cut = polygon(points:[[0,0],[0,len],[@x,@y]]).scale(2)
+		
+			# for working with it
+			len = radius #- @diameter / 2.0
+			@x = Math::sin(radians(angle))*len
+			@y = Math::cos(radians(angle))*len
+	
+
+			res *= cut.linear_extrude(h:100).translate(z:-50)
+		
+			# Positioning it on 0 
+		
+			return res.translate(y:-radius)
+		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
+
+			len = radius+@diameter/2.0
+			@x = Math::sin(radians(angle))*len
+			@y = Math::cos(radians(angle))*len
+			cut = polygon(points:[[0,0],[0,len],[@x,@y]]).scale(2)
+		
+			# for working with it
+			len = radius #- @diameter / 2.0
+			@x = Math::sin(radians(angle))*len
+			@y = -1*Math::cos(radians(angle))*len
+	
+
+			res *= cut.linear_extrude(h:100).translate(z:-50)
+			res = res.mirror(y:1)	
+			# Positioning it on 0 
+		
+			return res.translate(y:radius)
+		end
+
+
+	end
+end
+

data/lib/crystalscad/PrintedThreads.rb

@@ -37,6 +37,7 @@ module CrystalScad::PrintedThreads
 			end
 			# cut to length
 			res *= cube(x:@args[:diameter]*1.1, y:@args[:diameter]*1.1, z:@args[:length]).center.translate(z:@args[:length]/2.0)
+			
 			if @args[:internal]
 				# Solid center, including Dmin truncation.
 				res += cylinder(r:@args[:diameter]/2.0 - h*5.0/8.0, h:@args[:length], segments:number_of_segments)
@@ -95,8 +96,8 @@ module CrystalScad::PrintedThreads
 		 	fraction_circle = 1.0/n_segments
 
 			h = pitch * Math::cos(radians(30))
-			outer_r = radius + (internal ? h/5.0 : 0) # Adds internal relief.
-
+			outer_r = radius + (internal ? h/20 : 0) # Adds internal relief.
+			 
 			inner_r = radius - 0.875*h #  Does NOT do Dmin_truncation - do later with cylinder.
 
 			# Make these just slightly bigger (keep in proportion) so polyhedra will overlap.

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.4.2"
+  VERSION = "0.5"
 end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: crystalscad
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: '0.5'
 platform: ruby
 authors:
 - Joachim Glauche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyscad
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: observr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -95,6 +86,7 @@ files:
 - examples/openscad_examples/example003.rb
 - examples/openscad_examples/example004.rb
 - examples/openscad_examples/example005.rb
+- examples/pipe.rb
 - examples/printed_gear.rb
 - examples/printed_gear2.rb
 - examples/printed_thread.rb
@@ -109,6 +101,7 @@ files:
 - lib/crystalscad/Gears.rb
 - lib/crystalscad/Hardware.rb
 - lib/crystalscad/LinearBearing.rb
+- lib/crystalscad/Pipe.rb
 - lib/crystalscad/PrintedThreads.rb
 - lib/crystalscad/ScrewThreads.rb
 - lib/crystalscad/version.rb
@@ -120,26 +113,25 @@ files:
 homepage: http://github.com/Joaz/CrystalScad
 licenses:
 - GPL-3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CrystalScad is a framework for programming OpenScad models in Ruby
 test_files: []