[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18091] branches/blender2.5/blender/source /blender/editors/space_view3d: 2.5

[Michael Fox]

Revision: 18091
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18091
Author:   mfoxdogg
Date:     2008-12-27 02:29:56 +0100 (Sat, 27 Dec 2008)

Log Message:
-----------
2.5
******

Set the render border operator

- Hotkey same as old (shift-b)
- behavior is the same as old, even draws the same

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
    branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
    branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c	2008-12-26 23:29:38 UTC (rev 18090)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c	2008-12-27 01:29:56 UTC (rev 18091)
@@ -874,6 +874,85 @@
 	ot->poll= ED_operator_view3d_active;
 }
 
+/* ********************* Set render border operator ****************** */
+
+static int render_border_exec(bContext *C, wmOperator *op)
+{
+	ScrArea *sa= CTX_wm_area(C);
+	ARegion *ar= CTX_wm_region(C);
+	View3D *v3d= sa->spacedata.first;
+	Scene *scene= CTX_data_scene(C);
+	
+	rcti rect;
+	rctf vb;
+	
+	/* get border select values using rna */
+	rect.xmin= RNA_int_get(op->ptr, "xmin");
+	rect.ymin= RNA_int_get(op->ptr, "ymin");
+	rect.xmax= RNA_int_get(op->ptr, "xmax");
+	rect.ymax= RNA_int_get(op->ptr, "ymax");
+	
+	/* calculate range */
+	calc_viewborder(scene, ar, v3d, &vb);
+
+	scene->r.border.xmin= ((float)rect.xmin-vb.xmin)/(vb.xmax-vb.xmin);
+	scene->r.border.ymin= ((float)rect.ymin-vb.ymin)/(vb.ymax-vb.ymin);
+	scene->r.border.xmax= ((float)rect.xmax-vb.xmin)/(vb.xmax-vb.xmin);
+	scene->r.border.ymax= ((float)rect.ymax-vb.ymin)/(vb.ymax-vb.ymin);
+	
+	/* actually set border */	
+	CLAMP(scene->r.border.xmin, 0.0, 1.0);
+	CLAMP(scene->r.border.ymin, 0.0, 1.0);
+	CLAMP(scene->r.border.xmax, 0.0, 1.0);
+	CLAMP(scene->r.border.ymax, 0.0, 1.0);
+		
+	/* drawing a border surrounding the entire camera view switches off border rendering
+	 * or the border covers no pixels */
+	if ((scene->r.border.xmin <= 0.0 && scene->r.border.xmax >= 1.0 &&
+		scene->r.border.ymin <= 0.0 && scene->r.border.ymax >= 1.0) ||
+	   (scene->r.border.xmin == scene->r.border.xmax ||
+		scene->r.border.ymin == scene->r.border.ymax ))
+	{
+		scene->r.mode &= ~R_BORDER;
+	} else {
+		scene->r.mode |= R_BORDER;
+	}
+	
+	return OPERATOR_FINISHED;
+
+}
+
+static int view3d_render_border_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	ScrArea *sa= CTX_wm_area(C);
+	View3D *v3d= sa->spacedata.first;
+	
+	/* if not in camera view do not exec the operator*/
+	if (v3d->persp == V3D_CAMOB) return WM_border_select_invoke(C, op, event);	
+	else return OPERATOR_PASS_THROUGH;
+}
+
+void VIEW3D_OT_render_border(wmOperatorType *ot)
+{
+	
+	/* identifiers */
+	ot->name= "Set Render Border";
+	ot->idname= "VIEW3D_OT_render_border";
+
+	/* api callbacks */
+	ot->invoke= view3d_render_border_invoke;
+	ot->exec= render_border_exec;
+	ot->modal= WM_border_select_modal;
+	
+	ot->poll= ED_operator_view3d_active;
+	
+	/* rna */
+	RNA_def_property(ot->srna, "xmin", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "xmax", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "ymin", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "ymax", PROP_INT, PROP_NONE);
+
+}
 /* ********************* Changing view operator ****************** */
 
 static EnumPropertyItem prop_view_items[] = {

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h	2008-12-26 23:29:38 UTC (rev 18090)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h	2008-12-27 01:29:56 UTC (rev 18091)
@@ -80,6 +80,7 @@
 void VIEW3D_OT_viewcenter(struct wmOperatorType *ot);
 void VIEW3D_OT_clipping(struct wmOperatorType *ot);
 void VIEW3D_OT_cursor3d(struct wmOperatorType *ot);
+void VIEW3D_OT_render_border(struct wmOperatorType *ot);
 
 /* drawobject.c */
 void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag);

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c	2008-12-26 23:29:38 UTC (rev 18090)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c	2008-12-27 01:29:56 UTC (rev 18091)
@@ -72,6 +72,7 @@
 	WM_operatortype_append(VIEW3D_OT_clipping);
 	WM_operatortype_append(VIEW3D_OT_circle_select);
 	WM_operatortype_append(VIEW3D_OT_smoothview);
+	WM_operatortype_append(VIEW3D_OT_render_border);
 	WM_operatortype_append(VIEW3D_OT_cursor3d);
 }
 
@@ -118,6 +119,7 @@
 	WM_keymap_add_item(keymap, "VIEW3D_OT_borderselect", BKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "VIEW3D_OT_clipping", BKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "VIEW3D_OT_circle_select", CKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "VIEW3D_OT_render_border", BKEY, KM_PRESS, KM_SHIFT, 0);
 
 	/* TODO - this is just while we have no way to load a text datablock */
 	RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_run_pyfile", PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py");