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

Merged mfeemster/fractorium into master

Browse Source
This commit is contained in:
Michel Mastriani 2020-03-16 08:00:38 -03:00
commit 6984e0a7b6
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -9,11 +9,11 @@ of the cuburn algorithm in OpenCL.
## Windows ## Windows
Download: [Fractorium_1.0.0.18.msi](https://drive.google.com/open?id=1b-Mt8M2-MABhIx7KgjdTmtHtgrjUSgGh) Download: [Fractorium_1.0.0.19.msi](https://drive.google.com/open?id=1GerFr8VRLFtfvV57acJawZg0bJVfhac-)
## Mac ## Mac
Download: [Fractorium_1.0.0.18.dmg](https://drive.google.com/open?id=1ukLsCfE3_MtZcZxdyC9ZXwFxXQ2NNcwe) Download: [Fractorium_1.0.0.19.dmg](https://drive.google.com/open?id=1YH49dE858cUrPXl92jfclB00LDPQfBtY)
## Linux ## Linux
@ -37,16 +37,16 @@ sudo apt-get install fractorium
Install ubuntu. Install ubuntu.
Download: [Fractorium-1.0.0.18.x86_64.deb](https://drive.google.com/open?id=1vQMHRMZpkQXgVjuKRDHVlQb7WZm9VAue) Download: [Fractorium-1.0.0.19.x86_64.deb](https://drive.google.com/open?id=1sYoLK27-w7RERxmh10GK4eTcwI2wuagO)
``` ```
cd ~/Downloads cd ~/Downloads
sudo dpkg -i Fractorium-1.0.0.18.x86_64.deb sudo dpkg -i Fractorium-1.0.0.19.x86_64.deb
``` ```
### Install from App Image .rpm ### Install from App Image .rpm
Download: [Fractorium-1.0.0.18.x86_64.rpm](https://drive.google.com/open?id=1p4hT6E9byE8YLda-VGV7UUWQ9iXU_5sp) Download: [Fractorium-1.0.0.19.x86_64.rpm](https://drive.google.com/open?id=17zHmJghSM_hCjSNRXyf5PL6oWoy--Sq4)
# Building from git # Building from git

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;

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
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
* release 1.0.0.19
-- Matt Feemster <matt.feemster@gmail.com> Sun, 15 Mar 2020 15:18:06 -0700
fractorium (1.0.0.19-0ubuntu1) bionic; urgency=low fractorium (1.0.0.19-0ubuntu1) bionic; urgency=low
* release 1.0.0.19 * release 1.0.0.19