Browse Source

Merge pull request #2158 from migenius/migenius-rsws52

Merge fix to prevent errors when orthographic cameras encountered in glTF 2.0
Kim Kulling 7 years ago
parent
commit
bf347b82ed
1 changed files with 6 additions and 1 deletions
  1. 6 1
      code/glTF2Asset.inl

+ 6 - 1
code/glTF2Asset.inl

@@ -1023,7 +1023,12 @@ inline void Mesh::Read(Value& pJSON_Object, Asset& pAsset_Root)
 
 inline void Camera::Read(Value& obj, Asset& /*r*/)
 {
-    type = MemberOrDefault(obj, "type", Camera::Perspective);
+    std::string type_string = std::string(MemberOrDefault(obj, "type", "perspective"));
+    if (type_string == "orthographic") {
+        type = Camera::Orthographic;
+    } else {
+        type = Camera::Perspective;
+    }
 
     const char* subobjId = (type == Camera::Orthographic) ? "orthographic" : "perspective";