Revision: 17647
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17647
Author: blendix
Date: 2008-11-30 16:55:14 +0100 (Sun, 30 Nov 2008)
Log Message:
-----------
RNA
* DNA_radio_types.h: done. (patch by Jorge Bernal). Also adds
some #defines in the radiosity DNA since it was using hardcoded
values.
* Added an "UnknownType" which has no properties, useful as a
placeholder for pointers that have no defined type yet.
* Sort a few lists in the code alphabetically.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesdna/DNA_radio_types.h
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_scene.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_sensor.c
branches/blender2.5/blender/source/blender/radiosity/extern/include/radio_types.h
branches/blender2.5/blender/source/blender/radiosity/intern/source/raddisplay.c
branches/blender2.5/blender/source/blender/radiosity/intern/source/radio.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_radio.c
Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_radio_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_radio_types.h
2008-11-30 14:40:00 UTC (rev 17646)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_radio_types.h
2008-11-30 15:55:14 UTC (rev 17647)
@@ -46,5 +46,17 @@
} Radio;
+
+/* **************** RADIOSITY ********************* */
+
+/* draw type */
+#define RAD_WIREFRAME 0
+#define RAD_SOLID 1
+#define RAD_GOURAUD 2
+
+/* flag */
+#define RAD_SHOWLIMITS 1
+#define RAD_SHOWZ 2
+
#endif
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2008-11-30 14:40:00 UTC (rev 17646)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2008-11-30 15:55:14 UTC (rev 17647)
@@ -35,69 +35,74 @@
extern BlenderRNA BLENDER_RNA;
+extern StructRNA RNA_ActuatorSensor;
+extern StructRNA RNA_BooleanProperty;
+extern StructRNA RNA_Camera;
+extern StructRNA RNA_CollectionProperty;
+extern StructRNA RNA_CollisionSensor;
+extern StructRNA RNA_CurveMap;
+extern StructRNA RNA_CurveMapPoint;
+extern StructRNA RNA_CurveMapping;
+extern StructRNA RNA_DelaySensor;
+extern StructRNA RNA_EnumProperty;
+extern StructRNA RNA_EnumPropertyItem;
+extern StructRNA RNA_FloatProperty;
+extern StructRNA RNA_Group;
extern StructRNA RNA_ID;
extern StructRNA RNA_IDProperty;
extern StructRNA RNA_IDPropertyGroup;
-extern StructRNA RNA_Main;
-extern StructRNA RNA_CurveMapping;
-extern StructRNA RNA_Mesh;
-extern StructRNA RNA_MVert;
-extern StructRNA RNA_MVertGroup;
+extern StructRNA RNA_IntProperty;
+extern StructRNA RNA_JoystickSensor;
+extern StructRNA RNA_KeyboardSensor;
+extern StructRNA RNA_Lamp;
+extern StructRNA RNA_Library;
+extern StructRNA RNA_MCol;
+extern StructRNA RNA_MColLayer;
extern StructRNA RNA_MEdge;
extern StructRNA RNA_MFace;
-extern StructRNA RNA_MTFace;
-extern StructRNA RNA_MTFaceLayer;
-extern StructRNA RNA_MSticky;
-extern StructRNA RNA_MCol;
-extern StructRNA RNA_MColLayer;
extern StructRNA RNA_MFloatProperty;
extern StructRNA RNA_MFloatPropertyLayer;
extern StructRNA RNA_MIntProperty;
extern StructRNA RNA_MIntPropertyLayer;
+extern StructRNA RNA_MMultires;
+extern StructRNA RNA_MSticky;
extern StructRNA RNA_MStringProperty;
extern StructRNA RNA_MStringPropertyLayer;
-extern StructRNA RNA_MMultires;
-extern StructRNA RNA_Object;
-extern StructRNA RNA_Struct;
-extern StructRNA RNA_Property;
-extern StructRNA RNA_BooleanProperty;
-extern StructRNA RNA_IntProperty;
-extern StructRNA RNA_FloatProperty;
-extern StructRNA RNA_StringProperty;
-extern StructRNA RNA_EnumProperty;
-extern StructRNA RNA_EnumPropertyItem;
-extern StructRNA RNA_PointerProperty;
-extern StructRNA RNA_CollectionProperty;
-extern StructRNA RNA_Scene;
-extern StructRNA RNA_Lamp;
+extern StructRNA RNA_MTFace;
+extern StructRNA RNA_MTFaceLayer;
+extern StructRNA RNA_MVert;
+extern StructRNA RNA_MVertGroup;
+extern StructRNA RNA_Main;
extern StructRNA RNA_Material;
+extern StructRNA RNA_Mesh;
+extern StructRNA RNA_MessageSensor;
+extern StructRNA RNA_MouseSensor;
+extern StructRNA RNA_NearSensor;
+extern StructRNA RNA_Node;
extern StructRNA RNA_NodeTree;
-extern StructRNA RNA_Node;
-extern StructRNA RNA_Screen;
-extern StructRNA RNA_ScrVert;
-extern StructRNA RNA_ScrEdge;
-extern StructRNA RNA_ScrArea;
+extern StructRNA RNA_Object;
+extern StructRNA RNA_Operator;
extern StructRNA RNA_Panel;
-extern StructRNA RNA_Region;
-extern StructRNA RNA_Operator;
-extern StructRNA RNA_WindowManager;
-extern StructRNA RNA_Sensor;
-extern StructRNA RNA_TouchSensor;
-extern StructRNA RNA_NearSensor;
-extern StructRNA RNA_KeyboardSensor;
+extern StructRNA RNA_PointerProperty;
+extern StructRNA RNA_Property;
extern StructRNA RNA_PropertySensor;
-extern StructRNA RNA_MouseSensor;
-extern StructRNA RNA_CollisionSensor;
extern StructRNA RNA_RadarSensor;
+extern StructRNA RNA_Radiosity;
extern StructRNA RNA_RandomSensor;
extern StructRNA RNA_RaySensor;
-extern StructRNA RNA_MessageSensor;
-extern StructRNA RNA_JoystickSensor;
-extern StructRNA RNA_ActuatorSensor;
-extern StructRNA RNA_DelaySensor;
-extern StructRNA RNA_Controller;
-extern StructRNA RNA_Camera;
-extern StructRNA RNA_Group;
+extern StructRNA RNA_Region;
+extern StructRNA RNA_Scene;
+extern StructRNA RNA_ScrArea;
+extern StructRNA RNA_ScrEdge;
+extern StructRNA RNA_ScrVert;
+extern StructRNA RNA_Screen;
+extern StructRNA RNA_Sensor;
+extern StructRNA RNA_StringProperty;
+extern StructRNA RNA_Struct;
+extern StructRNA RNA_TouchSensor;
+extern StructRNA RNA_UnknownType;
+extern StructRNA RNA_WindowManager;
+
/* 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 14:40:00 UTC (rev 17646)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2008-11-30 15:55:14 UTC (rev 17647)
@@ -876,21 +876,22 @@
RNAProcessItem PROCESS_ITEMS[]= {
{"rna_ID.c", RNA_def_ID},
+ {"rna_camera.c", RNA_def_camera},
+ {"rna_color.c", RNA_def_color},
+ {"rna_controller.c", RNA_def_controller},
+ {"rna_group.c", RNA_def_group},
+ {"rna_lamp.c", RNA_def_lamp},
{"rna_main.c", RNA_def_main},
- {"rna_color.c", RNA_def_color},
+ {"rna_material.c", RNA_def_material},
{"rna_mesh.c", RNA_def_mesh},
{"rna_nodetree.c", RNA_def_nodetree},
- {"rna_material.c", RNA_def_material},
{"rna_object.c", RNA_def_object},
+ {"rna_radio.c", RNA_def_radio},
{"rna_rna.c", RNA_def_rna},
{"rna_scene.c", RNA_def_scene},
- {"rna_lamp.c", RNA_def_lamp},
{"rna_screen.c", RNA_def_screen},
+ {"rna_sensor.c", RNA_def_sensor},
{"rna_wm.c", RNA_def_wm},
- {"rna_sensor.c", RNA_def_sensor},
- {"rna_controller.c", RNA_def_controller},
- {"rna_camera.c", RNA_def_camera},
- {"rna_group.c", RNA_def_group},
{NULL, NULL}};
static int rna_preprocess(char *basedirectory, FILE *f)
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 14:40:00 UTC (rev 17646)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
2008-11-30 15:55:14 UTC (rev 17647)
@@ -185,6 +185,9 @@
}
void RNA_def_ID(BlenderRNA *brna)
{
+ /* simple built-in unknown type */
+ RNA_def_struct(brna, "UnknownType", NULL, "Unknown Type");
+
rna_def_ID(brna);
rna_def_ID_properties(brna);
rna_def_library(brna);
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
2008-11-30 14:40:00 UTC (rev 17646)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
2008-11-30 15:55:14 UTC (rev 17647)
@@ -81,21 +81,22 @@
extern BlenderRNA BLENDER_RNA;
void RNA_def_ID(struct BlenderRNA *brna);
+void RNA_def_camera(struct BlenderRNA *brna);
void RNA_def_color(struct BlenderRNA *brna);
+void RNA_def_controller(struct BlenderRNA *brna);
+void RNA_def_group(struct BlenderRNA *brna);
void RNA_def_lamp(struct BlenderRNA *brna);
void RNA_def_main(struct BlenderRNA *brna);
+void RNA_def_material(struct BlenderRNA *brna);
void RNA_def_mesh(struct BlenderRNA *brna);
+void RNA_def_nodetree(struct BlenderRNA *brna);
void RNA_def_object(struct BlenderRNA *brna);
-void RNA_def_nodetree(struct BlenderRNA *brna);
-void RNA_def_material(struct BlenderRNA *brna);
+void RNA_def_radio(struct BlenderRNA *brna);
void RNA_def_rna(struct BlenderRNA *brna);
void RNA_def_scene(struct BlenderRNA *brna);
void RNA_def_screen(struct BlenderRNA *brna);
+void RNA_def_sensor(struct BlenderRNA *brna);
void RNA_def_wm(struct BlenderRNA *brna);
-void RNA_def_sensor(struct BlenderRNA *brna);
-void RNA_def_controller(struct BlenderRNA *brna);
-void RNA_def_camera(struct BlenderRNA *brna);
-void RNA_def_group(struct BlenderRNA *brna);
/* ID Properties */
Added: branches/blender2.5/blender/source/blender/makesrna/intern/rna_radio.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_radio.c
(rev 0)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_radio.c
2008-11-30 15:55:14 UTC (rev 17647)
@@ -0,0 +1,139 @@
+/**
+ * $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).
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+
+#include "RNA_define.h"
+#include "RNA_types.h"
+
+#include "rna_internal.h"
+
+#include "DNA_radio_types.h"
+
+#ifdef RNA_RUNTIME
+
+#else
+
+void RNA_def_radio(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+ static EnumPropertyItem prop_drawtype_items[] = {
+ {RAD_WIREFRAME, "WIREFRAME", "Wireframe", "Enables Wireframe
draw mode"},
+ {RAD_SOLID, "SOLID", "Solid", "Enables Solid draw mode"},
+ {RAD_GOURAUD, "GOURAUD", "Gouraud", "Enables Gouraud draw
mode"},
+ {0, NULL, NULL, NULL}};
+
+ srna= RNA_def_struct(brna, "Radiosity", NULL, "Radiosity");
+ RNA_def_struct_sdna(srna, "Radio");
+
+ /* Enums */
+ prop= RNA_def_property(srna, "draw_mode", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_sdna(prop, NULL, "drawtype", 0);
+ RNA_def_property_enum_items(prop, prop_drawtype_items);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
