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

--Bug fixes:

Browse Source 
-Xaos has been wrong this entire time on the GPU because it was not selecting from the unweighted distributions on the very first iteration when fusing.
This commit is contained in:
Person 2017-03-05 08:32:58 -08:00
parent 2fba807777
commit d6b112dd32
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/EmberCL/IterOpenCLKernelCreator.cpp
View File

@ -280,7 +280,7 @@ string IterOpenCLKernelCreator<T>::CreateIterKernelString(const Ember<T>& ember,
" firstPoint.m_Y = MwcNextNeg1Pos1(&mwc);\n" " firstPoint.m_Y = MwcNextNeg1Pos1(&mwc);\n"
" firstPoint.m_Z = 0.0;\n" " firstPoint.m_Z = 0.0;\n"
" firstPoint.m_ColorX = MwcNext01(&mwc);\n" " firstPoint.m_ColorX = MwcNext01(&mwc);\n"
" firstPoint.m_LastXfUsed = 0;\n" " firstPoint.m_LastXfUsed = 0 - 1;\n"//This ensures the first iteration chooses from the unweighted distribution array, all subsequent will choose from the weighted ones.
" }\n" " }\n"
" else\n" " else\n"
" {\n" " {\n"

8
Source/Fractorium/Fractorium.ui
View File

@ -3060,7 +3060,7 @@
<enum>QTabWidget::Triangular</enum> <enum>QTabWidget::Triangular</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="XformColorTab"> <widget class="QWidget" name="XformColorTab">
<property name="sizePolicy"> <property name="sizePolicy">
@ -3398,7 +3398,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="ToggleColorIndicesButton"> <widget class="QPushButton" name="ToggleColorIndicesButton">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color indices to 0 or 1&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color indices to 0 or 1, alternating&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Toggle Indices</string> <string>Toggle Indices</string>
@ -3408,7 +3408,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="RandomColorSpeedButton"> <widget class="QPushButton" name="RandomColorSpeedButton">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color indices to 0 or 1&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color speed values to random numbers between 0 and 1, inclusive&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Random Color Speed</string> <string>Random Color Speed</string>
@ -3418,7 +3418,7 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QPushButton" name="ToggleColorSpeedButton"> <widget class="QPushButton" name="ToggleColorSpeedButton">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color indices to 0 or 1&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color speed values to 0 or 1, alternating&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Toggle Color Speed</string> <string>Toggle Color Speed</string>