tiny_obj 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d91aafa86970daba236dd2fb71955cacb14875a59015bbec7165dda09780a0e
-  data.tar.gz: 3f9480090194bd2ebff61e80ddd0b85d81d2ce8f2a525f399ecbb84d5b714b0d
+  metadata.gz: 43c1c1c3d8ce4bc0609cb5311bbef76f77ba09b44620d8e3e50f60c82d0abc48
+  data.tar.gz: d8043f9c0249a92114b61dddd5f66b961c24ee391e612b41fdb394e5a7716506
 SHA512:
-  metadata.gz: b09b1b2af1855653eab5228aa9327e7baca6d9e0ff7d2eac8787c34c67c0a2bccba49839ff1b07a0828a678afde379820abf2c4a4b36e645b35733a0cda0d87e
-  data.tar.gz: 835349a8a40734e8d6b633a050cdfe4f7f104a5e86abd70fee0683b56935477bb615885167f65b709b1283a2ec73ff1c77981974363f850d3da17278efa25dd3
+  metadata.gz: 1217901dc2bb0e5d6ba710d1cc46fdad3de23d720a441c7537c33c07f97bb16e5fbf1a5ddca6c439bc35bc2f6647c1558e1125bfdc32512914bd6abe8b97859f
+  data.tar.gz: d55d2743baa53fc88f14f4d15609c6e8782280728d369f00495c5c77520052a617ea3f68647f1d96e5fd90c09e7dae36776a8c5f0f7a61f927c0bd55c11973dd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tiny_obj (0.2.2)
+    tiny_obj (0.2.3)
 
 GEM
   remote: https://rubygems.org/

data/ext/tiny_obj/init_tinyobj.c

@@ -14,5 +14,6 @@ void Init_tiny_obj(void) {
   rb_define_method(rb_cOBJ, "normals",               rb_obj_normals,               -1);
   rb_define_method(rb_cOBJ, "texcoords",             rb_obj_texcoords,             -1);
   rb_define_method(rb_cOBJ, "colors",                rb_obj_colors,                -1);
+  rb_define_method(rb_cOBJ, "materials",             rb_obj_materials,              0);
   rb_define_singleton_method(rb_mTinyOBJ, "load", rb_tinyobj_load, -1);
 }

data/ext/tiny_obj/rb_tinyobj.h

@@ -16,6 +16,7 @@ extern "C" {
   VALUE rb_obj_normals(int argc, VALUE *argv, VALUE self);
   VALUE rb_obj_texcoords(int argc, VALUE *argv, VALUE self);
   VALUE rb_obj_colors(int argc, VALUE *argv, VALUE self);
+  VALUE rb_obj_materials(VALUE self);
 #ifdef __cplusplus
 }
 #endif

data/ext/tiny_obj/tinyobj.cpp

@@ -416,21 +416,11 @@ extern "C" {
     return rb_colors;
   }
 
-  VALUE rb_obj_to_hash(VALUE self) {
+  VALUE rb_obj_materials(VALUE self) {
     obj_t *obj;
     TypedData_Get_Struct(self, obj_t, &obj_type, obj);
-    std::string                      &warnings  = *(obj->warnings);
-    std::vector<tinyobj::shape_t>    &shapes    = *(obj->shapes);
     std::vector<tinyobj::material_t> &materials = *(obj->materials);
-
-    VALUE ret = rb_hash_new();
-    rb_hash_aset(ret, ID2SYM(rb_intern("success")), obj->result ? Qtrue : Qfalse);
-
-    if (warnings.size() > 0)
-      rb_hash_aset(ret, ID2SYM(rb_intern("warnings")), rb_str_new2(warnings.c_str()));
-
     VALUE rb_materials = rb_ary_new2(materials.size());
-    rb_hash_aset(ret, ID2SYM(rb_intern("materials")), rb_materials);
     for (size_t m = 0; m < materials.size(); m++) {
       VALUE rb_material = rb_hash_new();
       rb_ary_push(rb_materials, rb_material);
@@ -498,7 +488,22 @@ extern "C" {
       if (!NIL_P(rb_unknown_parameter))
         rb_hash_aset(rb_material, ID2SYM(rb_intern("unknown_parameters")), rb_unknown_parameter);
     }
+    return rb_materials;
+  }
+
+  VALUE rb_obj_to_hash(VALUE self) {
+    obj_t *obj;
+    TypedData_Get_Struct(self, obj_t, &obj_type, obj);
+    std::string                      &warnings  = *(obj->warnings);
+    std::vector<tinyobj::shape_t>    &shapes    = *(obj->shapes);
+
+    VALUE ret = rb_hash_new();
+    rb_hash_aset(ret, ID2SYM(rb_intern("success")), obj->result ? Qtrue : Qfalse);
+
+    if (warnings.size() > 0)
+      rb_hash_aset(ret, ID2SYM(rb_intern("warnings")), rb_str_new2(warnings.c_str()));
 
+    rb_hash_aset(ret, ID2SYM(rb_intern("materials")), rb_funcall(self, rb_intern("materials"), 0));
     rb_hash_aset(ret, ID2SYM(rb_intern("vertices")),  rb_funcall(self, rb_intern("vertices"),  0));
     rb_hash_aset(ret, ID2SYM(rb_intern("normals")),   rb_funcall(self, rb_intern("normals"),   0));
     rb_hash_aset(ret, ID2SYM(rb_intern("texcoords")), rb_funcall(self, rb_intern("texcoords"), 0));

data/lib/tiny_obj/version.rb

@@ -1,3 +1,3 @@
 module TinyOBJ
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_obj
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Colin MacKenzie IV