dqn
/
FBX2glTF
mirror of https://github.com/facebookincubator/FBX2glTF.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 'spot' light export.

This commit is contained in:
Par Winzell 2019-02-21 12:45:02 -08:00
parent 5ec3184a8a
commit 70c3823eb7
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fbx/Fbx2Raw.cpp
View File

@ -479,8 +479,8 @@ static void ReadLight(RawModel& raw, FbxScene* pScene, FbxNode* pNode) {
RAW_LIGHT_TYPE_SPOT, RAW_LIGHT_TYPE_SPOT,
color, color,
intensity, intensity,
(float)pLight->InnerAngle.Get(), (float)pLight->InnerAngle.Get() * M_PI / 180,
(float)pLight->OuterAngle.Get()); (float)pLight->OuterAngle.Get() * M_PI / 180);
break; break;
} }
default: { default: {

8
src/gltf/properties/LightData.cpp
View File

@ -34,6 +34,14 @@ json LightData::serialize() const {
break; break;
case Spot: case Spot:
result["type"] = "spot"; result["type"] = "spot";
json spotJson;
if (innerConeAngle != 0) {
spotJson["innerConeAngle"] = innerConeAngle;
}
if (outerConeAngle != M_PI_4) {
spotJson["outerConeAngle"] = outerConeAngle;
}
result["spot"] = spotJson;
break; break;
} }
return result; return result;