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

Cycles: Get rid of hardcoded enum values in the code

Browse Source 
Still need to keep enum definition in sync with the python code,
but the code itself is a bit more clear to understand now.
This commit is contained in:
Sergey Sharybin
2014-10-22 16:17:03 +02:00
parent d2d1b19170
commit 1be189f000
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/render/shader.cpp
View File

@@ -138,8 +138,8 @@ Shader::Shader()
use_mis = true;
use_transparent_shadow = true;
heterogeneous_volume = true;
volume_sampling_method = 0;
volume_interpolation_method = 0;
volume_sampling_method = VOLUME_SAMPLING_DISTANCE;
volume_interpolation_method = VOLUME_INTERPOLATION_LINEAR;
has_surface = false;
has_surface_transparent = false;
@@ -353,11 +353,11 @@ void ShaderManager::device_update_common(Device *device, DeviceScene *dscene, Sc
flag |= SD_HAS_BSSRDF_BUMP;
if(shader->has_converter_blackbody)
has_converter_blackbody = true;
if(shader->volume_sampling_method == 1)
if(shader->volume_sampling_method == VOLUME_SAMPLING_EQUIANGULAR)
flag |= SD_VOLUME_EQUIANGULAR;
if(shader->volume_sampling_method == 2)
if(shader->volume_sampling_method == VOLUME_SAMPLING_MULTIPLE_IMPORTANCE)
flag |= SD_VOLUME_MIS;
if(shader->volume_interpolation_method == 1)
if(shader->volume_interpolation_method == VOLUME_INTERPOLATION_CUBIC)
flag |= SD_VOLUME_CUBIC;
/* regular shader */