[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17649] branches/blender2.5/blender/source /blender/makesrna:

Brecht Van Lommel brecht at blender.org
Sun Nov 30 19:39:50 CET 2008


Revision: 17649
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17649
Author:   blendix
Date:     2008-11-30 19:39:49 +0100 (Sun, 30 Nov 2008)

Log Message:
-----------

RNA:
* DNA_image_types.h done, except for some properties not being editable.

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_main.c

Added Paths:
-----------
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c

Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h	2008-11-30 16:38:56 UTC (rev 17648)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h	2008-11-30 18:39:49 UTC (rev 17649)
@@ -51,10 +51,13 @@
 extern StructRNA RNA_ID;
 extern StructRNA RNA_IDProperty;
 extern StructRNA RNA_IDPropertyGroup;
+extern StructRNA RNA_Image;
+extern StructRNA RNA_ImageUser;
 extern StructRNA RNA_IntProperty;
 extern StructRNA RNA_JoystickSensor;
 extern StructRNA RNA_KeyboardSensor;
 extern StructRNA RNA_Lamp;
+extern StructRNA RNA_Lattice;
 extern StructRNA RNA_Library;
 extern StructRNA RNA_MCol;
 extern StructRNA RNA_MColLayer;
@@ -103,8 +106,6 @@
 extern StructRNA RNA_UnknownType;
 extern StructRNA RNA_WindowManager;
 
-extern StructRNA RNA_Lattice;
-
 /* Pointer
  *
  * These functions will fill in RNA pointers, this can be done in three ways:

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c	2008-11-30 16:38:56 UTC (rev 17648)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c	2008-11-30 18:39:49 UTC (rev 17649)
@@ -880,6 +880,7 @@
 	{"rna_color.c", RNA_def_color},
 	{"rna_controller.c", RNA_def_controller},
 	{"rna_group.c", RNA_def_group},
+	{"rna_image.c", RNA_def_image},
 	{"rna_lamp.c", RNA_def_lamp},
 	{"rna_lattice.c", RNA_def_lattice},
 	{"rna_main.c", RNA_def_main},

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c	2008-11-30 16:38:56 UTC (rev 17648)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c	2008-11-30 18:39:49 UTC (rev 17649)
@@ -60,6 +60,7 @@
 	switch(GS(id->name)) {
 		case ID_CA: return &RNA_Camera;
 		case ID_GR: return &RNA_Group;
+		case ID_IM: return &RNA_Image;
 		case ID_LA: return &RNA_Lamp;
 		case ID_LI: return &RNA_Library;
 		case ID_LT: return &RNA_Lattice;

Added: branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c	                        (rev 0)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c	2008-11-30 18:39:49 UTC (rev 17649)
@@ -0,0 +1,230 @@
+/**
+ * $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): Brecht Van Lommel
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+
+#include "RNA_define.h"
+#include "RNA_types.h"
+
+#include "rna_internal.h"
+
+#include "DNA_image_types.h"
+#include "DNA_scene_types.h"
+
+#include "BKE_image.h"
+
+#ifdef RNA_RUNTIME
+
+#else
+
+static void rna_def_imageuser(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	srna= RNA_def_struct(brna, "ImageUser", NULL, "ImageUser");
+
+	prop= RNA_def_property(srna, "auto_refresh", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_ANIM_ALWAYS);
+	RNA_def_property_ui_text(prop, "Auto Refresh", "Always refresh image on frame changes.");
+
+	/* animation */
+	prop= RNA_def_property(srna, "cyclic", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "cycl", 0);
+	RNA_def_property_ui_text(prop, "Cyclic", "Cycle the images in the movie.");
+
+	prop= RNA_def_property(srna, "frames", PROP_INT, PROP_NONE);
+	RNA_def_property_range(prop, 0, MAXFRAMEF);
+	RNA_def_property_ui_text(prop, "Frames", "Sets the number of images of a movie to use.");
+
+	prop= RNA_def_property(srna, "offset", PROP_INT, PROP_NONE);
+	RNA_def_property_range(prop, -MAXFRAMEF, MAXFRAMEF);
+	RNA_def_property_ui_text(prop, "Offset", "Offsets the number of the frame to use in the animation.");
+
+	prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "sfra");
+	RNA_def_property_range(prop, 1.0f, MAXFRAMEF);
+	RNA_def_property_ui_text(prop, "Start Frame", "Sets the global starting frame of the movie.");
+
+	prop= RNA_def_property(srna, "fields_per_frame", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "fie_ima");
+	RNA_def_property_range(prop, -MAXFRAMEF, MAXFRAMEF);
+	RNA_def_property_ui_text(prop, "Fields per Frame", "The number of fields per rendered frame (2 fields is 1 image).");
+
+	prop= RNA_def_property(srna, "layer", PROP_INT, PROP_UNSIGNED);
+	RNA_def_property_flag(prop, PROP_NOT_EDITABLE); /* image_multi_cb */
+	RNA_def_property_ui_text(prop, "Layer", "Layer in multilayer image.");
+
+	prop= RNA_def_property(srna, "pass", PROP_INT, PROP_UNSIGNED);
+	RNA_def_property_flag(prop, PROP_NOT_EDITABLE); /* image_multi_cb */
+	RNA_def_property_ui_text(prop, "Pass", "Pass in multilayer image.");
+}
+
+static void rna_def_image(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+	static const EnumPropertyItem prop_type_items[]= {
+		{IMA_TYPE_IMAGE, "IMAGE", "Image", ""},
+		{IMA_TYPE_MULTILAYER, "MULTILAYER", "Multilayer", ""},
+		{IMA_TYPE_UV_TEST, "UVTEST", "UV Test", ""},
+		//{IMA_TYPE_VERSE, "VERSE", "Verse", ""},
+		{IMA_TYPE_R_RESULT, "RENDERRESULT", "Render Result", ""},
+		{IMA_TYPE_COMPOSITE, "COMPOSITING", "Compositing", ""},
+		{0, NULL, NULL, NULL}};
+	static const EnumPropertyItem prop_source_items[]= {
+		{IMA_SRC_FILE, "FILE", "File", "Single image file"},
+		{IMA_SRC_SEQUENCE, "SEQUENCE", "Sequence", "Multiple image files, as a sequence"},
+		{IMA_SRC_MOVIE, "MOVIE", "Movie", "Movie file"},
+		{IMA_SRC_GENERATED, "GENERATED", "Generated", "Generated image"},
+		{IMA_SRC_VIEWER, "VIEWER", "Viewer", "Compositing node viewer"},
+		{0, NULL, NULL, NULL}};
+	static const EnumPropertyItem prop_generated_type_items[]= {
+		{0, "BLANK", "Blank", "Generate a blank image"},
+		{1, "UVTESTGRID", "UV Test Grid", "Generated grid to test UV mappings"},
+		{0, NULL, NULL, NULL}};
+	static const EnumPropertyItem prop_mapping_items[]= {
+		{0, "UV", "UV Coordinates", "Use UV coordinates for mapping the image"},
+		{IMA_REFLECT, "REFLECTION", "Reflection", "Use reflection mapping for mapping the image"},
+		{0, NULL, NULL, NULL}};
+
+	srna= RNA_def_struct(brna, "Image", "ID", "Image");
+
+	prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH);
+	RNA_def_property_string_sdna(prop, NULL, "name");
+	RNA_def_property_flag(prop, PROP_NOT_EDITABLE); /* imagechanged */
+	RNA_def_property_ui_text(prop, "Filename", "Image/Movie file name.");
+
+	prop= RNA_def_property(srna, "source", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_items(prop, prop_source_items);
+	RNA_def_property_flag(prop, PROP_NOT_EDITABLE); /* imagechanged */
+	RNA_def_property_ui_text(prop, "Source", "Where the image comes from.");
+
+	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_items(prop, prop_type_items);
+	RNA_def_property_flag(prop, PROP_NOT_EDITABLE); /* imagechanged */
+	RNA_def_property_ui_text(prop, "Type", "How to generate the image.");
+
+	prop= RNA_def_property(srna, "packed_file", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "packedfile");
+	RNA_def_property_struct_type(prop, "UnknownType");
+	RNA_def_property_ui_text(prop, "Packed File", "");
+
+	/* booleans */
+	prop= RNA_def_property(srna, "fields", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_FIELDS);
+	RNA_def_property_ui_text(prop, "Fields", "Use fields of the image.");
+
+	prop= RNA_def_property(srna, "odd_fields", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_STD_FIELD);
+	RNA_def_property_ui_text(prop, "Odd Fields", "Standard field toggle.");
+
+	prop= RNA_def_property(srna, "antialias", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_ANTIALI);
+	RNA_def_property_ui_text(prop, "Anti-alias", "Toggles image anti-aliasing, only works with solid colors");
+
+	prop= RNA_def_property(srna, "premultiply", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_DO_PREMUL);
+	RNA_def_property_ui_text(prop, "Premultiply", "Convert from key alpha to premultiplied alpha.");
+
+	/* generated image (image_generated_change_cb) */
+	prop= RNA_def_property(srna, "generated_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "gen_type", 0);
+	RNA_def_property_enum_items(prop, prop_generated_type_items);
+	RNA_def_property_ui_text(prop, "Generated Type", "Generated image type.");
+
+	prop= RNA_def_property(srna, "generated_width", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "gen_x");
+	RNA_def_property_range(prop, 1, 5000);
+	RNA_def_property_ui_text(prop, "Generated Width", "Generated image width.");
+
+	prop= RNA_def_property(srna, "generated_height", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "gen_y");
+	RNA_def_property_range(prop, 1, 5000);
+	RNA_def_property_ui_text(prop, "Generated Height", "Generated image height.");
+
+	/* realtime properties */
+	prop= RNA_def_property(srna, "mapping", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "flag", PROP_DEF_ENUM_BITFLAGS);
+	RNA_def_property_enum_items(prop, prop_mapping_items);
+	RNA_def_property_ui_text(prop, "Mapping", "Mapping type to use for this image in the game engine.");
+
+	prop= RNA_def_property(srna, "display_aspect", PROP_FLOAT, PROP_VECTOR);
+	RNA_def_property_float_sdna(prop, NULL, "aspx");

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list