tiny_gltf 1.0.1 → 2.5.0.2

data/ext/tiny_gltf/rb_tiny_gltf.h

@@ -7,6 +7,7 @@
 #endif
 
 #include <time.h> // work around C++/C linkage error on some platforms
+#include "ruby.h"
 
 #if __cplusplus
   #include <algorithm>
@@ -15,8 +16,6 @@
   extern "C" {
 #endif
 
-#include "ruby.h"
-
 void Init_tiny_gltf(void);
 VALUE rb_tgltf_load(int argc, VALUE *argv, VALUE self);
 

data/ext/tiny_gltf/rb_tiny_gltf_mesh.cpp

@@ -11,7 +11,7 @@ VALUE rMesh_new(const Mesh *mesh, VALUE rmodel) {
 
   VALUE rweights = rb_ary_new();
   for (size_t i = 0; i < mesh->weights.size(); i++) {
-    rb_ary_push(rprimitives, DBL2NUM(mesh->weights[i]));
+    rb_ary_push(rweights, DBL2NUM(mesh->weights[i]));
   }
 
   rb_ivar_set(rmesh, rb_intern("@model"),          rmodel);

data/ext/tiny_gltf/rb_tiny_gltf_node.cpp

@@ -16,38 +16,38 @@ VALUE rNode_new(const Node *node, VALUE rmodel) {
   if (node->matrix.size() == 0) {
     rrotation = rb_ary_new();
     if (node->rotation.size() == 0) {
-      rb_ary_push(rrotation, INT2NUM(0));
-      rb_ary_push(rrotation, INT2NUM(0));
-      rb_ary_push(rrotation, INT2NUM(0));
-      rb_ary_push(rrotation, INT2NUM(1));
+      rb_ary_push(rrotation, DBL2NUM(0.0));
+      rb_ary_push(rrotation, DBL2NUM(0.0));
+      rb_ary_push(rrotation, DBL2NUM(0.0));
+      rb_ary_push(rrotation, DBL2NUM(1.0));
     } else {
       for (size_t i = 0; i < node->rotation.size(); i++)
-        rb_ary_push(rrotation, INT2NUM(node->rotation[i]));
+        rb_ary_push(rrotation, DBL2NUM(node->rotation[i]));
     }
 
     rscale = rb_ary_new();
     if (node->rotation.size() == 0) {
-      rb_ary_push(rscale, INT2NUM(0));
-      rb_ary_push(rscale, INT2NUM(0));
-      rb_ary_push(rscale, INT2NUM(0));
+      rb_ary_push(rscale, DBL2NUM(0.0));
+      rb_ary_push(rscale, DBL2NUM(0.0));
+      rb_ary_push(rscale, DBL2NUM(0.0));
     } else {
       for (size_t i = 0; i < node->scale.size(); i++)
-        rb_ary_push(rscale, INT2NUM(node->scale[i]));
+        rb_ary_push(rscale, DBL2NUM(node->scale[i]));
     }
 
     rtranslation = rb_ary_new();
     if (node->translation.size() == 0) {
-      rb_ary_push(rtranslation, INT2NUM(0));
-      rb_ary_push(rtranslation, INT2NUM(0));
-      rb_ary_push(rtranslation, INT2NUM(0));
+      rb_ary_push(rtranslation, DBL2NUM(0.0));
+      rb_ary_push(rtranslation, DBL2NUM(0.0));
+      rb_ary_push(rtranslation, DBL2NUM(0.0));
     } else {
       for (size_t i = 0; i < node->translation.size(); i++)
-        rb_ary_push(rtranslation, INT2NUM(node->translation[i]));
+        rb_ary_push(rtranslation, DBL2NUM(node->translation[i]));
     }
   } else {
     rmatrix = rb_ary_new();
     for (size_t i = 0; i < node->matrix.size(); i++)
-      rb_ary_push(rmatrix, INT2NUM(node->matrix[i]));
+      rb_ary_push(rmatrix, DBL2NUM(node->matrix[i]));
   }
 
   rb_ivar_set(rnode, rb_intern("@model"),            rmodel);

data/ext/tiny_gltf/rb_tiny_gltf_sampler.cpp

@@ -10,7 +10,9 @@ VALUE rSampler_new(const Sampler *sampler, VALUE rmodel) {
   rb_ivar_set(rsampler, rb_intern("@mag_filter"), texture_filter_to_sym(sampler->magFilter));
   rb_ivar_set(rsampler, rb_intern("@wrap_s"),     texture_wrap_to_sym(sampler->wrapS));
   rb_ivar_set(rsampler, rb_intern("@wrap_t"),     texture_wrap_to_sym(sampler->wrapT));
-  rb_ivar_set(rsampler, rb_intern("@wrap_r"),     texture_wrap_to_sym(sampler->wrapR));
+  // removed from tiny_gltf until a spec or extension actually calls for it
+  // https://github.com/syoyo/tinygltf/issues/287
+  // rb_ivar_set(rsampler, rb_intern("@wrap_r"),     texture_wrap_to_sym(sampler->wrapR));
   rb_ivar_set(rsampler, rb_intern("@extras"),     rValue_new(&sampler->extras, rmodel));
 
   return rsampler;