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

Merged mfeemster/fractorium into master

Browse Source
This commit is contained in:
Michel Mastriani 2019-05-13 21:37:11 -03:00
commit 6c66985776
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Data/Bench/EmberBench.ps1
View File

@ -1,5 +1,7 @@
$exe = ".\EmberRender.exe" $exe = "./EmberRender.exe"
$benchprefix = ".\Bench\" #On linux do this:
#$exe = "emberrender"
$benchprefix = "./Bench/"
$devices = "2"#Set this to whatever device index your main GPU resides at. If you are unsure, just run emberrender --opencl info to find out. $devices = "2"#Set this to whatever device index your main GPU resides at. If you are unsure, just run emberrender --opencl info to find out.
$cpuquality = 150 $cpuquality = 150
$gpuquality = 2000 $gpuquality = 2000
@ -7,8 +9,8 @@ $verbose = "--verbose"
$name_enable = "--name_enable" $name_enable = "--name_enable"
$dump_args = ""#"--dumpargs" $dump_args = ""#"--dumpargs"
$totalOutput = "" $totalOutput = ""
$ssArray = @(“1”,”2”,”4”) $ssArray = @("1","2","4")
$ssSuffixArray = @(“_ss1”,”_ss2”,”_ss4”) $ssSuffixArray = @("_ss1","_ss2","_ss4")
$Script:output = "" $Script:output = ""
[Collections.Generic.List[String]] $filteredLines = "" [Collections.Generic.List[String]] $filteredLines = ""

8
Source/Ember/XmlToEmber.cpp
View File

@ -1634,7 +1634,7 @@ bool XmlToEmber<T>::ParseEmberElement(xmlNode* emberNode, Ember<T>& currentEmber
} }
else if (!Compare(curAtt->name, "overall_curve")) else if (!Compare(curAtt->name, "overall_curve"))
{ {
cout << "found overall curves\n"; //cout << "found overall curves\n";
auto splits = Split(attStr, ' '); auto splits = Split(attStr, ' ');
istringstream is(attStr); istringstream is(attStr);
vector<v2F> vals; vector<v2F> vals;
@ -1657,7 +1657,7 @@ bool XmlToEmber<T>::ParseEmberElement(xmlNode* emberNode, Ember<T>& currentEmber
} }
else if (!Compare(curAtt->name, "red_curve")) else if (!Compare(curAtt->name, "red_curve"))
{ {
cout << "found red curves\n"; //cout << "found red curves\n";
auto splits = Split(attStr, ' '); auto splits = Split(attStr, ' ');
istringstream is(attStr); istringstream is(attStr);
vector<v2F> vals; vector<v2F> vals;
@ -1680,7 +1680,7 @@ bool XmlToEmber<T>::ParseEmberElement(xmlNode* emberNode, Ember<T>& currentEmber
} }
else if (!Compare(curAtt->name, "green_curve")) else if (!Compare(curAtt->name, "green_curve"))
{ {
cout << "found green curves\n"; //cout << "found green curves\n";
auto splits = Split(attStr, ' '); auto splits = Split(attStr, ' ');
istringstream is(attStr); istringstream is(attStr);
vector<v2F> vals; vector<v2F> vals;
@ -1703,7 +1703,7 @@ bool XmlToEmber<T>::ParseEmberElement(xmlNode* emberNode, Ember<T>& currentEmber
} }
else if (!Compare(curAtt->name, "blue_curve")) else if (!Compare(curAtt->name, "blue_curve"))
{ {
cout << "found blue curves\n"; //cout << "found blue curves\n";
auto splits = Split(attStr, ' '); auto splits = Split(attStr, ' ');
istringstream is(attStr); istringstream is(attStr);
vector<v2F> vals; vector<v2F> vals;

2
archive/build_linux.sh
View File

@ -11,7 +11,7 @@ FRACTORIUM_PACKAGE=$BUILD_PATH/../Bin/Fractorium
FRACTORIUM_RPM_PACKAGE=$BUILD_PATH/../Bin/rpmbuild FRACTORIUM_RPM_PACKAGE=$BUILD_PATH/../Bin/rpmbuild
EXTRA_LIBS=/usr/lib/x86_64-linux-gnu EXTRA_LIBS=/usr/lib/x86_64-linux-gnu
# replace 5.12.2 by your QT version, and check if the instation path is the same # replace 5.12.2 by your QT version, and check if the bin path is the same
QT_PATH=/home/$USER/Dev/Qt/5.11.2/gcc_64/bin QT_PATH=/home/$USER/Dev/Qt/5.11.2/gcc_64/bin
LINUX_DEPLOY_QT=/home/$USER/Dev/linuxdeployqt-6-x86_64.AppImage LINUX_DEPLOY_QT=/home/$USER/Dev/linuxdeployqt-6-x86_64.AppImage