mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 21:20:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.0.0.19 Re-release

Browse Source 
--Bug fixes
 -New Blur Curve math was not applied on the CPU.
This commit is contained in:
Person 2020-03-15 23:51:25 -07:00
parent 572617ff5b
commit 0323d035bf
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Ember/Ember.h
View File

@ -1237,10 +1237,10 @@ public:
z = m_CamMat[1][2] * point.m_Y + m_CamMat[2][2] * z; z = m_CamMat[1][2] * point.m_Y + m_CamMat[2][2] * z;
zr = Zeps(1 - m_CamPerspective * z); zr = Zeps(1 - m_CamPerspective * z);
sincos(t, &dsin, &dcos); sincos(t, &dsin, &dcos);
T prcx = (point.m_X - ctr.CarCenterX()) / ctr.CarHalfX(); T prcx = point.m_X / ctr.CarHalfX();
T prcy = (y - ctr.CarCenterY()) / ctr.CarHalfY(); T prcy = y / ctr.CarHalfY();
T dist = VarFuncs<T>::Hypot(prcx, prcy) * 10; T dist = VarFuncs<T>::Hypot(prcx, prcy) * 10;
T scale = m_BlurCurve ? std::min<T>(T(1), Sqr(dist) / (4 * m_BlurCurve)) : T(1); T scale = m_BlurCurve ? (Sqr(dist) / (4 * m_BlurCurve)) : T(1);
T dr = rand.Frand01<T>() * (m_BlurCoef * scale) * z; T dr = rand.Frand01<T>() * (m_BlurCoef * scale) * z;
point.m_X = (point.m_X + dr * dcos) / zr; point.m_X = (point.m_X + dr * dcos) / zr;
point.m_Y = (y + dr * dsin) / zr; point.m_Y = (y + dr * dsin) / zr;
@ -1261,10 +1261,10 @@ public:
T y = m_CamMat[0][1] * point.m_X + m_CamMat[1][1] * point.m_Y + m_CamMat[2][1] * z; T y = m_CamMat[0][1] * point.m_X + m_CamMat[1][1] * point.m_Y + m_CamMat[2][1] * z;
z = m_CamMat[0][2] * point.m_X + m_CamMat[1][2] * point.m_Y + m_CamMat[2][2] * z; z = m_CamMat[0][2] * point.m_X + m_CamMat[1][2] * point.m_Y + m_CamMat[2][2] * z;
T zr = Zeps(1 - m_CamPerspective * z); T zr = Zeps(1 - m_CamPerspective * z);
T prcx = (x - ctr.CarCenterX()) / ctr.CarHalfX(); T prcx = x / ctr.CarHalfX();
T prcy = (y - ctr.CarCenterY()) / ctr.CarHalfY(); T prcy = y / ctr.CarHalfY();
T dist = VarFuncs<T>::Hypot(prcx, prcy) * 10; T dist = VarFuncs<T>::Hypot(prcx, prcy) * 10;
T scale = m_BlurCurve ? std::min<T>(T(1), Sqr(dist) / (4 * m_BlurCurve)) : T(1); T scale = m_BlurCurve ? (Sqr(dist) / (4 * m_BlurCurve)) : T(1);
T dr = rand.Frand01<T>() * (m_BlurCoef * scale) * z; T dr = rand.Frand01<T>() * (m_BlurCoef * scale) * z;
sincos(t, &dsin, &dcos); sincos(t, &dsin, &dcos);
point.m_X = (x + dr * dcos) / zr; point.m_X = (x + dr * dcos) / zr;

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
fractorium (1.0.0.19b-0ubuntu1) bionic; urgency=low
* release 1.0.0.19
-- Matt Feemster <matt.feemster@gmail.com> Sun, 15 Mar 2020 23:42:24 -0700
fractorium (1.0.0.19a-0ubuntu1) bionic; urgency=low fractorium (1.0.0.19a-0ubuntu1) bionic; urgency=low
* release 1.0.0.19 * release 1.0.0.19