mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Batch tonemapper: allow specifying the desired resampling filter

metadata
Wenzel Jakob 2014-01-14 00:11:12 +01:00
parent 59345881a0
commit 21738f7b59
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils/tonemap.cpp
View File

@ -46,6 +46,7 @@ public:
cout << " -b r,g,b Color balance: apply the specified per-channel multipliers" << endl << endl; cout << " -b r,g,b Color balance: apply the specified per-channel multipliers" << endl << endl;
cout << " -c x,y,w,h Crop: tonemap a given rectangle instead of the entire image" << endl << endl; cout << " -c x,y,w,h Crop: tonemap a given rectangle instead of the entire image" << endl << endl;
cout << " -s w,h Resize the output image to the specified resolution" << endl << endl; cout << " -s w,h Resize the output image to the specified resolution" << endl << endl;
cout << " -F name Name of the resampling filter used by -s (Default = lanczos)" << endl << endl;
cout << " -r x,y,w,h,i Add a rectangle at the specified position and intensity, e.g." << endl; cout << " -r x,y,w,h,i Add a rectangle at the specified position and intensity, e.g." << endl;
cout << " to make paper figures. The intensity should be in [0, 255]." << endl << endl; cout << " to make paper figures. The intensity should be in [0, 255]." << endl << endl;
cout << " -f fmt Request a certain output format (png/jpg, default:png)" << endl << endl; cout << " -f fmt Request a certain output format (png/jpg, default:png)" << endl << endl;
@ -128,9 +129,10 @@ public:
bool runParallel = false; bool runParallel = false;
ReconstructionFilter *rfilter = NULL; ReconstructionFilter *rfilter = NULL;
Float bloomFov = 0; Float bloomFov = 0;
std::string rfilterName = "lanczos";
/* Parse command-line arguments */ /* Parse command-line arguments */
while ((optchar = getopt(argc, argv, "htxag:m:f:r:b:c:o:p:s:B:")) != -1) { while ((optchar = getopt(argc, argv, "htxag:m:f:r:b:c:o:p:s:B:F:")) != -1) {
switch (optchar) { switch (optchar) {
case 'h': { case 'h': {
help(); help();
@ -159,6 +161,10 @@ public:
} }
break; break;
case 'F':
rfilterName = std::string(optarg);
break;
case 'B': case 'B':
bloomFov = (Float) strtod(optarg, &end_ptr); bloomFov = (Float) strtod(optarg, &end_ptr);
#if !defined(MTS_HAS_FFTW) #if !defined(MTS_HAS_FFTW)
@ -277,7 +283,7 @@ public:
if (resize[0] != -1) { if (resize[0] != -1) {
/* A resampling operation was requested; use a Lanczos Sinc reconstruction filter by default */ /* A resampling operation was requested; use a Lanczos Sinc reconstruction filter by default */
rfilter = static_cast<ReconstructionFilter *> (PluginManager::getInstance()-> rfilter = static_cast<ReconstructionFilter *> (PluginManager::getInstance()->
createObject(MTS_CLASS(ReconstructionFilter), Properties("lanczos"))); createObject(MTS_CLASS(ReconstructionFilter), Properties(rfilterName)));
rfilter->configure(); rfilter->configure();
} }