luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6275 through r6286 from trunk to ogl-es branch

Browse Source 
- Fixing warnings
- Updating bzip2 and zlib libraries


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6287 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2022-01-07 16:30:25 +00:00
parent 6d96663c9a
commit 67469c8899
73 changed files with 2438 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/SViewFrustum.h
View File

@@ -47,9 +47,6 @@ namespace scene
//! Default Constructor
SViewFrustum() : BoundingRadius(0.f), FarNearDistance(0.f) {}
//! Copy Constructor
SViewFrustum(const SViewFrustum& other);
//! This constructor creates a view frustum based on a projection and/or view matrix.
//\param zClipFromZero: Clipping of z can be projected from 0 to w when true (D3D style) and from -w to w when false (OGL style).
SViewFrustum(const core::matrix4& mat, bool zClipFromZero);
@@ -140,27 +137,6 @@ namespace scene
core::vector3df BoundingCenter;
};
/*!
Copy constructor ViewFrustum
*/
inline SViewFrustum::SViewFrustum(const SViewFrustum& other)
{
cameraPosition=other.cameraPosition;
boundingBox=other.boundingBox;
u32 i;
for (i=0; i<VF_PLANE_COUNT; ++i)
planes[i]=other.planes[i];
for (i=0; i<ETS_COUNT_FRUSTUM; ++i)
Matrices[i]=other.Matrices[i];
BoundingRadius = other.BoundingRadius;
FarNearDistance = other.FarNearDistance;
BoundingCenter = other.BoundingCenter;
}
inline SViewFrustum::SViewFrustum(const core::matrix4& mat, bool zClipFromZero)
{
setFrom(mat, zClipFromZero);