mirror of
https://github.com/minetest/irrlicht.git
synced 2024-11-10 09:43:52 +01:00
Remove several copy-constructors and assignment operators which did nothing special.
They all just implemented the same the default functions do. This causes now warnings with newer gcc -Wdeprecated settings (otherwise they would have had to implement always both, but makes no sense as they did nothing special). git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6280 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
parent
1e7ceac26c
commit
b11c4c142c
@ -639,12 +639,6 @@ namespace quake3
|
||||
: ID ( 0 ), VarGroup ( 0 ) {}
|
||||
virtual ~IShader () {}
|
||||
|
||||
void operator = (const IShader &other )
|
||||
{
|
||||
ID = other.ID;
|
||||
VarGroup = other.VarGroup;
|
||||
name = other.name;
|
||||
}
|
||||
|
||||
bool operator == (const IShader &other ) const
|
||||
{
|
||||
|
@ -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);
|
||||
|
@ -453,13 +453,6 @@ class map
|
||||
return Cur;
|
||||
}
|
||||
|
||||
ParentFirstIterator& operator=(const ParentFirstIterator& src)
|
||||
{
|
||||
Root = src.Root;
|
||||
Cur = src.Cur;
|
||||
return (*this);
|
||||
}
|
||||
|
||||
void operator++(int)
|
||||
{
|
||||
inc();
|
||||
@ -552,13 +545,6 @@ class map
|
||||
return Cur;
|
||||
}
|
||||
|
||||
ParentLastIterator& operator=(const ParentLastIterator& src)
|
||||
{
|
||||
Root = src.Root;
|
||||
Cur = src.Cur;
|
||||
return (*this);
|
||||
}
|
||||
|
||||
void operator++(int)
|
||||
{
|
||||
inc();
|
||||
|
@ -24,8 +24,6 @@ class line2d
|
||||
line2d(T xa, T ya, T xb, T yb) : start(xa, ya), end(xb, yb) {}
|
||||
//! Constructor for line between the two points given as vectors.
|
||||
line2d(const vector2d<T>& start, const vector2d<T>& end) : start(start), end(end) {}
|
||||
//! Copy constructor.
|
||||
line2d(const line2d<T>& other) : start(other.start), end(other.end) {}
|
||||
|
||||
// operators
|
||||
|
||||
@ -97,12 +95,12 @@ class line2d
|
||||
/*! Check if 2 segments are incident (intersects in exactly 1 point).*/
|
||||
bool incidentSegments( const line2d<T>& other) const
|
||||
{
|
||||
return
|
||||
return
|
||||
start.checkOrientation( end, other.start) != start.checkOrientation( end, other.end)
|
||||
&& other.start.checkOrientation( other.end, start) != other.start.checkOrientation( other.end, end);
|
||||
}
|
||||
|
||||
/*! Check if 2 lines/segments are parallel or nearly parallel.*/
|
||||
/*! Check if 2 lines/segments are parallel or nearly parallel.*/
|
||||
bool nearlyParallel( const line2d<T>& line, const T factor = relativeErrorFactor<T>()) const
|
||||
{
|
||||
const vector2d<T> a = getVector();
|
||||
@ -112,14 +110,14 @@ class line2d
|
||||
}
|
||||
|
||||
/*! returns a intersection point of 2 lines (if lines are not parallel). Behaviour
|
||||
undefined if lines are parallel or coincident.
|
||||
undefined if lines are parallel or coincident.
|
||||
It's on optimized intersectWith with checkOnlySegments=false and ignoreCoincidentLines=true
|
||||
*/
|
||||
vector2d<T> fastLinesIntersection( const line2d<T>& l) const
|
||||
{
|
||||
const f32 commonDenominator = (f32)((l.end.Y - l.start.Y)*(end.X - start.X) -
|
||||
(l.end.X - l.start.X)*(end.Y - start.Y));
|
||||
|
||||
|
||||
if ( commonDenominator != 0.f )
|
||||
{
|
||||
const f32 numeratorA = (f32)((l.end.X - l.start.X)*(start.Y - l.start.Y) -
|
||||
@ -129,7 +127,7 @@ class line2d
|
||||
|
||||
// Calculate the intersection point.
|
||||
return vector2d<T> (
|
||||
(T)(start.X + uA * (end.X - start.X)),
|
||||
(T)(start.X + uA * (end.X - start.X)),
|
||||
(T)(start.Y + uA * (end.Y - start.Y))
|
||||
);
|
||||
}
|
||||
@ -293,7 +291,7 @@ class line2d
|
||||
/** Assumes that the point is already somewhere on the line. */
|
||||
bool isPointBetweenStartAndEnd(const vector2d<T>& point) const
|
||||
{
|
||||
return point.isBetweenPoints(start, end);
|
||||
return point.isBetweenPoints(start, end);
|
||||
}
|
||||
|
||||
//! Get the closest point on this line to a point
|
||||
|
@ -1,4 +1,4 @@
|
||||
Tests finished. 72 tests of 72 passed.
|
||||
Compiled as DEBUG
|
||||
Test suite pass at GMT Sat Feb 13 16:24:31 2021
|
||||
|
||||
Tests finished. 72 tests of 72 passed.
|
||||
Compiled as DEBUG
|
||||
Test suite pass at GMT Thu Jan 6 13:59:44 2022
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user