diff options
| author | numzero <numzer0@yandex.ru> | 2023-03-25 10:42:11 +0300 |
|---|---|---|
| committer | numzero <numzer0@yandex.ru> | 2023-03-25 10:42:47 +0300 |
| commit | d97d1708d68a98c039db8a06c4110bfc961d3fb1 (patch) | |
| tree | 1a90cd7a34793982aa9376468feb41e67d2b7cdc /source/Irrlicht/CCameraSceneNode.cpp | |
| parent | ba77d01c91a363ad932ecd26c3eaba82ddf7a6f0 (diff) | |
| parent | 799c8b936f9a2cc4f3a8bc56237fb9a8dedf853e (diff) | |
| download | irrlicht-d97d1708d68a98c039db8a06c4110bfc961d3fb1.tar.xz | |
Resolve conflicts with master
Diffstat (limited to 'source/Irrlicht/CCameraSceneNode.cpp')
| -rw-r--r-- | source/Irrlicht/CCameraSceneNode.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/Irrlicht/CCameraSceneNode.cpp b/source/Irrlicht/CCameraSceneNode.cpp index aaa752f..77d8c28 100644 --- a/source/Irrlicht/CCameraSceneNode.cpp +++ b/source/Irrlicht/CCameraSceneNode.cpp @@ -28,16 +28,16 @@ CCameraSceneNode::CCameraSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 i // set default projection
Fovy = core::PI / 2.5f; // Field of view, in radians.
+ Aspect = 4.0f / 3.0f; // Aspect ratio.
const video::IVideoDriver* const d = mgr?mgr->getVideoDriver():0;
if (d)
{
- Aspect = (f32)d->getCurrentRenderTargetSize().Width /
- (f32)d->getCurrentRenderTargetSize().Height;
+ if ( d->getCurrentRenderTargetSize().Height )
+ Aspect = (f32)d->getCurrentRenderTargetSize().Width /
+ (f32)d->getCurrentRenderTargetSize().Height;
HasD3DStyleProjectionMatrix = d->getDriverType() != video::EDT_OPENGL;
}
- else
- Aspect = 4.0f / 3.0f; // Aspect ratio.
ViewArea.setFarNearDistance(ZFar - ZNear);
recalculateProjectionMatrix();
|