griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Some last minute tweaks, for world background image, 'Hori' must now be

Browse Source 
enabled.
And when using Blender's AO parameters, the lowest sample number
when no cache is used is 4.
This commit is contained in:
Alfredo de Greef
2005-05-28 02:50:55 +00:00
parent bdc928b298
commit 5b014b0c9c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/yafray/intern/export_File.cpp
View File

@@ -1784,7 +1784,8 @@ void yafrayFileRender_t::writeHemilight()
else {
ostr << "<light type=\"hemilight\" name=\"hemi_LT\" power=\"" << R.r.GIpower << "\"";
if (fromAO) {
ostr << "\n\tsamples=\"" << world->aosamp*world->aosamp
// use minimum of 4 samples for lowest sample setting, single sample way too noisy
ostr << "\n\tsamples=\"" << 3 + world->aosamp*world->aosamp
<< "\" maxdistance=\"" << world->aodist
<< "\" use_QMC=\"" << ((world->aomode & WO_AORNDSMP) ? "off" : "on") << "\" >\n";
}
@@ -1867,8 +1868,8 @@ bool yafrayFileRender_t::writeWorld()
MTex* wtex = world->mtex[i];
if (!wtex) continue;
Image* wimg = wtex->tex->ima;
// now always exports if image used as world texture
if ((wtex->tex->type==TEX_IMAGE) && (wimg!=NULL)) {
// now always exports if image used as world texture (and 'Hori' mapping enabled)
if ((wtex->tex->type==TEX_IMAGE) && (wimg!=NULL) && (wtex->mapto & WOMAP_HORIZ)) {
string wt_path = wimg->name;
adjustPath(wt_path);
ostr.str("");

7
source/blender/yafray/intern/export_Plugin.cpp
View File

@@ -1768,7 +1768,8 @@ void yafrayPluginRender_t::writeHemilight()
params["name"] = yafray::parameter_t("hemi_LT");
params["power"] = yafray::parameter_t(R.r.GIpower);
if (fromAO) {
params["samples"] = yafray::parameter_t(world->aosamp*world->aosamp);
// use minimum of 4 samples for lowest sample setting, single sample way too noisy
params["samples"] = yafray::parameter_t(3 + world->aosamp*world->aosamp);
params["maxdistance"] = yafray::parameter_t(world->aodist);
params["use_QMC"] = yafray::parameter_t((world->aomode & WO_AORNDSMP) ? "off" : "on");
}
@@ -1860,8 +1861,8 @@ bool yafrayPluginRender_t::writeWorld()
MTex* wtex = world->mtex[i];
if (!wtex) continue;
Image* wimg = wtex->tex->ima;
// now always exports if image used as world texture
if ((wtex->tex->type==TEX_IMAGE) && (wimg!=NULL)) {
// now always exports if image used as world texture (and 'Hori' mapping enabled)
if ((wtex->tex->type==TEX_IMAGE) && (wimg!=NULL) && (wtex->mapto & WOMAP_HORIZ)) {
string wt_path = wimg->name;
adjustPath(wt_path);
params["type"] = yafray::parameter_t("image");