Revision: 20523
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20523
Author: broken
Date: 2009-05-31 03:22:34 +0200 (Sun, 31 May 2009)
Log Message:
-----------
* started wrapping 3d view space in RNA
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesdna/DNA_view3d_types.h
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_view3d_types.h
2009-05-30 23:31:10 UTC (rev 20522)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_view3d_types.h
2009-05-31 01:22:34 UTC (rev 20523)
@@ -65,8 +65,7 @@
typedef struct BGpic {
struct Image *ima;
struct ImageUser iuser;
- float xof, yof, size, zoom, blend;
- short xim, yim;
+ float xof, yof, size, blend;
} BGpic;
/* ********************************* */
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2009-05-30 23:31:10 UTC (rev 20522)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2009-05-31 01:22:34 UTC (rev 20523)
@@ -55,6 +55,7 @@
extern StructRNA RNA_Armature;
extern StructRNA RNA_ArmatureModifier;
extern StructRNA RNA_ArrayModifier;
+extern StructRNA RNA_BackgroundImage;
extern StructRNA RNA_BevelModifier;
extern StructRNA RNA_BezierCurvePoint;
extern StructRNA RNA_BlenderRNA;
@@ -243,6 +244,7 @@
extern StructRNA RNA_Sound;
extern StructRNA RNA_SoundSequence;
extern StructRNA RNA_Space;
+extern StructRNA RNA_Space3DView;
extern StructRNA RNA_SpaceImageEditor;
extern StructRNA RNA_SpaceUVEditor;
extern StructRNA RNA_SpaceTextEditor;
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
2009-05-30 23:31:10 UTC (rev 20522)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
2009-05-31 01:22:34 UTC (rev 20523)
@@ -75,13 +75,13 @@
prop= RNA_def_property(srna, "clip_start", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "clipsta");
- RNA_def_property_range(prop, 0.0f, 100.0f);
+ RNA_def_property_range(prop, 0.0f, FLT_MAX);
RNA_def_property_ui_text(prop, "Clip Start", "Camera near clipping
distance.");
RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
prop= RNA_def_property(srna, "clip_end", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "clipend");
- RNA_def_property_range(prop, 1.0f, 5000.0f);
+ RNA_def_property_range(prop, 1.0f, FLT_MAX);
RNA_def_property_ui_text(prop, "Clip End", "Camera far clipping
distance.");
RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
2009-05-30 23:31:10 UTC (rev 20522)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
2009-05-31 01:22:34 UTC (rev 20523)
@@ -29,7 +29,9 @@
#include "rna_internal.h"
+#include "DNA_object_types.h"
#include "DNA_space_types.h"
+#include "DNA_view3d_types.h"
#include "WM_types.h"
@@ -65,9 +67,9 @@
SpaceLink *space= (SpaceLink*)ptr->data;
switch(space->spacetype) {
- /*case SPACE_VIEW3D:
- return &RNA_SpaceView3D;
- case SPACE_IPO:
+ case SPACE_VIEW3D:
+ return &RNA_Space3DView;
+ /*case SPACE_IPO:
return &RNA_SpaceGraphEditor;
*/
case SPACE_OUTLINER:
@@ -278,13 +280,197 @@
RNA_def_property_enum_sdna(prop, NULL, "outlinevis");
RNA_def_property_enum_items(prop, display_mode_items);
RNA_def_property_ui_text(prop, "Display Mode", "Type of information to
display");
+ RNA_def_property_update(prop, NC_WINDOW, NULL);
prop= RNA_def_property(srna, "show_restriction_columns", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag",
SO_HIDE_RESTRICTCOLS);
RNA_def_property_ui_text(prop, "Show Restriction Columns", "Show
colum");
+ RNA_def_property_update(prop, NC_WINDOW, NULL);
}
+static void rna_def_background_image(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+
+ srna= RNA_def_struct(brna, "BackgroundImage", NULL);
+ RNA_def_struct_sdna(srna, "BGpic");
+ RNA_def_struct_ui_text(srna, "Background Image", "Image and settings
for display in the 3d View background.");
+
+ prop= RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE);
+ RNA_def_property_pointer_sdna(prop, NULL, "ima");
+ RNA_def_property_ui_text(prop, "Image", "Image displayed and edited in
this space.");
+
+ prop= RNA_def_property(srna, "image_user", PROP_POINTER,
PROP_NEVER_NULL);
+ RNA_def_property_pointer_sdna(prop, NULL, "iuser");
+ RNA_def_property_ui_text(prop, "Image User", "Parameters defining which
layer, pass and frame of the image is displayed.");
+
+ prop= RNA_def_property(srna, "x_offset", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "xof");
+ RNA_def_property_ui_text(prop, "X Offset", "Offsets image horizontally
from the view center");
+
+ prop= RNA_def_property(srna, "y_offset", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "yof");
+ RNA_def_property_ui_text(prop, "Y Offset", "Offsets image vertically
from the view center");
+
+ prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "size");
+ RNA_def_property_ui_text(prop, "Size", "Scaling factor for the
background image.");
+ RNA_def_property_range(prop, 0.0, FLT_MAX);
+
+ prop= RNA_def_property(srna, "transparency", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "blend");
+ RNA_def_property_ui_text(prop, "Transparency", "Amount to blend the
image against the background color.");
+ RNA_def_property_range(prop, 0.0, 1.0);
+
+}
+
+static void rna_def_space_3dview(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+
+ static EnumPropertyItem viewport_shading_items[] = {
+ {OB_BOUNDBOX, "BOUNDBOX", "Bounding Box", "Display the object's
local bounding boxes only"},
+ {OB_WIRE, "WIREFRAME", "Wireframe", "Display the object as wire
edges"},
+ {OB_SOLID, "SOLID", "Solid", "Display the object solid, lit
with default OpenGL lights"},
+ {OB_SHADED, "SHADED", "Shaded", "Display the object solid, with
preview shading interpolated at vertices"},
+ {OB_TEXTURE, "TEXTURED", "Textured", "Display the object solid,
with face-assigned textures"},
+ {0, NULL, NULL, NULL}};
+
+ static EnumPropertyItem pivot_items[] = {
+ {V3D_CENTER, "BOUNDING_BOX_CENTER", "Bounding Box Center", ""},
+ {V3D_CURSOR, "CURSOR", "3D Cursor", ""},
+ {V3D_LOCAL, "INDIVIDUAL_CENTERS", "Individual Centers", ""},
+ {V3D_CENTROID, "MEDIAN_POINT", "Median Point", ""},
+ {V3D_ACTIVE, "ACTIVE_ELEMENT", "Active Element", ""},
+ {0, NULL, NULL, NULL}};
+
+ static EnumPropertyItem transform_orientation_items[] = {
+ {V3D_MANIP_GLOBAL, "ORIENT_GLOBAL", "Global", "Align the
transformation axes to world space"},
+ {V3D_MANIP_LOCAL, "ORIENT_LOCAL", "Local", "Align the
transformation axes to the selected objects' local space"},
+ {V3D_MANIP_NORMAL, "ORIENT_NORMAL", "Normal", "Align the
transformation axes to average normal of selected elements (bone Y axis for
pose mode)"},
+ {V3D_MANIP_VIEW, "ORIENT_VIEW", "View", "Align the
transformation axes to the window"},
+ {V3D_MANIP_CUSTOM, "ORIENT_CUSTOM", "Custom", "Use a custom
transform orientation"},
+ {0, NULL, NULL, NULL}};
+
+ srna= RNA_def_struct(brna, "Space3DView", "Space");
+ RNA_def_struct_sdna(srna, "View3D");
+ RNA_def_struct_ui_text(srna, "3D View Space", "3D View space data");
+
+ prop= RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE);
+ RNA_def_property_pointer_sdna(prop, NULL, "camera");
+ RNA_def_property_ui_text(prop, "Camera", "Active camera used in this
view (when unlocked from the scene's active camera).");
+
+ prop= RNA_def_property(srna, "lock_object", PROP_POINTER, PROP_NONE);
+ RNA_def_property_pointer_sdna(prop, NULL, "ob_centre");
+ RNA_def_property_ui_text(prop, "Lock Object", "3D View center is locked
to this object's position");
+
+ prop= RNA_def_property(srna, "background_image", PROP_POINTER,
PROP_NONE);
+ RNA_def_property_pointer_sdna(prop, NULL, "bgpic");
+ RNA_def_property_ui_text(prop, "Background Image", "Image and settings
to display in the 3D View background");
+
+ prop= RNA_def_property(srna, "viewport_shading", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_sdna(prop, NULL, "drawtype");
+ RNA_def_property_enum_items(prop, viewport_shading_items);
+ RNA_def_property_ui_text(prop, "Viewport Shading", "Method to
display/shade objects in the 3D View.");
+
+ prop= RNA_def_property(srna, "localview", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "localview", 0);
+ RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+ RNA_def_property_ui_text(prop, "Local View", "Display an isolated
sub-set of objects, apart from the scene visibility.");
+
+ prop= RNA_def_property(srna, "lens", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "lens");
+ RNA_def_property_ui_text(prop, "Lens", "Lens angle (mm) in perspective
view.");
+ RNA_def_property_range(prop, 1.0f, 250.0f);
+
+ prop= RNA_def_property(srna, "clip_start", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "near");
+ RNA_def_property_range(prop, 0.0f, FLT_MAX);
+ RNA_def_property_ui_text(prop, "Clip Start", "3D View near clipping
distance.");
+
+ prop= RNA_def_property(srna, "clip_end", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "far");
+ RNA_def_property_range(prop, 1.0f, FLT_MAX);
+ RNA_def_property_ui_text(prop, "Clip End", "3D View far clipping
distance.");
+
+ prop= RNA_def_property(srna, "grid_spacing", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "grid");
+ RNA_def_property_ui_text(prop, "Grid Spacing", "The distance between 3D
View grid lines.");
+ RNA_def_property_range(prop, 0.0f, FLT_MAX);
+
+ prop= RNA_def_property(srna, "grid_lines", PROP_INT, PROP_NONE);
+ RNA_def_property_int_sdna(prop, NULL, "gridlines");
+ RNA_def_property_ui_text(prop, "Grid Lines", "The number of grid lines
to display in perspective view.");
+ RNA_def_property_range(prop, 0, 1024);
+
+ prop= RNA_def_property(srna, "grid_subdivisions", PROP_INT, PROP_NONE);
+ RNA_def_property_int_sdna(prop, NULL, "gridsubdiv");
+ RNA_def_property_ui_text(prop, "Grid Subdivisions", "The number of
subdivisions between grid lines.");
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
