[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17658] branches/blender2.5/blender/source /blender/makesrna: RNA: brush wrapping
Juho Vepsalainen
bebraw at gmail.com
Mon Dec 1 07:52:19 CET 2008
Revision: 17658
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17658
Author: bebraw
Date: 2008-12-01 07:52:18 +0100 (Mon, 01 Dec 2008)
Log Message:
-----------
RNA: brush wrapping
Wrapped most of brush. Brush is still missing a link to texture and to
BrushClone. Also PAINT_TOOL_DRAW etc. flags found on DNA_brush_types.h
need to be associated to a brush somehow. Currently they are linked
to a brush via ImagePaintSettings.
Also changed identifiers in metaball wrapping to conform with the
standards.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2008-12-01 00:48:54 UTC (rev 17657)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2008-12-01 06:52:18 UTC (rev 17658)
@@ -38,6 +38,8 @@
extern StructRNA RNA_Actuator;
extern StructRNA RNA_ActuatorSensor;
extern StructRNA RNA_BooleanProperty;
+extern StructRNA RNA_Brush;
+extern StructRNA RNA_BrushClone;
extern StructRNA RNA_Camera;
extern StructRNA RNA_CollectionProperty;
extern StructRNA RNA_CollisionSensor;
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2008-12-01 00:48:54 UTC (rev 17657)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2008-12-01 06:52:18 UTC (rev 17658)
@@ -877,6 +877,8 @@
RNAProcessItem PROCESS_ITEMS[]= {
{"rna_ID.c", RNA_def_ID},
{"rna_actuator.c", RNA_def_actuator},
+ {"rna_brush.c", RNA_def_brush},
+ {"rna_brush.c", RNA_def_brushclone},
{"rna_camera.c", RNA_def_camera},
{"rna_color.c", RNA_def_color},
{"rna_controller.c", RNA_def_controller},
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c 2008-12-01 00:48:54 UTC (rev 17657)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c 2008-12-01 06:52:18 UTC (rev 17658)
@@ -58,6 +58,7 @@
ID *id= (ID*)ptr->data;
switch(GS(id->name)) {
+ case ID_BR: return &RNA_Brush;
case ID_CA: return &RNA_Camera;
case ID_GR: return &RNA_Group;
case ID_IM: return &RNA_Image;
Added: branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c (rev 0)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c 2008-12-01 06:52:18 UTC (rev 17658)
@@ -0,0 +1,161 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Contributor(s): Blender Foundation (2008), Juho Veps\xE4l\xE4inen
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+
+#include "RNA_define.h"
+#include "RNA_types.h"
+
+#include "rna_internal.h"
+
+#include "DNA_brush_types.h"
+
+#ifdef RNA_RUNTIME
+
+#else
+
+void RNA_def_brushclone(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+
+ srna= RNA_def_struct(brna, "BrushClone", "ID", "BrushClone");
+
+ /* pointers */
+ prop= RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE);
+ RNA_def_property_pointer_sdna(prop, NULL, "image");
+ RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
+ RNA_def_property_ui_text(prop, "Image", "Image for clone tool.");
+
+ /* Number values */
+ /* NOTE: This did not appear to be exposed in the 2.48a user interface. */
+ /*
+ prop= RNA_def_property(srna, "offset", PROP_FLOAT, PROP_COLOR);
+ RNA_def_property_float_sdna(prop, NULL, "offset");
+ RNA_def_property_array(prop, 2);
+ RNA_def_property_ui_text(prop, "Offset", "");
+ RNA_def_property_ui_range(prop, 0.0f , 1.0f, 10.0f, 3.0f);
+ */
+
+ prop= RNA_def_property(srna, "opacity", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "alpha");
+ RNA_def_property_range(prop, 0.0f, 1.0f);
+ RNA_def_property_ui_text(prop, "Opacity", "The amount of opacity of the clone image.");
+}
+
+void RNA_def_brush(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+ static EnumPropertyItem prop_blend_items[] = {
+ {BRUSH_BLEND_MIX, "MIX", "Mix", "Use mix blending mode while painting."},
+ {BRUSH_BLEND_ADD, "ADD", "Add", "Use add blending mode while painting."},
+ {BRUSH_BLEND_SUB, "SUB", "Subtract", "Use subtract blending mode while painting."},
+ {BRUSH_BLEND_MUL, "MUL", "Multiply", "Use multiply blending mode while painting."},
+ {BRUSH_BLEND_LIGHTEN, "LIGHTEN", "Lighten", "Use lighten blending mode while painting."},
+ {BRUSH_BLEND_DARKEN, "DARKEN", "Darken", "Use darken blending mode while painting."},
+ {BRUSH_BLEND_ERASE_ALPHA, "ERASE_ALPHA", "Erase Alpha", "Erase alpha while painting."},
+ {BRUSH_BLEND_ADD_ALPHA, "ADD_ALPHA", "Add Alpha", "Add alpha while painting."},
+ {0, NULL, NULL, NULL}};
+
+ srna= RNA_def_struct(brna, "Brush", "ID", "Brush");
+
+ /* Enums */
+ prop= RNA_def_property(srna, "blend", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, prop_blend_items);
+ RNA_def_property_ui_text(prop, "Blending mode", "Brush blending mode.");
+
+ /* Number values */
+ prop= RNA_def_property(srna, "brush_diameter", PROP_INT, PROP_NONE);
+ RNA_def_property_int_sdna(prop, NULL, "size");
+ RNA_def_property_range(prop, 1, 200);
+ RNA_def_property_ui_text(prop, "Brush diameter", "Diameter of the brush.");
+
+ prop= RNA_def_property(srna, "falloff", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "innerradius");
+ RNA_def_property_range(prop, 0.0f, 1.0f);
+ RNA_def_property_ui_text(prop, "Falloff", "Falloff radius of the brush");
+
+ prop= RNA_def_property(srna, "spacing", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "spacing");
+ RNA_def_property_range(prop, 1.0f, 100.0f);
+ RNA_def_property_ui_text(prop, "Spacing", "Spacing between brush stamps.");
+
+ prop= RNA_def_property(srna, "rate", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "rate");
+ RNA_def_property_range(prop, 0.010f, 1.0f);
+ RNA_def_property_ui_text(prop, "Rate", "Number of paints per second for Airbrush.");
+
+ prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
+ RNA_def_property_float_sdna(prop, NULL, "rgb");
+ RNA_def_property_array(prop, 3);
+ RNA_def_property_ui_text(prop, "Color", "");
+ RNA_def_property_ui_range(prop, 0.0f , 1.0f, 10.0f, 3.0f);
+
+ prop= RNA_def_property(srna, "opacity", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "alpha");
+ RNA_def_property_range(prop, 0.0f, 1.0f);
+ RNA_def_property_ui_text(prop, "Opacity", "The amount of pressure on the brush.");
+
+ /* pointers */
+ /* XXX: figure out how to link to tex (texact?) */
+
+ /*
+ prop= RNA_def_property(srna, "clone", PROP_POINTER, PROP_NONE);
+ RNA_def_property_pointer_sdna(prop, NULL, "clone");
+ RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
+ RNA_def_property_ui_text(prop, "Clone", "Clone tool linked to the brush.");
+ */
+
+ /* flag */
+ prop= RNA_def_property(srna, "airbrush", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_AIRBRUSH);
+ RNA_def_property_ui_text(prop, "Airbrush", "Set brush into airbrush mode.");
+
+ prop= RNA_def_property(srna, "torus", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_TORUS);
+ RNA_def_property_ui_text(prop, "Torus", "Set brush into torus mapping mode.");
+
+ prop= RNA_def_property(srna, "alpha_pressure", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_ALPHA_PRESSURE);
+ RNA_def_property_ui_text(prop, "Opacity Pressure", "Set pressure sensitivity for opacity.");
+
+ prop= RNA_def_property(srna, "size_pressure", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_SIZE_PRESSURE);
+ RNA_def_property_ui_text(prop, "Size Pressure", "Set pressure sensitivity for size.");
+
+ prop= RNA_def_property(srna, "falloff_pressure", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_RAD_PRESSURE);
+ RNA_def_property_ui_text(prop, "Falloff Pressure", "Set pressure sensitivity for falloff.");
+
+ prop= RNA_def_property(srna, "spacing_pressure", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_SPACING_PRESSURE);
+ RNA_def_property_ui_text(prop, "Spacing Pressure", "Set pressure sensitivity for spacing.");
+
+ prop= RNA_def_property(srna, "fixed_tex", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_FIXED_TEX);
+ RNA_def_property_ui_text(prop, "Fixed Texture", "Keep texture origin in fixed position.");
+}
+
+#endif
Property changes on: branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h 2008-12-01 00:48:54 UTC (rev 17657)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h 2008-12-01 06:52:18 UTC (rev 17658)
@@ -82,6 +82,8 @@
void RNA_def_ID(struct BlenderRNA *brna);
void RNA_def_actuator(struct BlenderRNA *brna);
+void RNA_def_brush(struct BlenderRNA *brna);
+void RNA_def_brushclone(struct BlenderRNA *brna);
void RNA_def_camera(struct BlenderRNA *brna);
void RNA_def_color(struct BlenderRNA *brna);
void RNA_def_controller(struct BlenderRNA *brna);
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c 2008-12-01 00:48:54 UTC (rev 17657)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c 2008-12-01 06:52:18 UTC (rev 17658)
@@ -108,17 +108,17 @@
RNA_def_property_ui_text(prop, "Update", "Metaball edit update option.");
/* Number values */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list