asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for #12056, though GTLF import of that file is still incorrect.

Browse source
This commit is contained in:
Webster Sheets 2017-11-12 15:23:11 -05:00
parent 47e5b43160
commit 05dce362d5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/import/editor_scene_importer_gltf.cpp
View file

@ -1,5 +1,6 @@
#include "editor_scene_importer_gltf.h"
#include "io/json.h"
#include "math_defs.h"
#include "os/file_access.h"
#include "os/os.h"
#include "scene/3d/camera.h"
@ -1378,8 +1379,8 @@ Error EditorSceneImporterGLTF::_parse_skins(GLTFState &state) {
state.nodes[skin_node]->skeleton_children.push_back(i);
}
state.skins.push_back(skin);
}
state.skins.push_back(skin);
}
print_line("total skins: " + itos(state.skins.size()));
@ -1419,7 +1420,8 @@ Error EditorSceneImporterGLTF::_parse_cameras(GLTFState &state) {
camera.perspective = true;
if (d.has("perspective")) {
Dictionary ppt = d["perspective"];
camera.fov_size = ppt["yfov"];
// GLTF spec is in radians, Godot's camera is in degrees.
camera.fov_size = (double)ppt["yfov"] * 180.0 / Math_PI;
camera.zfar = ppt["zfar"];
camera.znear = ppt["znear"];
} else {