blender-3d 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d7d79e2019e79e977ccb17593901bcb29bf7055
-  data.tar.gz: fcc968c990a9f9dd4c058bad499a74353b53871e
+  metadata.gz: 1f04890774ad4700938bc6cde6cda8e66bd6a1e0
+  data.tar.gz: 9b15e351eccc16ada3c3cd8a07fe569588b11b9e
 SHA512:
-  metadata.gz: e6ac870573118372878c50209d112ab916881b808e5f8d179b26aaa8f75851b5d1fba62e3d373d2cc06e050d488299a9a1260106ac2ff412f0525e9c939cf655
-  data.tar.gz: 7305fb6e8a4ae54796491fccc2322a76b64c7e5041c776e57fbacfa16db93be6f9379f7c3fb0af9016e5b77d71e96eebfcfdc3e206e7cedece561abf5a9cc475
+  metadata.gz: 3ef9f4d0b8d6c6e4af8930db64f5ff3aafa568c3d6a3dc12de8da7f08f837f7b494c99bd0b5e22898c7f6e30e4bab4535a40da3692f38ae57e62b4eaa33499f6
+  data.tar.gz: 18245b3390d0b575184838e2c35a6003bc05b349a4e47c7895a2e21030a7bdeb0bf7121490598d04f284b35cce532e78ac4dec3ef88be8ed0a7d71652db29766

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

@@ -1,167 +1,6 @@
-module Blender3d
-  class SimpleType
-    attr_reader :name
-
-    def initialize(name)
-      @name = name
-    end
-
-    def to_s
-      @name
-    end
-
-    def inspect
-      @name
-    end
-
-    def read(reader)
-      case @name
-        when 'char'     then reader.read(1)
-        when 'double'   then reader.read_double
-        when 'float'    then reader.read_float
-        when 'int'      then reader.read_int32
-        when 'int64_t'  then reader.read_int64
-        when 'long'     then reader.read_int32
-        when 'short'    then reader.read_int16
-        when 'uchar'    then reader.read_uint8
-        when 'uint64_t' then reader.read_uint64
-        when 'ulong'    then reader.read_uint32
-        when 'ushort'   then reader.read_uint16
-        else
-          dna = reader.model.dna_block.data
-          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
-          return reader.read(length) if length
-          raise 'type not found'
-      end
-    end
-  end
-
-  class PointerType
-    attr_reader :type
-
-    def initialize(type)
-      @type = type
-    end
-
-    def to_s
-      "Pointer(#@type)"
-    end
-
-    def inspect
-      "#{@type.inspect}*"
-    end
-
-    def read(reader)
-      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
-
-  class FunctionPointerType
-    attr_reader :return_type
-
-    def initialize(return_type)
-      @return_type = return_type
-    end
-
-    def to_s
-      "Function(#@return_type)"
-    end
-
-    def inspect
-      "#{@return_type.inspect} (*)()"
-    end
-
-    def read(reader)
-      Pointer.new(reader.read_pointer)
-    end
-  end
-
-  # equivalent to PointerType<SimpleType<char>> (char*)
-  class NullTerminatedStringType
-    def to_s
-      "NullTerminatedString"
-    end
-
-    def inspect
-      'char*'
-    end
-
-    def read(reader)
-      reader.read_string.chop
-    end
-  end
-
-  # equivalent to ArrayType<SimpleType<char>, length> (char[length])
-  class FixedLengthStringType
-    attr_reader :length
-
-    def initialize(length)
-      @length = length
-    end
-
-    def to_s
-      "FixedLengthString(#@length)"
-    end
-
-    def inspect
-      "char[#@length]"
-    end
-
-    def read(reader)
-      reader.read(@length).gsub(/\0.*$/, '')
-    end
-  end
-
-  class ArrayType
-    attr_reader :type, :size
-
-    def initialize(type, size)
-      @type, @size = type, size
-    end
-
-    def dimensions
-      @sizes.size
-    end
-
-    def to_s
-      "Array[#@size](#@type)"
-    end
-
-    def inspect
-      "#{@type.inspect}[#@size]"
-    end
-
-    def read(reader)
-      @size.times.map { @type.read(reader) }
-    end
-  end
-end
+require_relative 'types/array_type'
+require_relative 'types/fixed_length_string_type'
+require_relative 'types/function_pointer_type'
+require_relative 'types/null_terminated_string_type'
+require_relative 'types/pointer_type'
+require_relative 'types/simple_type'

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

@@ -0,0 +1,25 @@
+module Blender3d
+  class ArrayType
+    attr_reader :type, :size
+
+    def initialize(type, size)
+      @type, @size = type, size
+    end
+
+    def dimensions
+      @sizes.size
+    end
+
+    def to_s
+      "Array[#@size](#@type)"
+    end
+
+    def inspect
+      "#{@type.inspect}[#@size]"
+    end
+
+    def read(reader)
+      @size.times.map { @type.read(reader) }
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Blender3d
+  # equivalent to ArrayType<SimpleType<char>, length> (char[length])
+  class FixedLengthStringType
+    attr_reader :length
+
+    def initialize(length)
+      @length = length
+    end
+
+    def to_s
+      "FixedLengthString(#@length)"
+    end
+
+    def inspect
+      "char[#@length]"
+    end
+
+    def read(reader)
+      reader.read(@length).gsub(/\0.*$/, '')
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Blender3d
+  class FunctionPointerType
+    attr_reader :return_type
+
+    def initialize(return_type)
+      @return_type = return_type
+    end
+
+    def to_s
+      "Function(#@return_type)"
+    end
+
+    def inspect
+      "#{@return_type.inspect} (*)()"
+    end
+
+    def read(reader)
+      Pointer.new(reader.read_pointer)
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Blender3d
+  # equivalent to PointerType<SimpleType<char>> (char*)
+  class NullTerminatedStringType
+    def to_s
+      'NullTerminatedString'
+    end
+
+    def inspect
+      'char*'
+    end
+
+    def read(reader)
+      reader.read_string.chop
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+module Blender3d
+  class PointerType
+    attr_reader :type
+
+    def initialize(type)
+      @type = type
+    end
+
+    def to_s
+      "Pointer(#@type)"
+    end
+
+    def inspect
+      "#{@type.inspect}*"
+    end
+
+    def read(reader)
+      pointer = Pointer.new(reader.read_pointer)
+
+      model = reader.model
+      block = model.pointers[pointer]
+      if block && block.data.is_a?(String) && !block.type
+        block.type = get_type(block, model)
+        block.parse_data(reader.model)
+      end
+
+      pointer
+    end
+
+    private
+
+    def get_type(block, model)
+      return @type if block.count > 1
+      size = get_size(model)
+      return @type unless size > 0 && block.size > size && block.size % size == 0
+      ArrayType.new(@type, block.size / size)
+    end
+
+    def get_size(model)
+      if @type.is_a?(PointerType)
+        model.header.pointer_size
+      else
+        model.dna_block.data.types.find { |type, _| type == @type.name }.last
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Blender3d
+  class SimpleType
+    attr_reader :name
+
+    def initialize(name)
+      @name = name
+    end
+
+    def to_s
+      @name
+    end
+
+    def inspect
+      @name
+    end
+
+    def read(reader)
+      case @name
+        when 'char'     then reader.read(1)
+        when 'double'   then reader.read_double
+        when 'float'    then reader.read_float
+        when 'int'      then reader.read_int32
+        when 'int64_t'  then reader.read_int64
+        when 'long'     then reader.read_int32
+        when 'short'    then reader.read_int16
+        when 'uchar'    then reader.read_uint8
+        when 'uint64_t' then reader.read_uint64
+        when 'ulong'    then reader.read_uint32
+        when 'ushort'   then reader.read_uint16
+        else
+          dna = reader.model.dna_block.data
+          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
+          return reader.read(length) if length
+          raise 'type not found'
+      end
+    end
+  end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blender-3d
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - SilverPhoenix99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -46,6 +46,12 @@ files:
 - lib/blender-3d/structure.rb
 - lib/blender-3d/structure_definition.rb
 - lib/blender-3d/types.rb
+- lib/blender-3d/types/array_type.rb
+- lib/blender-3d/types/fixed_length_string_type.rb
+- lib/blender-3d/types/function_pointer_type.rb
+- lib/blender-3d/types/null_terminated_string_type.rb
+- lib/blender-3d/types/pointer_type.rb
+- lib/blender-3d/types/simple_type.rb
 - lib/blender-3d/version.rb
 homepage: 
 licenses:
@@ -67,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Blender 3d file parser.