GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-07-14 15:51:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Initialize light and emitter members. Fixes #431

Browse Source 
Include `light` and `emitter` comparison in Node::operator==()
This commit is contained in:
Syoyo Fujita 2023-06-19 21:52:13 +09:00
parent e12e0a9392
commit 7a570c88d9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tiny_gltf.h
View File

@ -1039,19 +1039,19 @@ struct Mesh {
class Node { class Node {
public: public:
Node() : camera(-1), skin(-1), mesh(-1) {} Node() : camera(-1), skin(-1), mesh(-1), light(-1), emitter(-1) {}
DEFAULT_METHODS(Node) DEFAULT_METHODS(Node)
bool operator==(const Node &) const; bool operator==(const Node &) const;
int camera; // the index of the camera referenced by this node int camera{-1}; // the index of the camera referenced by this node
std::string name; std::string name;
int skin; int skin{-1};
int mesh; int mesh{-1};
int light; // light source index (KHR_lights_punctual) int light{-1}; // light source index (KHR_lights_punctual)
int emitter; // audio emitter index (KHR_audio) int emitter{-1}; // audio emitter index (KHR_audio)
std::vector<int> children; std::vector<int> children;
std::vector<double> rotation; // length must be 0 or 4 std::vector<double> rotation; // length must be 0 or 4
std::vector<double> scale; // length must be 0 or 3 std::vector<double> scale; // length must be 0 or 3
@ -2089,6 +2089,8 @@ bool Node::operator==(const Node &other) const {
return this->camera == other.camera && this->children == other.children && return this->camera == other.camera && this->children == other.children &&
this->extensions == other.extensions && this->extras == other.extras && this->extensions == other.extensions && this->extras == other.extras &&
Equals(this->matrix, other.matrix) && this->mesh == other.mesh && Equals(this->matrix, other.matrix) && this->mesh == other.mesh &&
(this->light == other.light) &&
(this->emitter == other.emitter) &&
this->name == other.name && Equals(this->rotation, other.rotation) && this->name == other.name && Equals(this->rotation, other.rotation) &&
Equals(this->scale, other.scale) && this->skin == other.skin && Equals(this->scale, other.scale) && this->skin == other.skin &&
Equals(this->translation, other.translation) && Equals(this->translation, other.translation) &&
@ -4172,7 +4174,7 @@ static bool ParseExtensionsProperty(ExtensionMap *ret, std::string *err,
template <typename GltfType> template <typename GltfType>
static bool ParseExtrasAndExtensions(GltfType * target, std::string *err, static bool ParseExtrasAndExtensions(GltfType * target, std::string *err,
const detail::json & o, bool store_json_strings) { const detail::json & o, bool store_json_strings) {
ParseExtensionsProperty(&target->extensions, err, o); ParseExtensionsProperty(&target->extensions, err, o);
ParseExtrasProperty(&target->extras, o); ParseExtrasProperty(&target->extras, o);
@ -5098,7 +5100,7 @@ static bool ParseNode(Node *node, std::string *err, const detail::json &o,
} }
} }
node->emitter = emitter; node->emitter = emitter;
return true; return true;
} }
@ -7018,7 +7020,7 @@ static void SerializeExtensionMap(const ExtensionMap &extensions, detail::json &
} }
static void SerializeExtras(const Value & extras, detail::json & o) { static void SerializeExtras(const Value & extras, detail::json & o) {
if (extras.Type() != NULL_TYPE) if (extras.Type() != NULL_TYPE)
SerializeValue("extras", extras, o); SerializeValue("extras", extras, o);
} }