assimp 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2267f3196b45b54118aaf7ed88c26b82b9b4a821
-  data.tar.gz: 26918deb266399e35e175413a187a1ac9f3060f7
+  metadata.gz: eee234d3825f9b4c8af0cc10d6333afd34b19884
+  data.tar.gz: c1ace6c4ff29adb75270e2f95bfedacc152c08b9
 SHA512:
-  metadata.gz: 489bdc6e880842c0bf8f863f001a01019439f2bd450b454683476f8fee621d3ef3eca702977e1721a480e35823ad1d809bcc2ee7ed2d7d3acd3e99fc5a0f7075
-  data.tar.gz: b06590faa7886951d9cbd0e5c14d580862155d838eebbab13213b337f4fd9144146495caa1181c39f6a07e8d581dcde58b540a142abf40853390f8b1e2c2e84e
+  metadata.gz: aa734b7160f8830b7658c265776696950c4007cbb4803b2b39beae71aa25c07b84d05145fe9bc2aa1d2d3fb594007750019d036337439d807cd59eed8fe7be24
+  data.tar.gz: e33d24b11d4884810ce6117680e843855271d27662cffefd019ed5421140908697dd93e2ceb8aae5f5161c0684900b5fd21b9474b01dbc8c3ea45cd0f882c6ea

data/History.rdoc

@@ -4,3 +4,9 @@
 
   * Birthday!
   * Importer.read_file reads structure into hash
+
+
+=== 0.0.2 / 2014-01-31
+
+* Some minor enhancements
+  * Added several new flags to the basic api.

data/README.rdoc

@@ -30,7 +30,7 @@ https://github.com/coballast/assimp
   scene = importer.read_file("example_file.3ds", 
     [:triangulate, :make_left_handed, :calc_tangent_space]);
 
-  pp scene.to_hash 
+  pp scene 
 
   # out prints nicely formated data like meshes, 
   # animations, and materials for consumption by say, a webgl front end renderer.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'hoe'
 require 'rake/extensiontask'
 
-assimp_gem_version = '0.0.1'
+assimp_gem_version = '0.0.2'
 
 Hoe.spec 'assimp' do
   developer('Colin Ballast', 'coballast@gmail.com')

data/ext/assimp/assimp_aibone.c

@@ -5,7 +5,7 @@ VALUE get_Hash_from_aiBone(struct aiBone * bone)
   VALUE result, name, offset_matrix, weights;
   unsigned int i;
   result = rb_hash_new();
-  name = rb_str_new2(&bone->mName.data[0]);
+  name = get_rb_str_from_aiString(&bone->mName);
   offset_matrix = get_Array_from_aiMatrix4x4(&bone->mOffsetMatrix);
   weights = rb_ary_new();
   for(i = 0; i < bone->mNumWeights; i++){

data/ext/assimp/assimp_importer.c

@@ -5,73 +5,84 @@ static VALUE initialize(VALUE self)
   return self;
 }
 
