[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18277] branches/blender2.5/blender/source /blender/makesrna/intern/rna_texture.c: Added a bunch of RNA properties for textures.
Nicholas Bishop
nicholasbishop at gmail.com
Sat Jan 3 02:55:37 CET 2009
Revision: 18277
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18277
Author: nicholasbishop
Date: 2009-01-03 02:55:37 +0100 (Sat, 03 Jan 2009)
Log Message:
-----------
Added a bunch of RNA properties for textures.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c 2009-01-03 01:37:57 UTC (rev 18276)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c 2009-01-03 01:55:37 UTC (rev 18277)
@@ -22,6 +22,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#include <float.h>
+#include <stdlib.h>
+
#include "RNA_define.h"
#include "RNA_types.h"
@@ -38,11 +41,156 @@
StructRNA *srna;
PropertyRNA *prop;
+ static EnumPropertyItem prop_type_items[] = {
+ {TEX_CLOUDS, "CLOUDS", "Clouds", ""},
+ {TEX_WOOD, "WOOD", "Wood", ""},
+ {TEX_MARBLE, "MARBLE", "Marble", ""},
+ {TEX_MAGIC, "MAGIC", "Magic", ""},
+ {TEX_BLEND, "BLEND", "Blend", ""},
+ {TEX_STUCCI, "STUCCI", "Stucci", ""},
+ {TEX_NOISE, "NOISE", "Noise", ""},
+ {TEX_IMAGE, "IMAGE", "Image", ""},
+ {TEX_PLUGIN, "PLUGIN", "Plugin", ""},
+ {TEX_ENVMAP, "ENVIRONMENTAL_MAP", "Environmental Map", ""},
+ {TEX_MUSGRAVE, "MUSGRAVE", "Musgrave", ""},
+ {TEX_VORONOI, "VORONOI", "Voronoi", ""},
+ {TEX_DISTNOISE, "DISTORTED_NOISE", "Distorted Noise", ""},
+ {0, NULL, NULL, NULL}};
+
+ static EnumPropertyItem prop_distance_metric_items[] = {
+ {TEX_DISTANCE, "DISTANCE", "Actual Distance", ""},
+ {TEX_DISTANCE_SQUARED, "DISTANCE_SQUARED", "Distance Squared", ""},
+ {TEX_MANHATTAN, "MANHATTAN", "Manhattan", ""},
+ {TEX_CHEBYCHEV, "CHEBYCHEV", "Chebychev", ""},
+ {TEX_MINKOVSKY_HALF, "MINKOVSKY_HALF", "Minkovsky 1/2", ""},
+ {TEX_MINKOVSKY_FOUR, "MINKOVSKY_FOUR", "Minkovsky 4", ""},
+ {TEX_MINKOVSKY, "MINKOVSKY", "Minkovsky", ""},
+ {0, NULL, NULL, NULL}};
+
+ static EnumPropertyItem prop_color_type_items[] = {
+ /* XXX: OK names / descriptions? */
+ {TEX_INTENSITY, "INTENSITY", "Intensity", "Only calculate intensity."},
+ {TEX_COL1, "POSITION", "Position", "Color cells by position."},
+ {TEX_COL2, "POSITION_OUTLINE", "Position and Outline", "Use position plus an outline based on F2-F.1"},
+ {TEX_COL3, "POSITION_OUTLINE_INTENSITY", "Position, Outline, and Intensity", "Multiply position and outline by intensity."},
+ {0, NULL, NULL, NULL}};
+
+ static EnumPropertyItem prop_noise_basis_items[] = {
+ {TEX_BLENDER, "BLENDER_ORIGINAL", "Blender Original", ""},
+ {TEX_STDPERLIN, "ORIGINAL_PERLIN", "Original Perlin", ""},
+ {TEX_NEWPERLIN, "IMPROVED_PERLIN", "Improved Perlin", ""},
+ {TEX_VORONOI_F1, "VORONOI_F1", "Voronoi F1", ""},
+ {TEX_VORONOI_F2, "VORONOI_F2", "Voronoi F2", ""},
+ {TEX_VORONOI_F3, "VORONOI_F3", "Voronoi F3", ""},
+ {TEX_VORONOI_F4, "VORONOI_F4", "Voronoi F4", ""},
+ {TEX_VORONOI_F2F1, "VORONOI_F2_F1", "Voronoi F2-F1", ""},
+ {TEX_VORONOI_CRACKLE, "VORONOI_CRACKLE", "Voronoi Crackle", ""},
+ {TEX_CELLNOISE, "CELL_NOISE", "Cell Noise", ""},
+ {0, NULL, NULL, NULL}};
+
srna= RNA_def_struct(brna, "Texture", "ID");
RNA_def_struct_sdna(srna, "Tex");
RNA_def_struct_ui_text(srna, "Texture", "DOC_BROKEN");
-
+ prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, prop_type_items);
+ RNA_def_property_ui_text(prop, "Type", "");
+
+ prop= RNA_def_property(srna, "noise_size", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "noisesize");
+ RNA_def_property_range(prop, 0.0001, FLT_MAX);
+ RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2);
+ RNA_def_property_ui_text(prop, "Noise Size", "");
+
+ prop= RNA_def_property(srna, "turbulance", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "turbul");
+ RNA_def_property_range(prop, 0, FLT_MAX);
+ RNA_def_property_ui_range(prop, 0, 200, 10, 2);
+ RNA_def_property_ui_text(prop, "Turbulance", "");
+
+ prop= RNA_def_property(srna, "brightness", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "bright");
+ RNA_def_property_range(prop, 0, 2);
+ RNA_def_property_ui_text(prop, "Brightness", "");
+
+ prop= RNA_def_property(srna, "contrast", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_range(prop, 0.01, 5);
+ RNA_def_property_ui_text(prop, "Contrast", "");
+
+ /* XXX: would be nicer to have this as a color selector?
+ but the values can go past [0,1]. */
+ prop= RNA_def_property(srna, "rgb_factor", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "rfac");
+ RNA_def_property_array(prop, 3);
+ RNA_def_property_range(prop, 0, 2);
+ RNA_def_property_ui_text(prop, "RGB Factor", "");
+
+ /* XXX: tex->filtersize */
+
+ /* Musgrave */
+ prop= RNA_def_property(srna, "highest_dimension", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "mg_H");
+ RNA_def_property_range(prop, 0.0001, 2);
+ RNA_def_property_ui_text(prop, "Highest Dimension", "Highest fractal dimension for musgrave.");
+
+ prop= RNA_def_property(srna, "lacunarity", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "mg_lacunarity");
+ RNA_def_property_range(prop, 0, 6);
+ RNA_def_property_ui_text(prop, "Lacunarity", "Gap between succesive frequencies for musgrave.");
+
+ prop= RNA_def_property(srna, "octaves", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "mg_octaves");
+ RNA_def_property_range(prop, 0, 8);
+ RNA_def_property_ui_text(prop, "Lacunarity", "Number of frequencies used for musgrave.");
+
+ prop= RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "mg_offset");
+ RNA_def_property_range(prop, 0, 6);
+ RNA_def_property_ui_text(prop, "Offset", "The fractal offset for musgrave.");
+
+ prop= RNA_def_property(srna, "gain", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "mg_gain");
+ RNA_def_property_range(prop, 0, 6);
+ RNA_def_property_ui_text(prop, "Gain", "The gain multiplier for musgrave.");
+
+ /* Distorted Noise */
+ prop= RNA_def_property(srna, "distortion_amount", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "dist_amount");
+ RNA_def_property_range(prop, 0, 10);
+ RNA_def_property_ui_text(prop, "Distortion Amount", "");
+
+ /* Musgrave / Voronoi */
+ prop= RNA_def_property(srna, "noise_intensity", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "ns_outscale");
+ RNA_def_property_range(prop, 0, 10);
+ RNA_def_property_ui_text(prop, "Noise Intensity", "");
+
+ /* Voronoi */
+ prop= RNA_def_property(srna, "feature_weights", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "vn_w1");
+ RNA_def_property_array(prop, 4);
+ RNA_def_property_range(prop, -2, 2);
+ RNA_def_property_ui_text(prop, "Feature Weights", "");
+
+ prop= RNA_def_property(srna, "minkovsky_exponent", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "vn_mexp");
+ RNA_def_property_range(prop, 0.01, 10);
+ RNA_def_property_ui_text(prop, "Minkovsky Exponent", "");
+
+ prop= RNA_def_property(srna, "distance_metric", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_sdna(prop, NULL, "vn_distm");
+ RNA_def_property_enum_items(prop, prop_distance_metric_items);
+ RNA_def_property_ui_text(prop, "Distance Metric", "");
+
+ prop= RNA_def_property(srna, "color_type", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_sdna(prop, NULL, "vn_coltype");
+ RNA_def_property_enum_items(prop, prop_color_type_items);
+ RNA_def_property_ui_text(prop, "Color Type", "");
+
+ prop= RNA_def_property(srna, "noise_basis", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_sdna(prop, NULL, "noisebasis");
+ RNA_def_property_enum_items(prop, prop_noise_basis_items);
+ RNA_def_property_ui_text(prop, "Noise Basis", "");
}
#endif
More information about the Bf-blender-cvs
mailing list