kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles / Textures:

Browse Source 
* Some code cleanup, removed old enums, which are not used anymore. 
* Some renaming for consistency and to match new texture names.
This commit is contained in:
Thomas Dinges 2012-06-08 19:57:25 +00:00
parent 3d740121ed
commit 7c87f646c2
4 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/svm/svm_gradient.h
View File

@ -20,7 +20,7 @@ CCL_NAMESPACE_BEGIN
/* Gradient */
__device float svm_gradient(float3 p, NodeBlendType type)
__device float svm_gradient(float3 p, NodeGradientType type)
{
float x, y, z;
@ -67,7 +67,7 @@ __device void svm_node_tex_gradient(ShaderData *sd, float *stack, uint4 node)
float3 co = stack_load_float3(stack, co_offset);
float f = svm_gradient(co, (NodeBlendType)type);
float f = svm_gradient(co, (NodeGradientType)type);
f = clamp(f, 0.0f, 1.0f);
if(stack_valid(fac_offset))

2
intern/cycles/kernel/svm/svm_texture.h
View File

@ -188,7 +188,7 @@ __device float noise_basis_hard(float3 p, NodeNoiseBasis basis, int hard)
/* Waves */
__device float noise_wave(NodeWaveType wave, float a)
__device float noise_wave(NodeWaveBasis wave, float a)
{
if(wave == NODE_WAVE_SINE) {
return 0.5f + 0.5f*sin(a);

29
intern/cycles/kernel/svm/svm_types.h
View File

@ -221,11 +221,11 @@ typedef enum NodeNoiseBasis {
NODE_NOISE_CELL_NOISE
} NodeNoiseBasis;
typedef enum NodeWaveType {
typedef enum NodeWaveBasis {
NODE_WAVE_SINE,
NODE_WAVE_SAW,
NODE_WAVE_TRI
} NodeWaveType;
} NodeWaveBasis;
typedef enum NodeMusgraveType {
NODE_MUSGRAVE_MULTIFRACTAL,
@ -235,12 +235,12 @@ typedef enum NodeMusgraveType {
NODE_MUSGRAVE_HETERO_TERRAIN
} NodeMusgraveType;
typedef enum NodeWoodType {
typedef enum NodeWaveType {
NODE_WAVE_BANDS,
NODE_WAVE_RINGS
} NodeWoodType;
} NodeWaveType;
typedef enum NodeBlendType {
typedef enum NodeGradientType {
NODE_BLEND_LINEAR,
NODE_BLEND_QUADRATIC,
NODE_BLEND_EASING,
@ -248,24 +248,7 @@ typedef enum NodeBlendType {
NODE_BLEND_RADIAL,
NODE_BLEND_QUADRATIC_SPHERE,
NODE_BLEND_SPHERICAL
} NodeBlendType;
typedef enum NodeBlendAxis {
NODE_BLEND_HORIZONTAL,
NODE_BLEND_VERTICAL
} NodeBlendAxis;
typedef enum NodeMarbleType {
NODE_MARBLE_SOFT,
NODE_MARBLE_SHARP,
NODE_MARBLE_SHARPER
} NodeMarbleType;
typedef enum NodeStucciType {
NODE_STUCCI_PLASTIC,
NODE_STUCCI_WALL_IN,
NODE_STUCCI_WALL_OUT
} NodeStucciType;
} NodeGradientType;
typedef enum NodeVoronoiColoring {
NODE_VORONOI_INTENSITY,

6
intern/cycles/kernel/svm/svm_wave.h
View File

@ -18,9 +18,9 @@
CCL_NAMESPACE_BEGIN
/* Marble */
/* Wave */
__device_noinline float svm_wave(NodeWoodType type, float3 p, float scale, float detail, float distortion, float dscale)
__device_noinline float svm_wave(NodeWaveType type, float3 p, float scale, float detail, float distortion, float dscale)
{
float w, n;
@ -55,7 +55,7 @@ __device void svm_node_tex_wave(KernelGlobals *kg, ShaderData *sd, float *stack,
float distortion = stack_load_float_default(stack, distortion_offset, node2.z);
float dscale = stack_load_float_default(stack, dscale_offset, node2.w);
float f = svm_wave((NodeWoodType)type, co, scale, detail, distortion, dscale);
float f = svm_wave((NodeWaveType)type, co, scale, detail, distortion, dscale);
if(stack_valid(fac_offset)) stack_store_float(stack, fac_offset, f);
if(stack_valid(color_offset)) stack_store_float3(stack, color_offset, make_float3(f, f, f));