collada 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTJlZDlkNTNiNmRjYTYxZGE3OGNmZjFiODhmNjA2YmM2OTIzMjdmMw==
+    OGExZjQyN2E3YzQzOTIzZmY5YWUyYTEyZTE3YWMzOGY3ZjMzMzBhZQ==
   data.tar.gz: !binary |-
-    YmUzNjhjY2UxMGZkYmNjYzhjM2ZkZWMxNTIyMTU4NjhiZWRkNjI0Mg==
+    MWE5Nzc1NTQ1MWY0OGY2MjlkMzZmZDgzYTUxYzI5MTNlNWJkMzAyMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDdhYmU5NjdhYTQyZWQxYmE5NTVhYTJiNzIzYjJlNDFlZmFiNWNjNThlMDEz
-    ZDRkMmE3MTcyMGViZGYxMWZjYWQ3MTc2MjA0NjNiMTU0OWRhZWQxOTk5OGQ3
-    ZDNmOGY5NGZiMmNjOTk1NWQ1MTA1YjBmMGRmODhlNmY2MmE0NmM=
+    MWJiMWU2MDM5M2RmYTYwNTBkN2U0MTYwNjdjNWQwMjE1MmIxODk4MjE4NTdl
+    OTljZjNjNTVkMWMxZDIwNzI1MWMyYjUyY2EwNzlkZDA3M2ZlMDQ5MzBlN2M2
+    ZjZmMDc3MTBmODVhYmJmNjkzNGNlMjBkNGMyM2U2OWE2MmU0ZjQ=
   data.tar.gz: !binary |-
-    OTg3OTAzNGRkNmM3NmZiZmNkMzcyYTRiMWViMTRmNjBkZTdlZjNhZWFkMjg3
-    NjVkNjhlYjQyODE3NzJmZTNiMzkzYTYzMDE3NjkxMDA2OTQ3YzM5ODAyZjM1
-    ZjY2YmJhZmI5ZmRkYzUwZDA2ZjVjNzcwY2I1ZWFhODQ2ODllYjU=
+    NTJmYmU1OGUyM2Q0ZDY4YWI2OGZhY2QyOGFiNTU0MTZlY2IxN2FiYTU2Y2Yy
+    NTA4NjRlYzkyMzU1YThjNDAyMWNhYWE1MTEyNDhhZjgyNWU1ZDJmNTdmYmU5
+    MTY4MjJmMTdkYTJjZDU4YTIyYWMxZGI5YTk2MjBkN2VjY2YxNWU=

data/lib/collada/conversion/skeleton.rb

@@ -66,14 +66,14 @@ module Collada
 			
 			def extract_skeleton(top)
 				@bones = [[0, top]]
-				@indexed = {top.id => 0}
+				@indexed = {top.sid => 0}
 				
 				@scene.traverse(top.children) do |node|
 					next unless node.type == :joint
 					
-					bone_index = indexed[node.parents(:joint).first.id]
+					bone_index = indexed[node.parents(:joint).first.sid]
 					
-					@indexed[node.id] = bones.size
+					@indexed[node.sid] = bones.size
 					@bones << [bone_index, node]
 				end
 				

data/lib/collada/conversion/tagged_format.rb

@@ -125,7 +125,7 @@ module Collada
 				@output.puts "		default: skeleton-animation #{start_time} #{end_time}"
 				@output.puts "			key-frames: array skeleton-animation-key-frame"
 				skeleton.bones.each do |(parent, bone)|
-					channel = channels["#{bone.id}/transform"]
+					channel = channels["#{bone.id}/transform"] || channels["#{bone.id}/matrix"]
 			
 					next unless channel
 			

data/lib/collada/parser/visual_scene.rb

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

data/lib/collada/version.rb

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

metadata

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