blender-3d 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a057403b1d063c59505fb6cfcd7ac4c67640342
-  data.tar.gz: f2cd8a90be5652c54e7b7ee209d09729d5df7665
+  metadata.gz: 2d7d79e2019e79e977ccb17593901bcb29bf7055
+  data.tar.gz: fcc968c990a9f9dd4c058bad499a74353b53871e
 SHA512:
-  metadata.gz: 5aefe8b85d9f9b9d18ae496be42e4f73378dab00da0d0bfa853ae03449bad895a6c5ac0c36cae80f1bfdef77fa7ad8f79fd99123f8d201d83ce0f0a9675a47c2
-  data.tar.gz: 77774c2a3e201ed5f4a09fc72432478dc4e4866f9e9c17cd186877e91e1c74a2ef76fd5578b837e85857bfc36f32ca9cb41ab944fde422cb82350d1235e3e953
+  metadata.gz: e6ac870573118372878c50209d112ab916881b808e5f8d179b26aaa8f75851b5d1fba62e3d373d2cc06e050d488299a9a1260106ac2ff412f0525e9c939cf655
+  data.tar.gz: 7305fb6e8a4ae54796491fccc2322a76b64c7e5041c776e57fbacfa16db93be6f9379f7c3fb0af9016e5b77d71e96eebfcfdc3e206e7cedece561abf5a9cc475

data/lib/blender-3d.rb

@@ -1,4 +1,6 @@
 require 'stringio'
+require 'rexml/document'
+require 'facets/module/basename'
 
 require_relative 'blender-3d/version'
 require_relative 'blender-3d/object_reader'
@@ -10,9 +12,9 @@ require_relative 'blender-3d/char_field_parser'
 require_relative 'blender-3d/generic_field_parser'
 require_relative 'blender-3d/field_parser_factory'
 
+require_relative 'blender-3d/serializer'
 require_relative 'blender-3d/structure'
 require_relative 'blender-3d/structure_definition'
-
 require_relative 'blender-3d/file_header'
 require_relative 'blender-3d/file_block'
 require_relative 'blender-3d/dna_block'

data/lib/blender-3d/file_block.rb

@@ -1,5 +1,7 @@
 module Blender3d
   class FileBlock
+    include Serializer
+
     attr_accessor :code, :size, :pointer, :type_index, :count, :data, :type
 
     def initialize(reader = nil)
@@ -11,9 +13,29 @@ module Blender3d
     end
 
     def parse_data(model)
-      file = StringIO.new(self.data)
+      file = StringIO.new(data)
       reader = model.create_reader(file)
-      self.data = self.count.times.map { self.type.read(reader) }
+      self.data = count.times.map { self.type.read(reader) }
+    end
+
+    def to_xml
+      REXML::Element.new(self.class.basename).tap do |e|
+        e.add_attribute 'code', code
+        e.add_attribute 'pointer', pointer.inspect
+        e.add_attribute 'size', size.to_s
+        e.add_attribute 'type_index', type_index.to_s
+        e.add_element data_to_xml
+      end
+    end
+
+    private def data_to_xml
+      content = value_to_xml(@data)
+      return content if content.is_a?(REXML::Element)
+
+      REXML::Element.new('data').tap do |e|
+        e.add_attribute 'count', count.to_s
+        e.add_text content
+      end
     end
 
     class Reader

data/lib/blender-3d/model.rb

@@ -1,6 +1,6 @@
 module Blender3d
   class Model
-    attr_reader :header, :blocks, :pointers
+    attr_reader :header, :blocks, :codes, :pointers
 
     def self.from_file(path)
       File.open(path, 'rb') { |file| new(file) }
@@ -21,26 +21,62 @@ module Blender3d
         break if reader.tell == reader.file.size
       end
 
+      @pointers = @blocks.reject { |block| block.code == 'ENDB' }.map { |block| [block.pointer, block] }.to_h
+
       dna_block = self.dna_block
       return self unless dna_block
 
+      render_block = @blocks.find { |b| b.code == 'REND' }
+      if render_block
+        render_block.type_index = dna_block.data.structures.size
+        dna_block.data.structures << render_info
+      end
+
       @blocks.select { |block| block.type_index != 0 }.each do |block|
         block.type = dna_block.data.structures[block.type_index]
+      end
+
+      @blocks.select(&:type).each_with_index do |block, i|
         block.parse_data(self)
       end
 
-      @pointers = {}
-      @blocks.each { |block| @pointers[block.pointer] = block.data }
+      @codes = @blocks.group_by(&:code).sort.to_h
 
       self
     end
 
+    def create_reader(file)
+      ObjectReader.new(file, self)
+    end
+
     def dna_block
       @blocks.find { |block| block.code == 'DNA1' }
     end
 
