Revision: 18287 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18287 Author: nicholasbishop Date: 2009-01-03 09:08:44 +0100 (Sat, 03 Jan 2009)
Log Message: ----------- Started RNA for MTex Modified Paths: -------------- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h =================================================================== --- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2009-01-03 07:38:40 UTC (rev 18286) +++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2009-01-03 08:08:44 UTC (rev 18287) @@ -113,6 +113,7 @@ extern StructRNA RNA_LatticeModifier; extern StructRNA RNA_LatticePoint; extern StructRNA RNA_Library; +extern StructRNA RNA_MappingTexture; extern StructRNA RNA_MCol; extern StructRNA RNA_MColLayer; extern StructRNA RNA_MFloatProperty; 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 07:38:40 UTC (rev 18286) +++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c 2009-01-03 08:08:44 UTC (rev 18287) @@ -30,12 +30,74 @@ #include "rna_internal.h" +#include "DNA_material_types.h" #include "DNA_texture_types.h" #ifdef RNA_RUNTIME #else +void rna_def_mapping_texture(BlenderRNA *brna) +{ + StructRNA *srna; + PropertyRNA *prop; + + static EnumPropertyItem prop_texture_coordinates_items[] = { + {TEXCO_ORCO, "ORIGINAL_COORDINATES", "Original Coordinates", ""}, + {TEXCO_REFL, "REFLECTION_VECTOR", "Reflection Vector", ""}, + {TEXCO_NORM, "NORMAL_VECTOR", "Normal Vector", ""}, + {TEXCO_GLOB, "GLOBAL", "Global", ""}, + {TEXCO_UV, "UV", "UV", ""}, + {TEXCO_OBJECT, "LINKED_OBJECT", "Linked Object", ""}, + {TEXCO_STRAND, "STRAND", "Strand", ""}, + {TEXCO_STRESS, "STRESS", "Stress", ""}, + {TEXCO_SPEED, "TANGENT", "Tangent", ""}, + {0, NULL, NULL, NULL}}; + + static EnumPropertyItem prop_blend_type_items[] = { + {MTEX_BLEND, "MIX", "Mix", ""}, + {MTEX_ADD, "ADD", "Add", ""}, + {MTEX_SUB, "SUBTRACT", "Subtract", ""}, + {MTEX_MUL, "MULTIPLY", "Multiply", ""}, + {MTEX_SCREEN, "SCREEN", "Screen", ""}, + {MTEX_OVERLAY, "OVERLAY", "Overlay", ""}, + {MTEX_DIFF, "DIFFERENCE", "Difference", ""}, + {MTEX_DIV, "DIVIDE", "Divide", ""}, + {MTEX_DARK, "DARKEN", "Darken", ""}, + {MTEX_LIGHT, "LIGHTEN", "Lighten", ""}, + {MTEX_BLEND_HUE, "HUE", "Hue", ""}, + {MTEX_BLEND_SAT, "SATURATION", "Saturation", ""}, + {MTEX_BLEND_VAL, "VALUE", "Value", ""}, + {MTEX_BLEND_COLOR, "COLOR", "Color", ""}, + {0, NULL, NULL, NULL}}; + + srna= RNA_def_struct(brna, "MappingTexture", NULL); + RNA_def_struct_sdna(srna, "MTex"); + RNA_def_struct_ui_text(srna, "MappingTexture", "DOC_BROKEN"); + + prop= RNA_def_property(srna, "texture_coordinates", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "texco"); + RNA_def_property_enum_items(prop, prop_texture_coordinates_items); + RNA_def_property_ui_text(prop, "Texture Coordinates", ""); + + /* XXX: MTex.mapto and MTex.maptoneg */ + + prop= RNA_def_property(srna, "blend_type", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "blendtype"); + RNA_def_property_enum_items(prop, prop_blend_type_items); + RNA_def_property_ui_text(prop, "Blend Type", ""); + + prop= RNA_def_property(srna, "mapping_object", PROP_POINTER, PROP_NONE); + RNA_def_property_pointer_sdna(prop, NULL, "object"); + RNA_def_property_struct_type(prop, "Object"); + RNA_def_property_ui_text(prop, "Mapping Object", ""); + + prop= RNA_def_property(srna, "texture", PROP_POINTER, PROP_NONE); + RNA_def_property_pointer_sdna(prop, NULL, "tex"); + RNA_def_property_struct_type(prop, "Texture"); + RNA_def_property_ui_text(prop, "Texture", ""); +} + void rna_def_environment_map(BlenderRNA *brna) { StructRNA *srna; @@ -153,6 +215,7 @@ {TEX_CELLNOISE, "CELL_NOISE", "Cell Noise", ""}, {0, NULL, NULL, NULL}}; + rna_def_mapping_texture(brna); rna_def_environment_map(brna); srna= RNA_def_struct(brna, "Texture", "ID"); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs