Merge pull request #144 from CesiumGS/initialize-gltf-handler-members

Initialize member of handlers
CesiumGS · Mar 5, 2021 · 3e45ddf · 3e45ddf
2 parents 5d991f9 + 60b6a46
commit 3e45ddf
Show file tree

Hide file tree

Showing 30 changed files with 30 additions and 30 deletions.
diff --git a/CesiumGltfReader/generated/AccessorJsonHandler.h b/CesiumGltfReader/generated/AccessorJsonHandler.h
@@ -34,7 +34,7 @@ namespace CesiumGltf {
       Accessor::Type* _pEnum = nullptr;
     };
 
-    Accessor* _pObject;
+    Accessor* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _bufferView;
     IntegerJsonHandler<int64_t> _byteOffset;
     IntegerJsonHandler<Accessor::ComponentType> _componentType;

diff --git a/CesiumGltfReader/generated/AccessorSparseIndicesJsonHandler.h b/CesiumGltfReader/generated/AccessorSparseIndicesJsonHandler.h
@@ -22,7 +22,7 @@ namespace CesiumGltf {
 
   private:
 
-    AccessorSparseIndices* _pObject;
+    AccessorSparseIndices* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _bufferView;
     IntegerJsonHandler<int64_t> _byteOffset;
     IntegerJsonHandler<AccessorSparseIndices::ComponentType> _componentType;

diff --git a/CesiumGltfReader/generated/AccessorSparseJsonHandler.h b/CesiumGltfReader/generated/AccessorSparseJsonHandler.h
@@ -23,7 +23,7 @@ namespace CesiumGltf {
 
   private:
 
-    AccessorSparse* _pObject;
+    AccessorSparse* _pObject = nullptr;
     IntegerJsonHandler<int64_t> _count;
     AccessorSparseIndicesJsonHandler _indices;
     AccessorSparseValuesJsonHandler _values;

diff --git a/CesiumGltfReader/generated/AccessorSparseValuesJsonHandler.h b/CesiumGltfReader/generated/AccessorSparseValuesJsonHandler.h
@@ -21,7 +21,7 @@ namespace CesiumGltf {
 
   private:
 
-    AccessorSparseValues* _pObject;
+    AccessorSparseValues* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _bufferView;
     IntegerJsonHandler<int64_t> _byteOffset;
   };

diff --git a/CesiumGltfReader/generated/AnimationChannelJsonHandler.h b/CesiumGltfReader/generated/AnimationChannelJsonHandler.h
@@ -22,7 +22,7 @@ namespace CesiumGltf {
 
   private:
 
-    AnimationChannel* _pObject;
+    AnimationChannel* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _sampler;
     AnimationChannelTargetJsonHandler _target;
   };

diff --git a/CesiumGltfReader/generated/AnimationChannelTargetJsonHandler.h b/CesiumGltfReader/generated/AnimationChannelTargetJsonHandler.h
@@ -30,7 +30,7 @@ namespace CesiumGltf {
       AnimationChannelTarget::Path* _pEnum = nullptr;
     };
 
-    AnimationChannelTarget* _pObject;
+    AnimationChannelTarget* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _node;
     PathJsonHandler _path;
   };

diff --git a/CesiumGltfReader/generated/AnimationJsonHandler.h b/CesiumGltfReader/generated/AnimationJsonHandler.h
@@ -23,7 +23,7 @@ namespace CesiumGltf {
 
   private:
 
-    Animation* _pObject;
+    Animation* _pObject = nullptr;
     ArrayJsonHandler<AnimationChannel, AnimationChannelJsonHandler> _channels;
     ArrayJsonHandler<AnimationSampler, AnimationSamplerJsonHandler> _samplers;
   };

diff --git a/CesiumGltfReader/generated/AnimationSamplerJsonHandler.h b/CesiumGltfReader/generated/AnimationSamplerJsonHandler.h
@@ -30,7 +30,7 @@ namespace CesiumGltf {
       AnimationSampler::Interpolation* _pEnum = nullptr;
     };
 
-    AnimationSampler* _pObject;
+    AnimationSampler* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _input;
     InterpolationJsonHandler _interpolation;
     IntegerJsonHandler<int32_t> _output;

diff --git a/CesiumGltfReader/generated/AssetJsonHandler.h b/CesiumGltfReader/generated/AssetJsonHandler.h
@@ -21,7 +21,7 @@ namespace CesiumGltf {
 
   private:
 
-    Asset* _pObject;
+    Asset* _pObject = nullptr;
     StringJsonHandler _copyright;
     StringJsonHandler _generator;
     StringJsonHandler _version;

diff --git a/CesiumGltfReader/generated/BufferJsonHandler.h b/CesiumGltfReader/generated/BufferJsonHandler.h
@@ -22,7 +22,7 @@ namespace CesiumGltf {
 
   private:
 
-    Buffer* _pObject;
+    Buffer* _pObject = nullptr;
     StringJsonHandler _uri;
     IntegerJsonHandler<int64_t> _byteLength;
   };

diff --git a/CesiumGltfReader/generated/BufferViewJsonHandler.h b/CesiumGltfReader/generated/BufferViewJsonHandler.h
@@ -22,7 +22,7 @@ namespace CesiumGltf {
 
   private:
 
-    BufferView* _pObject;
+    BufferView* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _buffer;
     IntegerJsonHandler<int64_t> _byteOffset;
     IntegerJsonHandler<int64_t> _byteLength;

diff --git a/CesiumGltfReader/generated/CameraJsonHandler.h b/CesiumGltfReader/generated/CameraJsonHandler.h
@@ -31,7 +31,7 @@ namespace CesiumGltf {
       Camera::Type* _pEnum = nullptr;
     };
 
-    Camera* _pObject;
+    Camera* _pObject = nullptr;
     CameraOrthographicJsonHandler _orthographic;
     CameraPerspectiveJsonHandler _perspective;
     TypeJsonHandler _type;

diff --git a/CesiumGltfReader/generated/CameraOrthographicJsonHandler.h b/CesiumGltfReader/generated/CameraOrthographicJsonHandler.h
@@ -21,7 +21,7 @@ namespace CesiumGltf {
 
   private:
 
-    CameraOrthographic* _pObject;
+    CameraOrthographic* _pObject = nullptr;
     DoubleJsonHandler _xmag;
     DoubleJsonHandler _ymag;
     DoubleJsonHandler _zfar;

diff --git a/CesiumGltfReader/generated/CameraPerspectiveJsonHandler.h b/CesiumGltfReader/generated/CameraPerspectiveJsonHandler.h
@@ -21,7 +21,7 @@ namespace CesiumGltf {
 
   private:
 
-    CameraPerspective* _pObject;
+    CameraPerspective* _pObject = nullptr;
     DoubleJsonHandler _aspectRatio;
     DoubleJsonHandler _yfov;
     DoubleJsonHandler _zfar;

diff --git a/CesiumGltfReader/generated/ImageJsonHandler.h b/CesiumGltfReader/generated/ImageJsonHandler.h
@@ -31,7 +31,7 @@ namespace CesiumGltf {
       Image::MimeType* _pEnum = nullptr;
     };
 
-    Image* _pObject;
+    Image* _pObject = nullptr;
     StringJsonHandler _uri;
     MimeTypeJsonHandler _mimeType;
     IntegerJsonHandler<int32_t> _bufferView;

diff --git a/CesiumGltfReader/generated/KHR_draco_mesh_compressionJsonHandler.h b/CesiumGltfReader/generated/KHR_draco_mesh_compressionJsonHandler.h
@@ -22,7 +22,7 @@ namespace CesiumGltf {
 
   private:
 
-    KHR_draco_mesh_compression* _pObject;
+    KHR_draco_mesh_compression* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _bufferView;
     DictionaryJsonHandler<int32_t, IntegerJsonHandler<int32_t>> _attributes;
   };

diff --git a/CesiumGltfReader/generated/MaterialJsonHandler.h b/CesiumGltfReader/generated/MaterialJsonHandler.h
@@ -36,7 +36,7 @@ namespace CesiumGltf {
       Material::AlphaMode* _pEnum = nullptr;
     };
 
-    Material* _pObject;
+    Material* _pObject = nullptr;
     MaterialPBRMetallicRoughnessJsonHandler _pbrMetallicRoughness;
     MaterialNormalTextureInfoJsonHandler _normalTexture;
     MaterialOcclusionTextureInfoJsonHandler _occlusionTexture;

diff --git a/CesiumGltfReader/generated/MaterialNormalTextureInfoJsonHandler.h b/CesiumGltfReader/generated/MaterialNormalTextureInfoJsonHandler.h
@@ -21,7 +21,7 @@ namespace CesiumGltf {
 
   private:
 
-    MaterialNormalTextureInfo* _pObject;
+    MaterialNormalTextureInfo* _pObject = nullptr;
     DoubleJsonHandler _scale;
   };
 }
diff --git a/CesiumGltfReader/generated/MaterialOcclusionTextureInfoJsonHandler.h b/CesiumGltfReader/generated/MaterialOcclusionTextureInfoJsonHandler.h
@@ -21,7 +21,7 @@ namespace CesiumGltf {
 
   private:
 
-    MaterialOcclusionTextureInfo* _pObject;
+    MaterialOcclusionTextureInfo* _pObject = nullptr;
     DoubleJsonHandler _strength;
   };
 }
diff --git a/CesiumGltfReader/generated/MaterialPBRMetallicRoughnessJsonHandler.h b/CesiumGltfReader/generated/MaterialPBRMetallicRoughnessJsonHandler.h
@@ -23,7 +23,7 @@ namespace CesiumGltf {
 
   private:
 
-    MaterialPBRMetallicRoughness* _pObject;
+    MaterialPBRMetallicRoughness* _pObject = nullptr;
     ArrayJsonHandler<double, DoubleJsonHandler> _baseColorFactor;
     TextureInfoJsonHandler _baseColorTexture;
     DoubleJsonHandler _metallicFactor;

diff --git a/CesiumGltfReader/generated/MeshJsonHandler.h b/CesiumGltfReader/generated/MeshJsonHandler.h
@@ -23,7 +23,7 @@ namespace CesiumGltf {
 
   private:
 
-    Mesh* _pObject;
+    Mesh* _pObject = nullptr;
     ArrayJsonHandler<MeshPrimitive, MeshPrimitiveJsonHandler> _primitives;
     ArrayJsonHandler<double, DoubleJsonHandler> _weights;
   };

diff --git a/CesiumGltfReader/generated/MeshPrimitiveJsonHandler.h b/CesiumGltfReader/generated/MeshPrimitiveJsonHandler.h
@@ -34,7 +34,7 @@ namespace CesiumGltf {
       KHR_draco_mesh_compressionJsonHandler _KHR_draco_mesh_compression;
     };
 
-    MeshPrimitive* _pObject;
+    MeshPrimitive* _pObject = nullptr;
     DictionaryJsonHandler<int32_t, IntegerJsonHandler<int32_t>> _attributes;
     IntegerJsonHandler<int32_t> _indices;
     IntegerJsonHandler<int32_t> _material;

diff --git a/CesiumGltfReader/generated/ModelJsonHandler.h b/CesiumGltfReader/generated/ModelJsonHandler.h
@@ -37,7 +37,7 @@ namespace CesiumGltf {
 
   private:
 
-    Model* _pObject;
+    Model* _pObject = nullptr;
     ArrayJsonHandler<std::string, StringJsonHandler> _extensionsUsed;
     ArrayJsonHandler<std::string, StringJsonHandler> _extensionsRequired;
     ArrayJsonHandler<Accessor, AccessorJsonHandler> _accessors;

diff --git a/CesiumGltfReader/generated/NodeJsonHandler.h b/CesiumGltfReader/generated/NodeJsonHandler.h
@@ -23,7 +23,7 @@ namespace CesiumGltf {
 
   private:
 
-    Node* _pObject;
+    Node* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _camera;
     ArrayJsonHandler<int32_t, IntegerJsonHandler<int32_t>> _children;
     IntegerJsonHandler<int32_t> _skin;

diff --git a/CesiumGltfReader/generated/SamplerJsonHandler.h b/CesiumGltfReader/generated/SamplerJsonHandler.h
@@ -22,7 +22,7 @@ namespace CesiumGltf {
 
   private:
 
-    Sampler* _pObject;
+    Sampler* _pObject = nullptr;
     IntegerJsonHandler<Sampler::MagFilter> _magFilter;
     IntegerJsonHandler<Sampler::MinFilter> _minFilter;
     IntegerJsonHandler<Sampler::WrapS> _wrapS;

diff --git a/CesiumGltfReader/generated/SceneJsonHandler.h b/CesiumGltfReader/generated/SceneJsonHandler.h
@@ -22,7 +22,7 @@ namespace CesiumGltf {
 
   private:
 
-    Scene* _pObject;
+    Scene* _pObject = nullptr;
     ArrayJsonHandler<int32_t, IntegerJsonHandler<int32_t>> _nodes;
   };
 }
diff --git a/CesiumGltfReader/generated/SkinJsonHandler.h b/CesiumGltfReader/generated/SkinJsonHandler.h
@@ -22,7 +22,7 @@ namespace CesiumGltf {
 
   private:
 
-    Skin* _pObject;
+    Skin* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _inverseBindMatrices;
     IntegerJsonHandler<int32_t> _skeleton;
     ArrayJsonHandler<int32_t, IntegerJsonHandler<int32_t>> _joints;

diff --git a/CesiumGltfReader/generated/TextureInfoJsonHandler.h b/CesiumGltfReader/generated/TextureInfoJsonHandler.h
@@ -21,7 +21,7 @@ namespace CesiumGltf {
 
   private:
 
-    TextureInfo* _pObject;
+    TextureInfo* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _index;
     IntegerJsonHandler<int64_t> _texCoord;
   };

diff --git a/CesiumGltfReader/generated/TextureJsonHandler.h b/CesiumGltfReader/generated/TextureJsonHandler.h
@@ -21,7 +21,7 @@ namespace CesiumGltf {
 
   private:
 
-    Texture* _pObject;
+    Texture* _pObject = nullptr;
     IntegerJsonHandler<int32_t> _sampler;
     IntegerJsonHandler<int32_t> _source;
   };

diff --git a/tools/generate-gltf-classes/generate.js b/tools/generate-gltf-classes/generate.js
@@ -110,7 +110,7 @@ function generate(options, schema) {
           private:
             ${indent(readerLocalTypes.join("\n\n"), 12)}
 
-            ${name}* _pObject;
+            ${name}* _pObject = nullptr;
             ${indent(
               properties
                 .map((property) => formatReaderProperty(property))