-    def create_reader(file)
-      ObjectReader.new(file, self)
+    def render_info
+      @render_info ||= begin
+        sizeof_int = dna_block.data.types.find { |name, _| name == 'int' }.last
+        struct_size = 2 * sizeof_int + 64
+        StructureDefinition.new('RenderInfo', struct_size, [
+          Field.new(SimpleType.new('int'), 'sfra'),
+          Field.new(SimpleType.new('int'), 'efra'),
+          Field.new(FixedLengthStringType.new(64), 'scene_name'),
+        ])
+      end
+    end
+
+    def to_xml
+      content = blocks.reject { |b| b.code == 'DNA1' }.map(&:to_xml)
+      REXML::Element.new(self.class.basename).tap do |e|
+        e.add_attribute 'identifier', @header.identifier
+        e.add_attribute 'pointer_size', @header.pointer_size.to_s
+        e.add_attribute 'endianness', @header.endianness.to_s
+        e.add_attribute 'version', @header.version
+        content.each_with_index do |c, i|
+          c.add_attribute 'index', i.to_s
+          e << c
+        end
+      end
     end
   end
 end

data/lib/blender-3d/pointer.rb

@@ -17,7 +17,7 @@ module Blender3d
     end
 
     def <=>(other)
-      other.is_a?(Pointer) ? location <=> other.location : 1
+      other.is_a?(Pointer) || other.is_a?(Integer) ? to_i <=> other.to_i : 1
     end
 
     def ==(other)

data/lib/blender-3d/serializer.rb

@@ -0,0 +1,22 @@
+module Blender3d
+  module Serializer
+    private def value_to_xml(val)
+      case val
+        when Pointer then REXML::Text.new(val.inspect, true)
+        when Array then array_to_xml(val)
+        else val.respond_to?(:to_xml) ? val.to_xml : REXML::Text.new(val.to_s, true)
+      end
+    end
+
+    private def array_to_xml(ary)
+      REXML::Element.new('data').tap do |e|
+        e.add_attribute 'count', ary.count.to_s
+        ary.each do |value|
+          value = value_to_xml(value)
+          value = REXML::Element.new('data-element').tap { |x| x << value } if value.is_a?(REXML::Text)
+          e << value
+        end
+      end
+    end
+  end
+end

data/lib/blender-3d/structure.rb

@@ -4,6 +4,8 @@ module Blender3d
       attr_reader :definition
     end
 
+    include Serializer
+
     def initialize(reader = nil)
       deserialize(reader) if reader
     end
@@ -15,5 +17,16 @@ module Blender3d
       end
       self
     end
+
+    def to_xml
+      vars = instance_variables.map do |n|
+        value = instance_variable_get(n)
+        REXML::Element.new(n[1..-1]).tap { |e| e << value_to_xml(value) }
+      end
+
+      REXML::Element.new(self.class.basename).tap do |e|
+        vars.each { |v| e.add_element v }
+      end
+    end
   end
 end

data/lib/blender-3d/types.rb

@@ -29,9 +29,10 @@ module Blender3d
         when 'ushort'   then reader.read_uint16
         else
           dna = reader.model.dna_block.data
-          struct = dna.structures.find { |struct| struct.name == @name }
+          name = @name[0].upcase + @name[1..-1]
+          struct = dna.structures.find { |struct| struct.name == name }
           return struct.read(reader) if struct
-          length = dna.types.find { |name, size| name == @name }&.last
+          length = dna.types.find { |name, _size| name == @name }&.last
           return reader.read(length) if length
           raise 'type not found'
       end
@@ -54,7 +55,33 @@ module Blender3d
     end
 
     def read(reader)
-      Pointer.new(reader.read_pointer)
+      pointer = Pointer.new(reader.read_pointer)
+
+      model = reader.model
+      block = model.pointers[pointer]
+      if block && block.data.is_a?(String) && !block.type
+
+        if block.count == 1
+          size = if @type.is_a?(PointerType)
+            model.header.pointer_size
+          else
+            model.dna_block.data.types.find { |type, _| type == @type.name }.last
+          end
+
+          if block.size > size && block.size % size == 0
+            block.type = ArrayType.new(@type, block.size / size)
+          else
+            block.type = @type
+          end
+
+        else
+          block.type = @type
+        end
+
+        block.parse_data(reader.model)
+      end
+
+      pointer
     end
   end
 

data/lib/blender-3d/version.rb

@@ -1,3 +1,3 @@
 module Blender3d
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: blender-3d
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - SilverPhoenix99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
-dependencies: []
+date: 2016-11-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: facets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Blender 3d file parser.
 email:
 - silver.phoenix99@gmail.com
@@ -28,6 +42,7 @@ files:
 - lib/blender-3d/model.rb
 - lib/blender-3d/object_reader.rb
 - lib/blender-3d/pointer.rb
+- lib/blender-3d/serializer.rb
 - lib/blender-3d/structure.rb
 - lib/blender-3d/structure_definition.rb
 - lib/blender-3d/types.rb
@@ -52,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Blender 3d file parser.