Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: tweaks to properties and nodes

Browse Source 
* Passes renamed to samples
* Camera lens radius renamed to aperature size/blades/rotation
* Glass and fresnel nodes input is now index of refraction
* Glossy and velvet fresnel socket removed
* Mix/add closure node renamed to mix/add shader node
* Blend weight node added for shader mixing weights

There is some version patching code for reading existing files, but it's not
perfect, so shaders may work a bit different.
This commit is contained in:
Brecht Van Lommel
2011-09-16 13:14:02 +00:00
parent 0a5fcf3da3
commit 66b1dfae89
82 changed files with 788 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
intern/cycles/render/tile.cpp
View File

@@ -22,7 +22,7 @@
CCL_NAMESPACE_BEGIN
TileManager::TileManager(bool progressive_, int passes_, int tile_size_, int min_size_)
TileManager::TileManager(bool progressive_, int samples_, int tile_size_, int min_size_)
{
progressive = progressive_;
tile_size = tile_size_;
@@ -35,7 +35,7 @@ TileManager::~TileManager()
{
}
void TileManager::reset(int width_, int height_, int passes_)
void TileManager::reset(int width_, int height_, int samples_)
{
full_width = width_;
full_height = height_;
@@ -53,18 +53,18 @@ void TileManager::reset(int width_, int height_, int passes_)
}
}
passes = passes_;
samples = samples_;
state.width = 0;
state.height = 0;
state.pass = -1;
state.sample = -1;
state.resolution = start_resolution;
state.tiles.clear();
}
void TileManager::set_passes(int passes_)
void TileManager::set_samples(int samples_)
{
passes = passes_;
samples = samples_;
}
void TileManager::set_tiles()
@@ -96,7 +96,7 @@ void TileManager::set_tiles()
bool TileManager::done()
{
return (state.pass+1 >= passes);
return (state.sample+1 >= samples && state.resolution == 1);
}
bool TileManager::next()
@@ -105,12 +105,12 @@ bool TileManager::next()
return false;
if(progressive && state.resolution > 1) {
state.pass = 0;
state.sample = 0;
state.resolution /= 2;
set_tiles();
}
else {
state.pass++;
state.sample++;
state.resolution = 1;
set_tiles();
}