collada 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDZkOGNmM2E0ZDBkMjE5MzA1MDBkNWZjZTc4YmNmZWQ2ZDVkOWMxZA==
+    OTJlZDlkNTNiNmRjYTYxZGE3OGNmZjFiODhmNjA2YmM2OTIzMjdmMw==
   data.tar.gz: !binary |-
-    M2Y0YTUwZTQ1NjU0MThmNjMwMzhkOWYyYTVmZmJiYmE5ODY0MGM4ZQ==
+    YmUzNjhjY2UxMGZkYmNjYzhjM2ZkZWMxNTIyMTU4NjhiZWRkNjI0Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTY4YzFjNDRmYjhlMDJmYmQ2YjQ1NzgxMDdmZjE4NTVmZjM1Y2FlMjM0ODRh
-    ZDRkODA3ZjUzY2ZhZWNjZTAyNjYxNjk0YWUyNjNkN2E0Y2RlN2Q5MjIzM2Ji
-    NzUyNmQ3YzBlZmRjM2QwOTFkOGI2OWJkZGU4ZTY2Zjk5ODlhOWI=
+    ZDdhYmU5NjdhYTQyZWQxYmE5NTVhYTJiNzIzYjJlNDFlZmFiNWNjNThlMDEz
+    ZDRkMmE3MTcyMGViZGYxMWZjYWQ3MTc2MjA0NjNiMTU0OWRhZWQxOTk5OGQ3
+    ZDNmOGY5NGZiMmNjOTk1NWQ1MTA1YjBmMGRmODhlNmY2MmE0NmM=
   data.tar.gz: !binary |-
-    YTBkMTc3ZjZiZWEyN2I4ZTgzNzY0ZDUyZjhkNTY2NDFkMjUyNWU1YzZkYWEy
-    Mzc2NTE0MDNmNDY5ZmNkMzcyZTk3YmI3NGNiYTc0MjkwNjAxM2U5MDRkODE1
-    NmExOTk5YTcxYTMzZjE2ZDkxNzFkMjZlZGRmM2E0MzBlZDBiNGQ=
+    OTg3OTAzNGRkNmM3NmZiZmNkMzcyYTRiMWViMTRmNjBkZTdlZjNhZWFkMjg3
+    NjVkNjhlYjQyODE3NzJmZTNiMzkzYTYzMDE3NjkxMDA2OTQ3YzM5ODAyZjM1
+    ZjY2YmJhZmI5ZmRkYzUwZDA2ZjVjNzcwY2I1ZWFhODQ2ODllYjU=

data/lib/collada/conversion/tagged_format.rb

@@ -2,13 +2,18 @@
 module Collada
 	module Conversion
 		class TaggedFormat
+			class GeometryError < StandardError
+			end
+
+			TEXCOORD = lambda {|value| [value[:S], -value[:T] + 1.0]}
+
 			VERTEX_FORMATS = {
 				"p3n3" => VertexFormat[position: [:X, :Y, :Z], normal: [:X, :Y, :Z]],
-				"p3n3m2" => VertexFormat[position: [:X, :Y, :Z], normal: [:X, :Y, :Z], texcoord: [:S, :T]],
-				"p3n3m2b2" => VertexFormat[position: [:X, :Y, :Z], normal: [:X, :Y, :Z], texcoord: [:S, :T], bones: WeightFormat[4]],
-				"p3n3m2b4" => VertexFormat[position: [:X, :Y, :Z], normal: [:X, :Y, :Z], texcoord: [:S, :T], bones: WeightFormat[4]],
+				"p3n3m2" => VertexFormat[position: [:X, :Y, :Z], normal: [:X, :Y, :Z], texcoord: TEXCOORD],
+				"p3n3m2b2" => VertexFormat[position: [:X, :Y, :Z], normal: [:X, :Y, :Z], texcoord: TEXCOORD, bones: WeightFormat[4]],
+				"p3n3m2b4" => VertexFormat[position: [:X, :Y, :Z], normal: [:X, :Y, :Z], texcoord: TEXCOORD, bones: WeightFormat[4]],
 			}
-	
+
 			def initialize(options, library, output = nil)
 				@options = options
 				@library = library
@@ -20,7 +25,13 @@ module Collada
 				@top = {}
 				@nodes = {}
 			end
-	
+
+			def extract_axes(scene, node, instance)
+				node.children.collect do |child|
+					[child.name, *Transforms.extract_axis(child.local_transform_matrix)]
+				end
+			end
+
 			def dump_geometry(scene, node, instance, skeleton = nil)
 				vertex_format = @output_vertex_format.with_vertex_index
 				geometry = instance.lookup(@library)
@@ -30,6 +41,10 @@ module Collada
 				weights = skeleton.indexed_weights if skeleton
 		
 				geometry.mesh.polygons.each do |polygon|
+					if polygon.count != 3
+						raise GeometryError.new("Non-triangular surfaces ")
+					end
+					
 					polygon.each do |vertex_attributes|
 						vertex = Collada::Conversion::Vertex.new(vertex_attributes, vertex_format)
 				
@@ -38,9 +53,9 @@ module Collada
 						mesh << vertex
 					end
 				end
-		
+
 				@output.puts "#{geometry.id}: mesh triangles"
-		
+
 				@output.puts "	indices: array index16"
 				mesh.indices.each_slice(12) do |indices|
 					@output.puts "		#{indices.flatten.collect{|i| i.to_s.rjust(5)}.join}"
@@ -54,6 +69,14 @@ module Collada
 				end
 				@output.puts "	end"
 		
+				axes = extract_axes(scene, node, instance)
+
+				@output.puts "	axes: array axis"
+				axes.each do |axis|
+					@output.puts "		#{axis.collect{|i| i.to_s.rjust(12)}.join(' ')}"
+				end
+				@output.puts "	end"
+		
 				@output.puts "end"
 		
 				@top[geometry.name || geometry.id] = geometry.id

data/lib/collada/parser/visual_scene.rb

@@ -67,8 +67,9 @@ module Collada
 			]
 			
 			class Node
-				def initialize(id, type, transforms, instances, children, attributes = {})
+				def initialize(id, name, type, transforms, instances, children, attributes = {})
 					@id = id
+					@name = name
 					@type = type
 					
 					@transforms = transforms
@@ -88,6 +89,7 @@ module Collada
 				attr :parent
 				
 				attr :id
+				attr :name
 				attr :type
 				
 				attr :transforms
@@ -158,13 +160,14 @@ module Collada
 				
 				def self.parse(doc, element)
 					id = element.attributes['id']
+					name = element.attributes['name']
 					type = (element.attributes['type'] || 'node').downcase.to_sym
 					
 					transforms = parse_transforms(doc, element)
 					instances = parse_instances(doc, element)
 					children = parse_children(doc, element)
 					
-					self.new(id, type, transforms, instances, children, element.attributes)
+					self.new(id, name, type, transforms, instances, children, element.attributes)
 				end
 			end
 			

data/lib/collada/transforms.rb

@@ -107,5 +107,10 @@ module Collada
 			
 			return product
 		end
+		
+		def self.extract_axis(matrix)
+			# Transform [x, y, z], Rotation [x, y, z, w]
+			[matrix[0, 3], matrix[1, 3], matrix[2, 3], *rotation_matrix_to_quaternion(matrix)]
+		end
 	end
 end

data/lib/collada/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Collada
-	VERSION = "0.2.0"
+	VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collada
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow