Merge branch releases/1.8 revisions r5633 through r5796 into trunk.
- Fix for SViewFrustum::clipLine git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5797 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
0f3838b968
commit
39e5fdc3e7
|
@ -228,6 +228,9 @@ should now be fps independentn
|
|||
|
||||
--------------------------
|
||||
Changes in 1.8.5
|
||||
- Fix SViewFrustum::clipLine. Was before clipping at wrong points (inverse places along lines).
|
||||
- Fix compilation on OSX and prevent capturing mouse cursor when Window is not on top (Patch #319)
|
||||
Thanks at Artem Shoobovych for bugreport and patch (https://sourceforge.net/p/irrlicht/patches/319/)
|
||||
- Fix serialization of OverrideTextColorEnabled flag in CGUITab. Thanks @ chronologicaldot for reporting (http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=52344&p=303891#p303891)
|
||||
- CFileSystem::getAbsolutePath no longer wrongly converts an empty filename to "/" on unix platforms.
|
||||
This fixes the bug that CFileSystem::createAndOpenFile("") returned a (strange behaving) non-null file pointer.
|
||||
|
|
|
@ -92,6 +92,7 @@ struct S3DVertex
|
|||
return EVT_STANDARD;
|
||||
}
|
||||
|
||||
//\param d d=0 returns other, d=1 returns this, values between interpolate.
|
||||
S3DVertex getInterpolated(const S3DVertex& other, f32 d)
|
||||
{
|
||||
d = core::clamp(d, 0.0f, 1.0f);
|
||||
|
@ -170,6 +171,7 @@ struct S3DVertex2TCoords : public S3DVertex
|
|||
return EVT_2TCOORDS;
|
||||
}
|
||||
|
||||
//\param d d=0 returns other, d=1 returns this, values between interpolate.
|
||||
S3DVertex2TCoords getInterpolated(const S3DVertex2TCoords& other, f32 d)
|
||||
{
|
||||
d = core::clamp(d, 0.0f, 1.0f);
|
||||
|
|
|
@ -448,7 +448,7 @@ namespace video
|
|||
|
||||
//! Interpolates the color with a f32 value to another color
|
||||
/** \param other: Other color
|
||||
\param d: value between 0.0f and 1.0f
|
||||
\param d: value between 0.0f and 1.0f. d=0 returns other, d=1 returns this, values between interpolate.
|
||||
\return Interpolated color. */
|
||||
SColor getInterpolated(const SColor &other, f32 d) const
|
||||
{
|
||||
|
|
|
@ -402,13 +402,13 @@ namespace scene
|
|||
if (planes[i].classifyPointRelation(line.start) == core::ISREL3D_FRONT)
|
||||
{
|
||||
line.start = line.start.getInterpolated(line.end,
|
||||
planes[i].getKnownIntersectionWithLine(line.start, line.end));
|
||||
1.f-planes[i].getKnownIntersectionWithLine(line.start, line.end));
|
||||
wasClipped = true;
|
||||
}
|
||||
if (planes[i].classifyPointRelation(line.end) == core::ISREL3D_FRONT)
|
||||
{
|
||||
line.end = line.start.getInterpolated(line.end,
|
||||
planes[i].getKnownIntersectionWithLine(line.start, line.end));
|
||||
1.f-planes[i].getKnownIntersectionWithLine(line.start, line.end));
|
||||
wasClipped = true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -191,7 +191,7 @@ namespace core
|
|||
|
||||
//! Get the interpolated dimension
|
||||
/** \param other Other dimension to interpolate with.
|
||||
\param d Value between 0.0f and 1.0f.
|
||||
\param d Value between 0.0f and 1.0f. d=0 returns other, d=1 returns this, values between interpolate.
|
||||
\return Interpolated dimension. */
|
||||
dimension2d<T> getInterpolated(const dimension2d<T>& other, f32 d) const
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue