stl 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e442a1d1d6c73f5568291d19e4a9c76ca9f7960
-  data.tar.gz: b13b828b174516b81743aafec4f9830b5d39cdfd
+  metadata.gz: 9358e58b0e36e487bfb97b511e4fb5c545e98a01
+  data.tar.gz: 50c4aa3e0bf3fd5cff6b998c166be6b5720fbc74
 SHA512:
-  metadata.gz: 7a0e02cf15977359cf82cbcfe31e6376ad4e6d2d059ffe940bb030b529e804c3f183d96e903d1556b081bc5da803b1a6346ca298b510967ffda944fdc8570bf8
-  data.tar.gz: d31042303cf87bf9f1b533e090a3837c120585ca134a175d8ffee15cfc292cd174c2e8883b946972a2b51354ce56c2a00dfac716b1d1d48d29b383ea503ba566
+  metadata.gz: 672e5bd8ad471c1d5e17337c9e7e6fc5c9d135c8a982742e76b230d821df3d74fef7eab227682615aa133972ea5fd3fa4553d2810814e2ab93389764b296e4c8
+  data.tar.gz: bf46b1582ff58139bf094e292a8d5e7a42c49e4bb7ce87f72a0cb882f7e6286ffdb14003f4026ab7b9c1e28a134551aa340a9f968495fe31e26195d3393ad444

data/README.markdown

@@ -22,4 +22,9 @@ Or install it yourself as:
 require 'stl'
 
 faces = STL.read('my_awesome.stl')	# => [[normal, Triangle], ...]
-```
+```
+
+License
+-------
+
+Copyright 2014 Brandon Fosdick <bfoz@bfoz.net> and released under the BSD license.

data/lib/stl.rb

@@ -7,4 +7,39 @@ module STL
     def self.read(filename)
 	File.open(filename, 'r') {|f| STL::Parser.parse(f) }
     end
+
+    # Write to an STL file
+    # @param filename	[String]    The path to write to
+    # @param faces	[Array]	    An array of faces to write: [[Normal, Triangle], ...]
+    # @param format	[Symbol]    Pass :ascii to write an ASCII formatted file, and :binary to write a binary file
+    def self.write(filename, faces, format=:binary)
+	File.open(filename, 'w') do |file|
+	    if format == :ascii
+		file.puts 'solid '
+		faces.each do |normal, triangle|
+		    file.puts "    facet normal %E %E %E" % [*normal]
+		    file.puts "\touter loop"
+		    triangle.points.each do |point|
+			file.puts "\t    vertex %E %E %E" % [*point]
+		    end
+		    file.puts "\tendloop"
+		    file.puts '    endfacet'
+		end
+		file.puts 'endsolid '
+	    elsif format == :binary
+		file.write 'STL Ruby'.ljust(80, "\0")	# A meager header
+		file.write [faces.length].pack('V')	# The triangle count
+
+		faces.each do |normal, triangle|
+		    file.write normal.to_a.pack("FFF")
+
+		    triangle.points.each do |point|
+			file.write point.to_a.pack("FFF")
+		    end
+
+		    file.write "\0\0"
+		end
+	    end
+	end
+    end
 end

data/lib/stl/parser.rb

@@ -10,7 +10,8 @@ module STL
 	    #  the word 'solid'. The first non-whitespace characters of an ASCII
 	    #  STL file should contain 'solid'.
 	    if io.gets(80).include?('solid')
-		self.new.parse_ascii(io.rewind)
+		io.rewind
+		self.new.parse_ascii(io)
 	    else
 		self.new.parse_binary(io)
 	    end
@@ -26,12 +27,13 @@ module STL
 		case line
 		    when /solid (.*)/
 			name = $1
-		    when /facet normal (.+) (.+) (.+)/
+		    when /facet normal\s+(\S+)\s+(\S+)\s+(\S+)/
 			stack.push Vector[Float($1), Float($2), Float($3)]
-		    when /vertex (.+) (.+) (.+)/
+		    when /vertex\s+(\S+)\s+(\S+)\s+(\S+)/
 			stack.push Vector[Float($1), Float($2), Float($3)]
 		    when /endloop/
-			triangles.push [stack.pop, Geometry::Triangle.new(*stack.pop(3))]
+			normal, *vertices = stack.pop(4)
+			triangles.push [normal, Geometry::Triangle.new(*vertices)]
 		end
 	    end
 	    triangles
@@ -46,7 +48,7 @@ module STL
 	    faces = []
 	    while not io.eof?
 		normal, *vertices = io.read(50).unpack('F3F3F3F3x2').each_slice(3).to_a
-		faces.push [normal, Geometry::Triangle.new(*vertices)]
+		faces.push [Vector[*normal], Geometry::Triangle.new(*vertices)]
 	    end
 	    raise StandardError, "Unexpected end of file after #{faces.length} triangles" if faces.length != count
 

data/stl.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
     spec.name          = 'stl'
-    spec.version       = '0.1'
+    spec.version       = '0.2'
     spec.authors       = ["Brandon Fosdick"]
     spec.email         = ["bfoz@bfoz.net"]
     spec.description   = %q{Read and write STL files}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stl
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Brandon Fosdick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler