assimp-ffi 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df26f6192dcf235b945984cf065ce55e166c67ab36347919847d802d9c9c043
-  data.tar.gz: cb82f85404159973ab6d31d181b7595e9b2d67bba1ee3e03e809f92c86640526
+  metadata.gz: bcb6604bdbc664925b80b68d5b3203cf8537fe2150e23c898596d6a10bf08c1c
+  data.tar.gz: e6f525ebf5fde40bcaccd55967a9ad956c29bb8de91082132289dedf0a37c4b6
 SHA512:
-  metadata.gz: 07fd1e1b78d4229b92c2eeb0d58861111cf747422579380447930450512f1d0505503e8ffe5fa690c34b11e7f348243b721784f786331c607ec02751545c25b7
-  data.tar.gz: 661ea340f42fd455565565adee1d73ff846274a6da4a3e042d18b4e168e137904e88f5606ac402cfa541a2364befcad8452c6d362b6e3e35d9f5e7d01294d52a
+  metadata.gz: 582359516d534c53f70edcbf8daa1af8226545f8fefa711c4dcdec316261234cb9cc64994fd55d19d53181453930034756eac348094ccfb30236fe08f042a51a
+  data.tar.gz: 2158ce8875ebbdafbc2ebd17595ff1709db1f5ff7ce988ed294a7af9d1c8845d31d9af17fe7431c7b3381ba1d547f4f3627fb21778d103e5b5e5d07ccfd8ad0f

data/lib/assimp/defs.rb

@@ -10,6 +10,9 @@ module Assimp
     typedef :uint, :ai_uint
   end
 
+  typedef :int32, :ai_int32
+  typedef :uint32, :ai_uint32
+
   MATH_PI = 3.141592653589793238462643383279
   MATH_TWO_PI = MATH_PI * 2.0
   MATH_HALF_PI = MATH_PI * 0.5

data/lib/assimp/export.rb

@@ -17,7 +17,7 @@ module Assimp
 
   attach_function :aiGetExportFormatCount, [], :size_t
   attach_function :aiGetExportFormatDescription, [:size_t], ExportFormatDesc.ptr
-  attach_function :aiReleaseExportFormatDescription, [ExportFormatDesc.ptr], :void
+  attach_function :aiReleaseExportFormatDescription, [:pointer], :void
 
   def self.export_format_descriptions
     count = Assimp::aiGetExportFormatCount
@@ -27,7 +27,7 @@ module Assimp
   end
 
   attach_function :aiCopyScene, [Scene.ptr, :pointer], :void
-  attach_function :aiFreeScene, [Scene.ptr], :void
+  attach_function :aiFreeScene, [:pointer], :void
   attach_function :aiExportScene, [Scene.ptr, :string, :string, PostProcessSteps], Return
   attach_function :aiExportSceneEx, [Scene.ptr, :string, :string, FileIO.ptr, PostProcessSteps], Return
 
@@ -53,6 +53,6 @@ module Assimp
   end
 
   attach_function :aiExportSceneToBlob, [Scene.ptr, :string, PostProcessSteps], :pointer #ExportDataBlob.ptr
-  attach_function :aiReleaseExportBlob, [ExportDataBlob.ptr], :void
+  attach_function :aiReleaseExportBlob, [:pointer], :void
 
 end

data/lib/assimp/import.rb

@@ -234,7 +234,7 @@ module Assimp
     s
   end
 
-  attach_function :aiReleaseImport, [Scene.by_ref], :void
+  attach_function :aiReleaseImport, [:pointer], :void
   attach_function :aiIsExtensionSupported, [:string], :bool
 
   def self.extension_supported?(extension)

data/lib/assimp/types.rb

@@ -35,28 +35,52 @@ module Assimp
     end
   end
 
-  class String #< FFI::Struct
-    extend StructAccessors
-    MAXLEN = 1024
-    layout :length, :size_t,
-           :data, [:char, MAXLEN]
-    struct_attr_reader :length
+  if version >= Version::new(5,0,0)
+    class String #< FFI::Struct
+      extend StructAccessors
+      MAXLEN = 1024
+      layout :length, :ai_uint32,
+             :data, [:char, MAXLEN]
+      struct_attr_reader :length
 
-    def data
-      (pointer + Assimp.find_type(:size_t).size).read_string(length)
-    end
+      def data
+        (pointer + 4).read_string(length)
+      end
 
-    def data=(str)
-      sz = str.bytesize
-      raise "String too long #{sz} > #{MAXLEN-1}!" if sz > MAXLEN-1
-      self[:length] = sz
-      (pointer + Assimp.find_type(:size_t).size).write_string(str+"\x00")
-    end
+      def data=(str)
+        sz = str.bytesize
+        raise "String too long #{sz} > #{MAXLEN-1}!" if sz > MAXLEN-1
+        self[:length] = sz
+        (pointer + 4).write_string(str+"\x00")
+      end
 
-    def to_s
-      data
+      def to_s
+        data
+      end
     end
+  else
+    class String #< FFI::Struct
+      extend StructAccessors
+      MAXLEN = 1024
+      layout :length, :size_t,
+             :data, [:char, MAXLEN]
+      struct_attr_reader :length
 
+      def data
+        (pointer + Assimp.find_type(:size_t).size).read_string(length)
+      end
+
+      def data=(str)
+        sz = str.bytesize
+        raise "String too long #{sz} > #{MAXLEN-1}!" if sz > MAXLEN-1
+        self[:length] = sz
+        (pointer + Assimp.find_type(:size_t).size).write_string(str+"\x00")
+      end
+
+      def to_s
+        data
+      end
+    end
   end
 
   Return = enum( :return, [ :SUCCESS, :FAILURE, -1, :OUTOFMEMORY, -3 ] )

data/lib/assimp/vector2.rb

@@ -9,6 +9,6 @@ module Assimp
     def to_s
       "<#{x}, #{y}>"
     end
-   end
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assimp-ffi
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -32,7 +32,7 @@ dependencies:
         version: 1.9.19
 description: FFI bindings of Assimp (Open Asset Import Library bindings) for version
   4.1.0 onward
-email: brice.videau@imag.fr
+email: brice.videau@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Open Asset Import Library bindings