wavefront 0.0.5 → 0.0.6

data/lib/vec3.rb

@@ -9,7 +9,11 @@ module Wavefront
     end
 
     def to_s
-      [x, y, z].compact.join ' '
+      to_a.compact.join ' '
+    end
+
+    def to_a
+      [x, y, z]
     end
   end
 end

data/lib/vertex.rb

@@ -3,8 +3,14 @@ module Wavefront
     attr_reader :position, :tex, :normal, :position_index, :texture_index, :normal_index
 
     def initialize p, uv, n, p_index, t_index, n_index
+      raise "cannot initialize vertex without a position!" if p.nil?
       @position, @uv, @normal = p, uv, n
       @position_index, @texture_index, @normal_index = p_index, t_index, n_index
     end
+
+    def composite_index
+      "p_#{position_index}_n_#{normal_index}_t#{texture_index}"
+    end
+
   end
 end

data/lib/wavefront/version.rb

@@ -1,3 +1,3 @@
 module Wavefront
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/wavefront_file.rb

@@ -31,13 +31,22 @@ module Wavefront
 
     def export out_path
       raise "no objects to export!" if objects.size.zero?
-      objects.first.export out_path
+      object.export out_path
+    end
+
+    def export_simple out_path, export_index_buffer = false
+      raise "no objects to export!" if objects.size.zero?
+      object.export_simple out_path, export_index_buffer
     end
 
     def compute_vertex_buffer
       object.compute_vertex_buffer
     end
 
+    def compute_vertex_and_index_buffer
+      object.compute_vertex_and_index_buffer
+    end
+
     def object
       objects.first
     end

data/lib/wavefront_object.rb

@@ -31,9 +31,6 @@ module Wavefront
       @num_faces
     end
 
-
-
-
     def export file_name
       unless /\.obj$/.match file_name
         file_name += ".obj"
@@ -62,6 +59,35 @@ module Wavefront
       end
     end
 
+    def export_simple file_name, export_index_buffer = false
+      file_name += ".simple" unless /\.simple$/.match file_name
+
+      if export_index_buffer
+        vi = compute_vertex_and_index_buffer
+        vertex_buffer = vi[:vertex_buffer]
+        index_buffer = vi[:index_buffer]
+      else
+        vertex_buffer = compute_vertex_buffer
+      end
+
+      ::File.delete file_name if ::File.exist? file_name
+      open file_name, 'a' do |f|
+        f.puts "# Exported in Simple Format from Wavefront Ruby Gem Version #{Wavefront::VERSION}"
+        f.puts "#vertices"
+        vertex_buffer.each do |v|
+          vertex_str = "p,#{v.position.to_a.join ','}"
+          vertex_str += ",n,#{v.normal.to_a.join ','}" if v.normal
+          vertex_str += ",t,#{v.tex.to_a.join ','}" if v.tex
+          f.puts vertex_str
+        end
+        if export_index_buffer
+          f.puts "\n\n\n#indices"
+          f.puts index_buffer.join ','
+        end
+      end
+    end
+
+
     def compute_vertex_buffer
       vertex_buffer = []
       groups.each do |group|
@@ -73,15 +99,26 @@ module Wavefront
       vertex_buffer.flatten
     end
 
-    def compute_vertex_buffer_and_index_buffer
-      raise "not yet implemented in version #{Wavefront::VERSION}! will be coming in future versions!"
-      vertex_buffer, index_buffer = [], []
-
+    def compute_vertex_and_index_buffer
+      vertex_buffer, index_buffer, composite_indices, current_index = [], [], {}, -1
+
+      groups.map { |g| (g.triangles + g.smoothing_groups.map(&:triangles).flatten) }.flatten.each do |triangle|
+        triangle.vertices.each do |v|
+          i = composite_indices[v.composite_index]
+          if i.nil?
+            current_index += 1
+            vertex_buffer << v
+            i = current_index
+            composite_indices[v.composite_index] = i
+          end
+          index_buffer << i
+        end
+      end
 
       {:vertex_buffer => vertex_buffer, :index_buffer => index_buffer}
     end
 
-private
+    private
     def parse!
       while line = file.gets
         components = line.split
@@ -118,8 +155,8 @@ private
             @current_group.set_smoothing_group components.first
           when 'o'
             raise "Wavefront Version #{Wavefront::VERSION} does not support obj files with more than one object. If you encounter such an obj that fails to load, please attach and email to mishaAconway@gmail.com so that I can update the gem to support the file."
-            #file.seek -line.size, IO::SEEK_CUR
-            #return
+          #file.seek -line.size, IO::SEEK_CUR
+          #return
         end
       end
     end
@@ -133,9 +170,9 @@ private
 
         normal_index = vertex_str_components[2]
 
-        position = vertices[position_index]
-        tex_coordinate = tex_index ? texture_coordinates[tex_index] : nil
-        normal = normals[normal_index]
+        position = vertices[position_index-1]
+        tex_coordinate = tex_index ? texture_coordinates[tex_index-1] : nil
+        normal = normals[normal_index-1]
 
         triangle_vertices << Vertex.new(position, tex_coordinate, normal, position_index, tex_index, normal_index)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wavefront
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies: []
 description: Wavefront parser and exporter
 email: