Revision: 23295
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23295
Author: joeedh
Date: 2009-09-17 00:27:22 +0200 (Thu, 17 Sep 2009)
Log Message:
-----------
forgot this file
Modified Paths:
--------------
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
Added Paths:
-----------
branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
2009-09-16 22:13:48 UTC (rev 23294)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
2009-09-16 22:27:22 UTC (rev 23295)
@@ -503,7 +503,6 @@
}
}
-
void EDBM_set_flag_all(BMEditMesh *em, int flag)
{
BMIter iter;
Added: branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
(rev 0)
+++ branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
2009-09-16 22:27:22 UTC (rev 23295)
@@ -0,0 +1,457 @@
+/**
+ * $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.
+ *
+ * The Original Code is Copyright (C) 2007 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Joseph Eagar, Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <float.h>
+#define _USE_MATH_DEFINES
+#include <math.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+
+#include "DNA_ID.h"
+#include "DNA_screen_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_windowmanager_types.h"
+#include "DNA_object_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "PIL_time.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_dynstr.h" /*for WM_operator_pystring */
+#include "BLI_editVert.h"
+
+#include "BKE_blender.h"
+#include "BKE_context.h"
+#include "BKE_scene.h"
+#include "BKE_utildefines.h"
+#include "BKE_mesh.h"
+#include "BKE_tessmesh.h"
+#include "BKE_depsgraph.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h" /* for paint cursor */
+
+#include "IMB_imbuf_types.h"
+
+#include "ED_screen.h"
+#include "ED_util.h"
+#include "ED_space_api.h"
+#include "ED_view3d.h"
+#include "ED_mesh.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "mesh_intern.h"
+
+/* ringsel operator */
+
+/* struct for properties used while drawing */
+typedef struct tringselOpData {
+ ARegion *ar; /* region that ringsel was activated in */
+ void *draw_handle; /* for drawing preview loop */
+
+ float (*edges)[2][3];
+ int totedge;
+
+ ViewContext vc;
+
+ Object *ob;
+ BMEditMesh *em;
+ BMEdge *eed;
+
+ int extend;
+ int do_cut;
+} tringselOpData;
+
+/* modal loop selection drawing callback */
+static void ringsel_draw(const bContext *C, ARegion *ar, void *arg)
+{
+ int i;
+ tringselOpData *lcd = arg;
+
+ glDisable(GL_DEPTH_TEST);
+
+ glPushMatrix();
+ glMultMatrixf(lcd->ob->obmat);
+
+ glColor3ub(255, 0, 255);
+ glBegin(GL_LINES);
+ for (i=0; i<lcd->totedge; i++) {
+ glVertex3fv(lcd->edges[i][0]);
+ glVertex3fv(lcd->edges[i][1]);
+ }
+ glEnd();
+
+ glPopMatrix();
+ glEnable(GL_DEPTH_TEST);
+}
+
+static void edgering_sel(tringselOpData *lcd, int previewlines, int select)
+{
+ BMEditMesh *em = lcd->em;
+ BMEdge *startedge = lcd->eed;
+ BMEdge *eed, *lasteed;
+ BMVert *v[2][2];
+ BMWalker walker;
+ float (*edges)[2][3] = NULL;
+ V_DYNDECLARE(edges);
+ float co[2][3];
+ int looking=1, i, j=0, tot=0;
+
+ if (!startedge)
+ return;
+
+ if (lcd->edges) {
+ MEM_freeN(lcd->edges);
+ lcd->edges = NULL;
+ lcd->totedge = 0;
+ }
+
+ if (!lcd->extend) {
+ EDBM_clear_flag_all(lcd->em, BM_SELECT);
+ }
+
+ if (select) {
+ BMW_Init(&walker, em->bm, BMW_EDGERING, 0, 0);
+ eed = BMW_Begin(&walker, startedge);
+ for (; eed; eed=BMW_Step(&walker)) {
+ BM_Select(em->bm, eed, 1);
+ }
+ BMW_End(&walker);
+
+ return;
+ }
+
+ BMW_Init(&walker, em->bm, BMW_EDGERING, 0, 0);
+ eed = startedge = BMW_Begin(&walker, startedge);
+ for (lasteed=NULL; eed; eed=BMW_Step(&walker)) {
+ if (lasteed) {
+ BMIter liter;
+ BMLoop *l, *l2;
+ int rev;
+
+ v[0][0] = eed->v1;
+ v[0][1] = eed->v2;
+ v[1][0] = lasteed->v1;
+ v[1][1] = lasteed->v2;
+
+#if 0 //hrm. this code may be useful later.
+ /*find correct order for v[1]*/
+
+ l = eed->loop;
+ if (!(BM_Edge_In_Face(l->f, eed) &&
BM_Edge_In_Face(l->f, lasteed))) {
+ BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_LOOP, l)
{
+ if (BM_Edge_In_Face(l->f, eed) &&
BM_Edge_In_Face(l->f, lasteed))
+ break;
+ }
+ }
+
+ /*this should never happen*/
+ if (!l) {
+ lasteed = eed;
+ continue;
+ }
+
+ l2 = BM_OtherFaceLoop(l->e, l->f, l->v);
+ rev = (l2 == (BMLoop*)l->head.prev);
+ while (l2->v != lasteed->v1 && l2->v != lasteed->v2) {
+ l2 = rev ? (BMLoop*)l2->head.prev :
(BMLoop*)l2->head.next;
+ }
+
+ if (l2->v == lasteed->v1) {
+ v[1][0] = lasteed->v1;
+ v[1][1] = lasteed->v2;
+ } else {
+ v[1][0] = lasteed->v2;
+ v[1][1] = lasteed->v1;
+ }
+#endif
+ for(i=1;i<=previewlines;i++){
+ co[0][0] = (v[0][1]->co[0] -
v[0][0]->co[0])*(i/((float)previewlines+1))+v[0][0]->co[0];
+ co[0][1] = (v[0][1]->co[1] -
v[0][0]->co[1])*(i/((float)previewlines+1))+v[0][0]->co[1];
+ co[0][2] = (v[0][1]->co[2] -
v[0][0]->co[2])*(i/((float)previewlines+1))+v[0][0]->co[2];
+
+ co[1][0] = (v[1][1]->co[0] -
v[1][0]->co[0])*(i/((float)previewlines+1))+v[1][0]->co[0];
+ co[1][1] = (v[1][1]->co[1] -
v[1][0]->co[1])*(i/((float)previewlines+1))+v[1][0]->co[1];
+ co[1][2] = (v[1][1]->co[2] -
v[1][0]->co[2])*(i/((float)previewlines+1))+v[1][0]->co[2];
+
+ V_GROW(edges);
+ VECCOPY(edges[tot][0], co[0]);
+ VECCOPY(edges[tot][1], co[1]);
+ tot++;
+ }
+ }
+ lasteed = eed;
+ }
+
+ BM_Select(em->bm, startedge, 1);
+ BM_Select(em->bm, lasteed, 1);
+
+ if (BM_Edge_Share_Faces(lasteed, startedge)) {
+ v[0][0] = startedge->v1;
+ v[0][1] = startedge->v2;
+ v[1][0] = lasteed->v1;
+ v[1][1] = lasteed->v2;
+ for(i=1;i<=previewlines;i++){
+ co[0][0] = (v[0][1]->co[0] -
v[0][0]->co[0])*(i/((float)previewlines+1))+v[0][0]->co[0];
+ co[0][1] = (v[0][1]->co[1] -
v[0][0]->co[1])*(i/((float)previewlines+1))+v[0][0]->co[1];
+ co[0][2] = (v[0][1]->co[2] -
v[0][0]->co[2])*(i/((float)previewlines+1))+v[0][0]->co[2];
+
+ co[1][0] = (v[1][1]->co[0] -
v[1][0]->co[0])*(i/((float)previewlines+1))+v[1][0]->co[0];
+ co[1][1] = (v[1][1]->co[1] -
v[1][0]->co[1])*(i/((float)previewlines+1))+v[1][0]->co[1];
+ co[1][2] = (v[1][1]->co[2] -
v[1][0]->co[2])*(i/((float)previewlines+1))+v[1][0]->co[2];
+
+ V_GROW(edges);
+ VECCOPY(edges[tot][0], co[0]);
+ VECCOPY(edges[tot][1], co[1]);
+ tot++;
+ }
+ }
+
+ BMW_End(&walker);
+ lcd->edges = edges;
+ lcd->totedge = tot;
+}
+
+static void ringsel_find_edge(tringselOpData *lcd, const bContext *C, ARegion
*ar)
+{
+ if (lcd->eed)
+ edgering_sel(lcd, 1, 0);
+}
+
+static void ringsel_finish(bContext *C, wmOperator *op)
+{
+ tringselOpData *lcd= op->customdata;
+
+ if (lcd->eed) {
+ edgering_sel(lcd, 0, 1);
+ if (lcd->do_cut) {
+ BMEditMesh *em = lcd->em;
+
+ BM_esubdivideflag(lcd->ob, em->bm, BM_SELECT, 0.0f,
+ 0.0f, 0, 1, SUBDIV_SELECT_LOOPCUT,
+ SUBD_PATH, 0, 0);
+
+ WM_event_add_notifier(C, NC_GEOM|ND_SELECT|ND_DATA,
lcd->ob->data);
+ DAG_id_flush_update(lcd->ob->data, OB_RECALC_DATA);
+ }
+ }
+}
+
+/* called when modal loop selection is done... */
+static void ringsel_exit (bContext *C, wmOperator *op)
+{
+ tringselOpData *lcd= op->customdata;
+
+ /* deactivate the extra drawing stuff in 3D-View */
+ ED_region_draw_cb_exit(lcd->ar->type, lcd->draw_handle);
+
+ if (lcd->edges)
+ MEM_freeN(lcd->edges);
+
+ ED_region_tag_redraw(lcd->ar);
+
+ /* free the custom data */
+ MEM_freeN(lcd);
+ op->customdata= NULL;
+}
+
+/* called when modal loop selection gets set up... */
+static int ringsel_init (bContext *C, wmOperator *op, int do_cut)
+{
+ tringselOpData *lcd;
+
+ /* alloc new customdata */
+ lcd= op->customdata= MEM_callocN(sizeof(tringselOpData), "ringsel Modal
Op Data");
+
+ /* assign the drawing handle for drawing preview line... */
+ lcd->ar= CTX_wm_region(C);
+ lcd->draw_handle= ED_region_draw_cb_activate(lcd->ar->type,
ringsel_draw, lcd, REGION_DRAW_POST);
+ lcd->ob = CTX_data_edit_object(C);
+ lcd->em= ((Mesh *)lcd->ob->data)->edit_btmesh;
+ lcd->extend = do_cut ? 0 : RNA_boolean_get(op->ptr, "extend");
+ lcd->do_cut = do_cut;
+ em_setup_viewcontext(C, &lcd->vc);
+
+ ED_region_tag_redraw(lcd->ar);
+
+ return 1;
+}
+
+static int ringsel_cancel (bContext *C, wmOperator *op)
+{
+ /* this is just a wrapper around exit() */
+ ringsel_exit(C, op);
+ return OPERATOR_CANCELLED;
+}
+
+static int ringsel_invoke (bContext *C, wmOperator *op, wmEvent *evt)
+{
+ ScrArea *sa = CTX_wm_area(C);
+ tringselOpData *lcd;
+ BMEdge *edge;
+ int dist = 75;
+
+ view3d_operator_needs_opengl(C);
+
+ if (!ringsel_init(C, op, 0))
+ return OPERATOR_CANCELLED;
+
+ /* add a modal handler for this operator - handles loop selection */
+ WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+
+ lcd = op->customdata;
+ lcd->vc.mval[0] = evt->mval[0];
+ lcd->vc.mval[1] = evt->mval[1];
+
+ edge = EDBM_findnearestedge(&lcd->vc, &dist);
+ if (edge != lcd->eed) {
+ lcd->eed = edge;
+ ringsel_find_edge(lcd, C, lcd->ar);
+ }
+
+ return OPERATOR_RUNNING_MODAL;
+}
+
+
+static int ringcut_invoke (bContext *C, wmOperator *op, wmEvent *evt)
+{
+ ScrArea *sa = CTX_wm_area(C);
+ tringselOpData *lcd;
+ BMEdge *edge;
+ int dist = 75;
+
+ view3d_operator_needs_opengl(C);
+
+ if (!ringsel_init(C, op, 1))
+ return OPERATOR_CANCELLED;
+
+ /* add a modal handler for this operator - handles loop selection */
+ WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+
+ lcd = op->customdata;
+ lcd->vc.mval[0] = evt->mval[0];
+ lcd->vc.mval[1] = evt->mval[1];
+
+ edge = EDBM_findnearestedge(&lcd->vc, &dist);
+ if (edge != lcd->eed) {
+ lcd->eed = edge;
+ ringsel_find_edge(lcd, C, lcd->ar);
+ }
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
