[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47627] trunk/blender/intern/cycles/kernel /svm: Cycles / Textures:

[Thomas Dinges]

Revision: 47627
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47627
Author:   dingto
Date:     2012-06-08 19:57:25 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
Cycles / Textures:
* Some code cleanup, removed old enums, which are not used anymore. 
* Some renaming for consistency and to match new texture names. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/svm/svm_gradient.h
    trunk/blender/intern/cycles/kernel/svm/svm_texture.h
    trunk/blender/intern/cycles/kernel/svm/svm_types.h
    trunk/blender/intern/cycles/kernel/svm/svm_wave.h

Modified: trunk/blender/intern/cycles/kernel/svm/svm_gradient.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_gradient.h	2012-06-08 19:24:11 UTC (rev 47626)
+++ trunk/blender/intern/cycles/kernel/svm/svm_gradient.h	2012-06-08 19:57:25 UTC (rev 47627)
@@ -20,7 +20,7 @@
 
 /* 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 @@
 
 	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))

Modified: trunk/blender/intern/cycles/kernel/svm/svm_texture.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_texture.h	2012-06-08 19:24:11 UTC (rev 47626)
+++ trunk/blender/intern/cycles/kernel/svm/svm_texture.h	2012-06-08 19:57:25 UTC (rev 47627)
@@ -188,7 +188,7 @@
 
 /* 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);

Modified: trunk/blender/intern/cycles/kernel/svm/svm_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_types.h	2012-06-08 19:24:11 UTC (rev 47626)
+++ trunk/blender/intern/cycles/kernel/svm/svm_types.h	2012-06-08 19:57:25 UTC (rev 47627)
@@ -221,11 +221,11 @@
 	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 @@
 	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,25 +248,8 @@
 	NODE_BLEND_RADIAL,
 	NODE_BLEND_QUADRATIC_SPHERE,
 	NODE_BLEND_SPHERICAL
-} NodeBlendType;
+} NodeGradientType;
 
-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;
-
 typedef enum NodeVoronoiColoring {
 	NODE_VORONOI_INTENSITY,
 	NODE_VORONOI_CELLS

Modified: trunk/blender/intern/cycles/kernel/svm/svm_wave.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_wave.h	2012-06-08 19:24:11 UTC (rev 47626)
+++ trunk/blender/intern/cycles/kernel/svm/svm_wave.h	2012-06-08 19:57:25 UTC (rev 47627)
@@ -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 @@
 	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));