Suppress clang warnigns.

Refactor code to use C++11 features.

tiny_gltf.h

@@ -37,6 +37,7 @@
 #ifndef TINY_GLTF_H_
 #define TINY_GLTF_H_
 
+#include <cstdint>
 #include <cassert>
 #include <cstring>
 #include <map>
@@ -144,7 +145,7 @@ typedef enum {
   OBJECT_TYPE = 7
 } Type;
 
-static inline int GetComponentSizeInBytes(unsigned int componentType)
+static inline int32_t GetComponentSizeInBytes(uint32_t componentType)
 {
   if (componentType == TINYGLTF_COMPONENT_TYPE_BYTE) {
     return 1;
@@ -168,7 +169,7 @@ static inline int GetComponentSizeInBytes(unsigned int componentType)
   }
 }
 
-static inline int GetTypeSizeInBytes(unsigned int ty)
+static inline int32_t GetTypeSizeInBytes(uint32_t ty)
 {
   if (ty == TINYGLTF_TYPE_SCALAR) {
     return 1;
@@ -195,6 +196,7 @@ static inline int GetTypeSizeInBytes(unsigned int ty)
 // Suppress warning for : static Value null_value
 // https://stackoverflow.com/questions/15708411/how-to-deal-with-global-constructor-warning-in-clang
 #pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wpadded"
 #endif
 
 // Simple class to represent JSON object
@@ -299,15 +301,13 @@ class Value {
   Array array_value_;
   Object object_value_;
   bool boolean_value_;
-  char _pad[3];
-
-  int _pad0;
 };
 
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
 
+
 #define TINYGLTF_VALUE_GET(ctype, var)            \
   template <>                                     \
   inline const ctype &Value::Get<ctype>() const { \
@@ -326,6 +326,12 @@ TINYGLTF_VALUE_GET(Value::Array, array_value_)
 TINYGLTF_VALUE_GET(Value::Object, object_value_)
 #undef TINYGLTF_VALUE_GET
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat"
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
 ///Agregate object for representing a color
 using ColorValue = std::array<double, 4>;
 
@@ -369,6 +375,15 @@ using ColorValue = std::array<double, 4>;
   }
 };
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
 typedef std::map<std::string, Parameter> ParameterMap;
 
 struct AnimationChannel {
@@ -420,7 +435,6 @@ struct Sampler {
   int wrapT;      // ["CLAMP_TO_EDGE", "MIRRORED_REPEAT", "REPEAT"], default
                   // "REPEAT"
   int wrapR;      // TinyGLTF extension
-  int _pad0;
   Value extras;
 
   Sampler()
@@ -433,7 +447,6 @@ struct Image {
   int width;
   int height;
   int component;
-  int _pad0;
   std::vector<unsigned char> image;
   int bufferView;        // (required if no uri)
   std::string mimeType;  // (required if no uri) ["image/jpeg", "image/png"]
@@ -472,7 +485,6 @@ struct BufferView {
   size_t byteStride;  // minimum 4, maximum 252 (multiple of 4), default 0 =
                       // understood to be tightly packed
   int target;         // ["ARRAY_BUFFER", "ELEMENT_ARRAY_BUFFER"]
-  int _pad0;
   Value extras;
 
   BufferView() : byteOffset(0), byteStride(0) {}
@@ -501,12 +513,12 @@ struct Accessor {
   int ByteStride(const BufferView &bufferViewObject) const {
     if (bufferViewObject.byteStride == 0) {
       // Assume data is tightly packed.
-      int componentSizeInBytes = GetComponentSizeInBytes(componentType);
+      int componentSizeInBytes = GetComponentSizeInBytes(static_cast<uint32_t>(componentType));
       if (componentSizeInBytes <= 0) {
         return -1;
       }
 
-      int typeSizeInBytes = GetTypeSizeInBytes(type);
+      int typeSizeInBytes = GetTypeSizeInBytes(static_cast<uint32_t>(type));
       if (typeSizeInBytes <= 0) {
         return -1;
       }
@@ -514,12 +526,12 @@ struct Accessor {
       return componentSizeInBytes * typeSizeInBytes;
     } else {
       // Check if byteStride is a mulple of the size of the accessor's component type.
-      int componentSizeInBytes = GetComponentSizeInBytes(componentType);
+      int componentSizeInBytes = GetComponentSizeInBytes(static_cast<uint32_t>(componentType));
       if (componentSizeInBytes <= 0) {
         return -1;
       }
 
-      if ((bufferViewObject.byteStride % componentSizeInBytes) != 0) {
+      if ((bufferViewObject.byteStride % uint32_t(componentSizeInBytes)) != 0) {
         return -1;
       }
       return static_cast<int>(bufferViewObject.byteStride);
@@ -607,6 +619,23 @@ class Node {
  public:
   Node() : camera(-1), skin(-1), mesh(-1) {}
 
+  Node(const Node &rhs) {
+    camera = rhs.camera;
+
+    name = rhs.name;
+    skin = rhs.skin;
+    mesh = rhs.mesh;
+    children = rhs.children;
+    rotation = rhs.rotation;
+    scale = rhs.scale;
+    translation = rhs.translation;
+    matrix = rhs.matrix;
+    weights = rhs.weights;
+
+    extras = rhs.extras;
+    extLightsValues = rhs.extLightsValues;
+  }
+
   ~Node() {}
 
   int camera;  // the index of the camera referenced by this node
@@ -696,11 +725,22 @@ enum SectionCheck {
   REQUIRE_ALL = 0x3f
 };
 
+
 class TinyGLTF {
  public:
-  TinyGLTF() : bin_data_(NULL), bin_size_(0), is_binary_(false) {
+
-    _pad[0] = _pad[1] = _pad[2] = _pad[3] = _pad[4] = _pad[5] = _pad[6] = 0;
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat"
+#endif
+
+  TinyGLTF() : bin_data_(nullptr), bin_size_(0), is_binary_(false) {
   }
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
   ~TinyGLTF() {}
 
   ///
@@ -761,9 +801,12 @@ class TinyGLTF {
   const unsigned char *bin_data_;
   size_t bin_size_;
   bool is_binary_;
-  char _pad[7];
 };
 
+#ifdef __clang__
+#pragma clang diagnostic pop // -Wpadded
+#endif
+
 }  // namespace tinygltf
 
 #endif  // TINY_GLTF_H_
@@ -790,9 +833,17 @@ class TinyGLTF {
 #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
 #pragma clang diagnostic ignored "-Wswitch-enum"
 #pragma clang diagnostic ignored "-Wimplicit-fallthrough"
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#pragma clang diagnostic ignored "-Wcovered-switch-default"
 #if __has_warning("-Wcomma")
 #pragma clang diagnostic ignored "-Wcomma"
 #endif
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+#if __has_warning("-Wcast-qual")
+#pragma clang diagnostic ignored "-Wcast-qual"
+#endif
 #endif
 
 #include "./json.hpp"
@@ -817,10 +868,15 @@ class TinyGLTF {
 
 using nlohmann::json;
 
-#if __APPLE__
+#ifdef __APPLE__
     #include "TargetConditionals.h"
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat"
+#endif
+
 namespace tinygltf {
 
 static void swap4(unsigned int *val) {
@@ -1563,7 +1619,7 @@ static bool ParseImage(Image *image, std::string *err,
     if (!loaded) {
       // load data from (embedded) binary data
 
-      if ((bin_size == 0) || (bin_data == NULL)) {
+      if ((bin_size == 0) || (bin_data == nullptr)) {
         if (err) {
           (*err) += "Invalid binary data.\n";
         }
@@ -1646,7 +1702,7 @@ static bool ParseTexture(Texture *texture, std::string *err,
 static bool ParseBuffer(Buffer *buffer, std::string *err,
                         const json &o, const std::string &basedir,
                         bool is_binary = false,
-                        const unsigned char *bin_data = NULL,
+                        const unsigned char *bin_data = nullptr,
                         size_t bin_size = 0) {
   double byteLength;
   if (!ParseNumberProperty(&byteLength, err, o, "byteLength", true, "Buffer")) {
@@ -1684,7 +1740,7 @@ static bool ParseBuffer(Buffer *buffer, std::string *err,
     } else {
       // load data from (embedded) binary data
 
-      if ((bin_size == 0) || (bin_data == NULL)) {
+      if ((bin_size == 0) || (bin_data == nullptr)) {
         if (err) {
           (*err) += "Invalid binary data in `Buffer'.\n";
         }
@@ -2051,24 +2107,24 @@ static bool ParseNode(Node *node, std::string *err, const json &o) {
   json::const_iterator extensions_object = o.find("extensions");
   if ((extensions_object != o.end()) &&
       extensions_object.value().is_object()) {
-    const json &values_object =
+    const json &ext_values_object =
       extensions_object.value();
 
-    json::const_iterator it(values_object.begin());
+    json::const_iterator it(ext_values_object.begin());
-    json::const_iterator itEnd(values_object.end());
+    json::const_iterator itEnd(ext_values_object.end());
 
     for (; it != itEnd; it++) {
       if ((it.key().compare("KHR_lights_cmn") == 0) &&
          it.value().is_object()) {
-        const json &values_object =
+        const json &light_values_object =
           it.value();
 
-        json::const_iterator itVal(values_object.begin());
+        json::const_iterator itVal(light_values_object.begin());
-        json::const_iterator itValEnd(values_object.end());
+        json::const_iterator itValEnd(light_values_object.end());
 
         for (; itVal != itValEnd; itVal++) {
           Parameter param;
-          if (ParseParameterProperty(&param, err, values_object, itVal.key(),
+          if (ParseParameterProperty(&param, err, light_values_object, itVal.key(),
                 false)) {
             node->extLightsValues[itVal.key()] = param;
           }
@@ -3000,7 +3056,7 @@ bool TinyGLTF::LoadASCIIFromString(Model *model, std::string *err,
                                    const std::string &base_dir,
                                    unsigned int check_sections) {
   is_binary_ = false;
-  bin_data_ = NULL;
+  bin_data_ = nullptr;
   bin_size_ = 0;
 
   return LoadFromString(model, err, str, length, base_dir, check_sections);
@@ -3737,4 +3793,8 @@ bool TinyGLTF::WriteGltfSceneToFile(
 
 }  // namespace tinygltf
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 #endif  // TINYGLTF_IMPLEMENTATION