crystalscad 0.5.6 → 0.5.7

data/examples/knurls.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/ruby1.9.3
+require "rubygems"
+require "crystalscad"
+include CrystalScad
+
+
+
+
+res = knurled_cube([41,10,4])
+#Total rendering time: 0 hours, 5 minutes, 53 seconds
+
+#Total rendering time: 0 hours, 1 minutes, 41 seconds
+
+#res = knurled_cylinder(d:16,h:10)
+
+
+
+res.save("knurls.scad","$fn=64;")
+

data/lib/crystalscad.rb

@@ -11,6 +11,7 @@ require 'crystalscad/ScrewThreads'
 require 'crystalscad/PrintedThreads'
 require 'crystalscad/Pipe'
 require 'crystalscad/Ruler'
+require 'crystalscad/Extras'
 
 require 'crystalscad/CrystalScad'
 

data/lib/crystalscad/CrystalScad.rb

@@ -24,7 +24,7 @@ module CrystalScad
 	include CrystalScad::Gears
 	include CrystalScad::ScrewThreads
 	include CrystalScad::PrintedThreads
-
+	include CrystalScad::Extras
 	
 
 
@@ -529,16 +529,27 @@ module CrystalScad
 	def save_all(class_name,fn=$fn)
 
 		res = class_name.send :new
-		(res.methods.grep(/view/)+[:show,:output]).each do |i|
+		# regexp for output* view* show* 
+		res.methods.grep(Regexp.union(/^output/,/^view/,/^show/)).each do |i|
+			output = nil
+
 			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
+			unless i == :show or i == :output # call the view method
+				output = res.send i 
+			end
+
+			# if previous call resulted in a CrystalScadObject, don't call the show method again,
+			# otherwise call it.
+			unless 	output.kind_of? CrystalScadObject
+				unless i.to_s.include? "output"	
+					output = res.show					
+				else
+					output = res.output
+				end
 			end
 
-			output.save("output/#{res.class}_#{i}.scad","$fn=#{fn};")
+
+			output.save("output/#{res.class}_#{i}.scad","$fn=#{fn};") unless output == nil
 		end
 	
 	end

data/lib/crystalscad/CrystalScadObject.rb

@@ -21,6 +21,15 @@ module CrystalScad
 		end
 		alias :scad_output :walk_tree		
 		
+		def walk_tree_classes
+			res = []
+			@transformations.reverse.each{|trans|
+				res += trans.walk_tree_classes 
+			}
+			res << self.class
+			res
+		end
+
 		def to_rubyscad
 			""
 		end

data/lib/crystalscad/Extras.rb

@@ -0,0 +1,108 @@
+module CrystalScad::Extras
+
+
+	# This currently can solve triangels knowing 1 side and 2 angels 
+	class Triangle
+		attr_accessor :alpha, :beta, :gamma, :a, :b, :c
+		def initialize(args={})
+			@alpha = args[:alpha]
+			@beta = args[:beta]
+			@gamma = args[:gamma]
+			@a = args[:a]
+			@b = args[:b]
+			@c = args[:c]	
+			solve
+		end
+
+		def solve
+			# see if we have two angles, so we know the third one
+			if @alpha == nil and @beta != nil and @gamma != nil
+				@alpha = 180 - @beta - @gamma
+			elsif @alpha != nil and @beta == nil and @gamma != nil
+				@beta = 180 - @alpha - @gamma 
+			elsif @alpha != nil and @beta != nil and @gamma == nil			
+				@gamma = 180 - @alpha - @beta
+			end			
+
+			if @alpha != nil and @beta != nil and @gamma != nil
+				
+				if @a == nil
+					if @b != nil
+						@a = (@b / Math::sin(radians(@beta))) * Math::sin(radians(@alpha))	
+					elsif @c != nil
+						@a = (@c / Math::sin(radians(@gamma))) * Math::sin(radians(@alpha))	
+					end
+				end
+
+				if @b == nil
+					if @a != nil
+						@b = (@a / Math::sin(radians(@alpha))) * Math::sin(radians(@beta))	
+					elsif @c != nil
+						@b = (@c / Math::sin(radians(@gamma))) * Math::sin(radians(@beta))	
+					end
+				end
+
+				if @c == nil
+					if @a != nil
+						@c = (@a / Math::sin(radians(@alpha))) * Math::sin(radians(@gamma))	
+					elsif @b != nil
+						@c = (@b / Math::sin(radians(@beta))) * Math::sin(radians(@gamma))	
+					end
+				end					
+	
+			end			
+
+
+		end
+
+
+	end
+
+
+	def knurl(y)
+		x = 1.5
+		height = 1.5
+		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
+	
+
+	def knurled_cube(size)
+		x = size[0]
+		y = size[1]
+		z = size[2]
+		res = nil
+			
+		(x / 1.5).ceil.times do |i|
+			(z / 1.5).ceil.times do |f|
+				res += knurl(y).translate(x:i*1.5,z:f*1.5) 			
+			end
+		end
+
+		res *= cube([x,y,z])
+ 
+
+		res
+	end
+
+
+	def knurled_cylinder(args={})
+		res = cylinder(args)	
+		height = args[:h]
+		r = args[:d] / 2.0
+
+		24.times do |i|
+			(height/2).ceil.times do |f| 
+				res -= cylinder(d:0.9,h:height*2).rotate(y:45).translate(y:-r,z:f*2)
+				res -= cylinder(d:0.9,h:height*2).rotate(y:-45).translate(y:-r,z:f*2)
+			end
+			res.rotate(z:15)
+		end
+		res
+	end
+
+
+end

data/lib/crystalscad/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystalscad
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Joachim Glauche
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-04-17 00:00:00 Z
+date: 2015-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyscad
@@ -96,6 +96,7 @@ files:
 - bin/crystalgen
 - crystalscad.gemspec
 - examples/gear.rb
+- examples/knurls.rb
 - examples/openscad_examples/example001.rb
 - examples/openscad_examples/example002.rb
 - examples/openscad_examples/example003.rb
@@ -114,6 +115,7 @@ files:
 - lib/crystalscad/BillOfMaterial.rb
 - lib/crystalscad/CrystalScad.rb
 - lib/crystalscad/CrystalScadObject.rb
+- lib/crystalscad/Extras.rb
 - lib/crystalscad/Gears.rb
 - lib/crystalscad/Hardware.rb
 - lib/crystalscad/LinearBearing.rb