+unsigned int get_flags(VALUE flags_array)
+{
+  unsigned int array_len, i, flags;
+
+  Check_Type(flags_array, T_ARRAY);
+  flags = 0;
+  array_len = RARRAY_LEN(flags_array);
+  for(i = 0; i < array_len; i++){
+    VALUE element;
+    element = rb_ary_entry(flags_array, i);
+    if(TYPE(element)==T_SYMBOL){
+      ID sym_id;
+      sym_id = SYM2ID(element);
+      if(sym_id==rb_intern("triangulate"))
+        flags |= aiProcess_Triangulate;
+      
+      if(sym_id==rb_intern("calc_tangent_space"))
+        flags |= aiProcess_CalcTangentSpace;
+      
+      if(sym_id==rb_intern("make_left_handed"))
+        flags |= aiProcess_MakeLeftHanded;
+      
+      if(sym_id==rb_intern("gen_normals"))
+        flags |= aiProcess_GenNormals;
+      
+      if(sym_id==rb_intern("gen_smooth_normals"))
+        flags |= aiProcess_GenSmoothNormals;
+
+      if(sym_id==rb_intern("gen_uv_coords"))
+        flags |= aiProcess_GenUVCoords;
+
+      if(sym_id==rb_intern("transform_uv_coords"))
+        flags |= aiProcess_TransformUVCoords;
+      
+      if(sym_id==rb_intern("join_identical_vertices"))
+        flags |= aiProcess_JoinIdenticalVertices;
+      
+      if(sym_id==rb_intern("pretransform_vertices"))
+        flags |= aiProcess_PreTransformVertices;
+      
+      if(sym_id==rb_intern("validate_data_structure"))
+        flags |= aiProcess_ValidateDataStructure;
+      
+      if(sym_id==rb_intern("improve_cache_locality"))
+        flags |= aiProcess_ImproveCacheLocality;
+      
+      if(sym_id==rb_intern("fix_infacing_normals"))
+        flags |= aiProcess_FixInfacingNormals;
+      
+      if(sym_id==rb_intern("sort_by_p_type"))
+        flags |= aiProcess_SortByPType; 
+    }
+  }
+  return flags; 
+}
+
 static VALUE read_file(VALUE self, VALUE args)
 {
   char * file_str;
   struct aiScene * scene;
-  unsigned int flags, array_len, i;
+  unsigned int flags;
   long num_args;
-  VALUE file_name, read_flags;
+  VALUE file_name, result;
   flags = 0;
   num_args = RARRAY_LEN(args);
+  result = Qnil;
+
   if(num_args > 2 || num_args < 1)
     rb_raise(rb_eArgError, "wrong number of arguments");
 
   file_name = rb_ary_entry(args, 0);
-  Check_Type(file_name, T_STRING);
-  if(num_args > 1){
-    read_flags = rb_ary_entry(args, 1);
-    Check_Type(read_flags, T_ARRAY);
-    array_len = RARRAY_LEN(read_flags); 
-  }
-
+  Check_Type(file_name, T_STRING); 
   file_str = StringValueCStr(file_name);
 
-  if(num_args > 1){
-   for(i = 0; i < array_len; i++){
-      VALUE element = rb_ary_entry(read_flags, i);
-      if(TYPE(element)==T_SYMBOL){
-        ID sym_id = SYM2ID(element);
-        if(sym_id==rb_intern("triangulate")){
-          flags |= aiProcess_Triangulate;
-        }
-        if(sym_id==rb_intern("calc_tangent_space")){
-          flags |= aiProcess_CalcTangentSpace;
-        }
-        if(sym_id==rb_intern("make_left_handed")){
-          flags |= aiProcess_MakeLeftHanded;
-        }
-        if(sym_id==rb_intern("gen_normals")){
-          flags |= aiProcess_GenNormals;
-        }
-        if(sym_id==rb_intern("gen_smooth_normals")){
-          flags |= aiProcess_GenSmoothNormals;
-        }
-        if(sym_id==rb_intern("join_identical_vertices")){
-          flags |= aiProcess_JoinIdenticalVertices;
-        }
-        if(sym_id==rb_intern("pretransform_vertices")){
-          flags |= aiProcess_PreTransformVertices;
-        }
-        if(sym_id==rb_intern("validate_data_structure")){
-          flags |= aiProcess_ValidateDataStructure;
-        }
-        if(sym_id==rb_intern("improve_cache_locality")){
-          flags |= aiProcess_ImproveCacheLocality;
-        }
-        if(sym_id==rb_intern("fix_infacing_normals")){
-          flags |= aiProcess_FixInfacingNormals;
-        }
-        if(sym_id==rb_intern("sort_by_p_type")){
-          flags |= aiProcess_SortByPType;
-        }
-      }
-    }
-  }
+  if(num_args > 1)
+    flags = get_flags(rb_ary_entry(args, 1));
 
   scene = aiImportFile(file_str, flags);
-  VALUE result;
-  result = Qnil;
 
   if(!scene)
     rb_raise(rb_eIOError, aiGetErrorString());

data/lib/assimp.rb

@@ -1,5 +1,5 @@
 require 'assimp/assimp'
 
 module ASSIMP
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assimp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Colin Ballast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc