summaryrefslogtreecommitdiffstats
path: root/AssetLoader/interface
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2021-01-08 06:15:45 +0000
committerassiduous <assiduous@diligentgraphics.com>2021-01-08 06:15:45 +0000
commitd3e988f5d07ef52786f9cda1b4f4cd20ca7282e9 (patch)
treeca63305646f81d20752e25f553e8296f83fb40d2 /AssetLoader/interface
parentGLTF Loader: added camera loading (diff)
downloadDiligentTools-d3e988f5d07ef52786f9cda1b4f4cd20ca7282e9.tar.gz
DiligentTools-d3e988f5d07ef52786f9cda1b4f4cd20ca7282e9.zip
Fixed clang/gcc build error
Diffstat (limited to 'AssetLoader/interface')
-rw-r--r--AssetLoader/interface/GLTFLoader.hpp30
1 files changed, 16 insertions, 14 deletions
diff --git a/AssetLoader/interface/GLTFLoader.hpp b/AssetLoader/interface/GLTFLoader.hpp
index a6a9e0b..cbe97a3 100644
--- a/AssetLoader/interface/GLTFLoader.hpp
+++ b/AssetLoader/interface/GLTFLoader.hpp
@@ -228,22 +228,24 @@ struct Camera
std::string Name;
+ struct PerspectiveAttribs
+ {
+ float AspectRatio;
+ float YFov;
+ float ZNear;
+ float ZFar;
+ };
+ struct OrthographicAttribs
+ {
+ float XMag;
+ float YMag;
+ float ZNear;
+ float ZFar;
+ };
union
{
- struct PerspectiveCamera
- {
- float AspectRatio = 0;
- float YFov = 0;
- float ZFar = 0;
- float ZNear = 0;
- } Perspective;
- struct OrthographicCamera
- {
- float XMag;
- float YMag;
- float ZFar;
- float ZNear;
- } Orthographic;
+ PerspectiveAttribs Perspective = {};
+ OrthographicAttribs Orthographic;
};
float4x4 matrix;