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

parse additional light properties and fix defaults

Browse Source
This commit is contained in:
Benjamin Schmithüsen 2019-07-09 16:32:42 +02:00
parent b7ca7c9381
commit b2d7d88dbc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tiny_gltf.h
View File

@ -817,7 +817,7 @@ struct SpotLight {
double innerConeAngle; double innerConeAngle;
double outerConeAngle; double outerConeAngle;
SpotLight() : innerConeAngle(0.0), outerConeAngle(0.0) { } SpotLight() : innerConeAngle(0.0), outerConeAngle(0.7853981634) { }
bool operator==(const SpotLight &) const; bool operator==(const SpotLight &) const;
@ -833,7 +833,7 @@ struct Light {
double range; double range;
SpotLight spot; SpotLight spot;
Light() : intensity(0.0), range(0.0) {} Light() : intensity(1.0), range(0.0) {}
bool operator==(const Light &) const; bool operator==(const Light &) const;
@ -3853,7 +3853,9 @@ static bool ParseLight(Light *light, std::string *err, const json &o) {
ParseStringProperty(&light->name, err, o, "name", false); ParseStringProperty(&light->name, err, o, "name", false);
ParseNumberArrayProperty(&light->color, err, o, "color", false); ParseNumberArrayProperty(&light->color, err, o, "color", false);
ParseStringProperty(&light->type, err, o, "type", false); ParseStringProperty(&light->type, err, o, "type", true);
ParseNumberProperty(&light->range, err, o, "range", false);
ParseNumberProperty(&light->intensity, err, o, "intensity", false);
ParseExtensionsProperty(&light->extensions, err, o); ParseExtensionsProperty(&light->extensions, err, o);
ParseExtrasProperty(&(light->extras), o); ParseExtrasProperty(&(light->extras), o);
return true; return true;