added error reporting to edit mesh
[blender.git] / source / blender / editors / mesh / editmesh_add.c
1 /**
2  * $Id: 
3  *
4  * ***** BEGIN GPL LICENSE BLOCK *****
5  *
6  * This program is free software; you can redistribute it and/or
7  * modify it under the terms of the GNU General Public License
8  * as published by the Free Software Foundation; either version 2
9  * of the License, or (at your option) any later version.
10  *
11  * This program is distributed in the hope that it will be useful,
12  * but WITHOUT ANY WARRANTY; without even the implied warranty of
13  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14  * GNU General Public License for more details.
15  *
16  * You should have received a copy of the GNU General Public License
17  * along with this program; if not, write to the Free Software Foundation,
18  * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19  *
20  * The Original Code is Copyright (C) 2004 by Blender Foundation.
21  * All rights reserved.
22  *
23  * The Original Code is: all of this file.
24  *
25  * Contributor(s): none yet.
26  *
27  * ***** END GPL LICENSE BLOCK *****
28  */
29
30
31 #include <stdlib.h>
32 #include <string.h>
33 #include <math.h>
34
35 #include "MEM_guardedalloc.h"
36
37 #include "DNA_mesh_types.h"
38 #include "DNA_meshdata_types.h"
39 #include "DNA_object_types.h"
40 #include "DNA_scene_types.h"
41 #include "DNA_space_types.h"
42 #include "DNA_screen_types.h"
43 #include "DNA_userdef_types.h"
44 #include "DNA_view3d_types.h"
45 #include "DNA_windowmanager_types.h"
46
47 #include "RNA_types.h"
48 #include "RNA_define.h"
49 #include "RNA_access.h"
50
51 #include "BLI_blenlib.h"
52 #include "BLI_arithb.h"
53 #include "BLI_editVert.h"
54
55 #include "BKE_context.h"
56 #include "BKE_depsgraph.h"
57 #include "BKE_global.h"
58 #include "BKE_library.h"
59 #include "BKE_mesh.h"
60 #include "BKE_object.h"
61 #include "BKE_utildefines.h"
62 #include "BKE_report.h"
63
64 #include "BIF_retopo.h"
65
66 #include "WM_api.h"
67 #include "WM_types.h"
68
69 #include "ED_mesh.h"
70 #include "ED_util.h"
71 #include "ED_view3d.h"
72 #include "ED_screen.h"
73
74 #include "mesh_intern.h"
75
76 /* bpymenu removed XXX */
77
78 /* XXX */
79 #define add_numbut(a, b, c, d, e, f, g) {}
80 /* XXX */
81
82 static float icovert[12][3] = {
83         {0,0,-200}, 
84         {144.72, -105.144,-89.443},
85         {-55.277, -170.128,-89.443}, 
86         {-178.885,0,-89.443},
87         {-55.277,170.128,-89.443}, 
88         {144.72,105.144,-89.443},
89         {55.277,-170.128,89.443},
90         {-144.72,-105.144,89.443},
91         {-144.72,105.144,89.443},
92         {55.277,170.128,89.443},
93         {178.885,0,89.443},
94         {0,0,200}
95 };
96 static short icoface[20][3] = {
97         {1,0,2},
98         {1,0,5},
99         {2,0,3},
100         {3,0,4},
101         {4,0,5},
102         {1,5,10},
103         {2,1,6},
104         {3,2,7},
105         {4,3,8},
106         {5,4,9},
107         {10,1,6},
108         {6,2,7},
109         {7,3,8},
110         {8,4,9},
111         {9,5,10},
112         {6,10,11},
113         {7,6,11},
114         {8,7,11},
115         {9,8,11},
116         {10,9,11}
117 };
118
119 /* *************** add-click-mesh (extrude) operator ************** */
120
121 static int dupli_extrude_cursor(bContext *C, wmOperator *op, wmEvent *event)
122 {
123         ViewContext vc;
124         EditVert *eve, *v1;
125         float min[3], max[3];
126         int done= 0;
127         short mval[2];
128         
129         em_setup_viewcontext(C, &vc);
130         
131         mval[0]= event->x - vc.ar->winrct.xmin;
132         mval[1]= event->y - vc.ar->winrct.ymin;
133         
134         INIT_MINMAX(min, max);
135         
136         for(v1= vc.em->verts.first;v1; v1=v1->next) {
137                 if(v1->f & SELECT) {
138                         DO_MINMAX(v1->co, min, max);
139                         done= 1;
140                 }
141         }
142
143         /* call extrude? */
144         if(done) {
145                 EditEdge *eed;
146                 float vec[3], cent[3], mat[3][3];
147                 float nor[3]= {0.0, 0.0, 0.0};
148                 
149                 /* check for edges that are half selected, use for rotation */
150                 done= 0;
151                 for(eed= vc.em->edges.first; eed; eed= eed->next) {
152                         if( (eed->v1->f & SELECT)+(eed->v2->f & SELECT) == SELECT ) {
153                                 if(eed->v1->f & SELECT) VecSubf(vec, eed->v1->co, eed->v2->co);
154                                 else VecSubf(vec, eed->v2->co, eed->v1->co);
155                                 VecAddf(nor, nor, vec);
156                                 done= 1;
157                         }
158                 }
159                 if(done) Normalize(nor);
160                 
161                 /* center */
162                 VecAddf(cent, min, max);
163                 VecMulf(cent, 0.5f);
164                 VECCOPY(min, cent);
165                 
166                 Mat4MulVecfl(vc.obedit->obmat, min);    // view space
167                 view3d_get_view_aligned_coordinate(&vc, min, mval);
168                 Mat4Invert(vc.obedit->imat, vc.obedit->obmat); 
169                 Mat4MulVecfl(vc.obedit->imat, min); // back in object space
170                 
171                 VecSubf(min, min, cent);
172                 
173                 /* calculate rotation */
174                 Mat3One(mat);
175                 if(done) {
176                         float dot;
177                         
178                         VECCOPY(vec, min);
179                         Normalize(vec);
180                         dot= INPR(vec, nor);
181
182                         if( fabs(dot)<0.999) {
183                                 float cross[3], si, q1[4];
184                                 
185                                 Crossf(cross, nor, vec);
186                                 Normalize(cross);
187                                 dot= 0.5f*saacos(dot);
188                                 si= (float)sin(dot);
189                                 q1[0]= (float)cos(dot);
190                                 q1[1]= cross[0]*si;
191                                 q1[2]= cross[1]*si;
192                                 q1[3]= cross[2]*si;
193                                 
194                                 QuatToMat3(q1, mat);
195                         }
196                 }
197                 
198                 extrudeflag(vc.obedit, vc.em, SELECT, nor);
199                 rotateflag(vc.em, SELECT, cent, mat);
200                 translateflag(vc.em, SELECT, min);
201                 
202                 recalc_editnormals(vc.em);
203         }
204         else {
205                 float mat[3][3],imat[3][3];
206                 float *curs= give_cursor(vc.scene, vc.v3d);
207                 
208                 VECCOPY(min, curs);
209                 view3d_get_view_aligned_coordinate(&vc, min, mval);
210                 
211                 eve= addvertlist(vc.em, 0, NULL);
212
213                 Mat3CpyMat4(mat, vc.obedit->obmat);
214                 Mat3Inv(imat, mat);
215                 
216                 VECCOPY(eve->co, min);
217                 Mat3MulVecfl(imat, eve->co);
218                 VecSubf(eve->co, eve->co, vc.obedit->obmat[3]);
219                 
220                 eve->f= SELECT;
221         }
222         
223         //retopo_do_all();
224         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, vc.obedit); 
225         DAG_object_flush_update(vc.scene, vc.obedit, OB_RECALC_DATA);
226         
227         return OPERATOR_FINISHED;
228 }
229
230 void MESH_OT_dupli_extrude_cursor(wmOperatorType *ot)
231 {
232         /* identifiers */
233         ot->name= "Duplicate or Extrude at 3D Cursor";
234         ot->idname= "MESH_OT_dupli_extrude_cursor";
235         
236         /* api callbacks */
237         ot->invoke= dupli_extrude_cursor;
238         ot->poll= ED_operator_editmesh;
239         
240         /* flags */
241         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
242 }
243
244
245 /* ********************** */
246
247 /* selected faces get hidden edges */
248 int make_fgon(EditMesh *em, wmOperator *op, int make)
249 {
250         EditFace *efa;
251         EditEdge *eed;
252         EditVert *eve;
253         float *nor=NULL;        // reference
254         int done=0;
255         
256         if(make==0) {
257                 for(efa= em->faces.first; efa; efa= efa->next) {
258                         if(efa->f & SELECT) {
259                                 efa->fgonf= 0;
260                                 efa->e1->h &= ~EM_FGON;
261                                 efa->e2->h &= ~EM_FGON;
262                                 efa->e3->h &= ~EM_FGON;
263                                 if(efa->e4) efa->e4->h &= ~EM_FGON;
264                                 done= 1;
265                         }
266                 }
267                 EM_fgon_flags(em);      // redo flags and indices for fgons
268                 
269                 return done;
270         }
271
272         /* tagging edges. rule is:
273            - edge used by exactly 2 selected faces
274            - no vertices allowed with only tagged edges (return)
275            - face normals are allowed to difffer
276          
277         */
278         for(eed= em->edges.first; eed; eed= eed->next) {
279                 eed->f1= 0;     // amount of selected
280                 eed->f2= 0; // amount of unselected
281         }
282         
283         for(efa= em->faces.first; efa; efa= efa->next) {
284                 if(efa->f & SELECT) {
285                         if(nor==NULL) nor= efa->n;
286                         if(efa->e1->f1 < 3) efa->e1->f1++;
287                         if(efa->e2->f1 < 3) efa->e2->f1++;
288                         if(efa->e3->f1 < 3) efa->e3->f1++;
289                         if(efa->e4 && efa->e4->f1 < 3) efa->e4->f1++;
290                 }
291                 else {
292                         if(efa->e1->f2 < 3) efa->e1->f2++;
293                         if(efa->e2->f2 < 3) efa->e2->f2++;
294                         if(efa->e3->f2 < 3) efa->e3->f2++;
295                         if(efa->e4 && efa->e4->f2 < 3) efa->e4->f2++;
296                 }
297         }
298         // now eed->f1 becomes tagged edge
299         for(eed= em->edges.first; eed; eed= eed->next) {
300                 if(eed->f1==2 && eed->f2==0) eed->f1= 1;
301                 else eed->f1= 0;
302         }
303         
304         // no vertices allowed with only tagged edges
305         for(eve= em->verts.first; eve; eve= eve->next) eve->f1= 0;
306         for(eed= em->edges.first; eed; eed= eed->next) {
307                 if(eed->f1) {
308                         eed->v1->f1 |= 1;
309                         eed->v2->f1 |= 1;
310                 }
311                 else {
312                         eed->v1->f1 |= 2;
313                         eed->v2->f1 |= 2;
314                 }
315         }
316         for(eve= em->verts.first; eve; eve= eve->next) {
317                 if(eve->f1==1) break;
318         }
319         if(eve) {
320                 BKE_report(op->reports, RPT_ERROR, "Cannot make a polygon with interior vertices");
321                 return 0;
322         }
323         
324         // check for faces
325         if(nor==NULL) {
326                 BKE_report(op->reports, RPT_ERROR, "No faces were selected to make FGon");
327                 return 0;
328         }
329
330         // and there we go
331         for(eed= em->edges.first; eed; eed= eed->next) {
332                 if(eed->f1) {
333                         eed->h |= EM_FGON;
334                         done= 1;
335                 }
336         }
337         
338         if(done)
339                 EM_fgon_flags(em);      // redo flags and indices for fgons
340         return done;
341 }
342
343 static int make_fgon_exec(bContext *C, wmOperator *op)
344 {
345         Object *obedit= CTX_data_edit_object(C);
346         EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
347
348         if( make_fgon(em, op, 1) ) {
349                 DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);     
350         
351                 WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
352                 
353                 return OPERATOR_FINISHED;
354         }
355         return OPERATOR_CANCELLED;
356 }
357
358 void MESH_OT_make_fgon(struct wmOperatorType *ot)
359 {
360         /* identifiers */
361         ot->name= "Make F-gon";
362         ot->idname= "MESH_OT_make_fgon";
363         
364         /* api callbacks */
365         ot->exec= make_fgon_exec;
366         ot->poll= ED_operator_editmesh;
367         
368         /* flags */
369         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
370 }
371
372 static int clear_fgon_exec(bContext *C, wmOperator *op)
373 {
374         Object *obedit= CTX_data_edit_object(C);
375         EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
376         
377         if( make_fgon(em, op, 0) ) {
378                 DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);     
379                 
380                 WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
381
382                 return OPERATOR_FINISHED;
383         }
384         return OPERATOR_CANCELLED;
385 }
386
387 void MESH_OT_clear_fgon(struct wmOperatorType *ot)
388 {
389         /* identifiers */
390         ot->name= "Clear F-gon";
391         ot->idname= "MESH_OT_clear_fgon";
392         
393         /* api callbacks */
394         ot->exec= clear_fgon_exec;
395         ot->poll= ED_operator_editmesh;
396         
397         /* flags */
398         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
399 }
400
401 /* precondition; 4 vertices selected, check for 4 edges and create face */
402 static EditFace *addface_from_edges(EditMesh *em)
403 {
404         EditEdge *eed, *eedar[4]={NULL, NULL, NULL, NULL};
405         EditVert *v1=NULL, *v2=NULL, *v3=NULL, *v4=NULL;
406         int a;
407         
408         /* find the 4 edges */
409         for(eed= em->edges.first; eed; eed= eed->next) {
410                 if( (eed->f & SELECT) || (eed->v1->f & eed->v2->f & SELECT) ) {
411                         if(eedar[0]==NULL) eedar[0]= eed;
412                         else if(eedar[1]==NULL) eedar[1]= eed;
413                         else if(eedar[2]==NULL) eedar[2]= eed;
414                         else eedar[3]= eed;
415                         
416                 }
417         }
418         
419         
420         if(eedar[3]) {
421                 /* first 2 points */
422                 v1= eedar[0]->v1;
423                 v2= eedar[0]->v2;
424                 
425                 /* find the 2 edges connected to first edge */
426                 for(a=1; a<4; a++) {
427                         if( eedar[a]->v1 == v2) v3= eedar[a]->v2;
428                         else if(eedar[a]->v2 == v2) v3= eedar[a]->v1;
429                         else if( eedar[a]->v1 == v1) v4= eedar[a]->v2;
430                         else if(eedar[a]->v2 == v1) v4= eedar[a]->v1;
431                 }
432                 
433                 /* verify if last edge exists */
434                 if(v3 && v4) {
435                         for(a=1; a<4; a++) {
436                                 if( eedar[a]->v1==v3 && eedar[a]->v2==v4) break;
437                                 if( eedar[a]->v2==v3 && eedar[a]->v1==v4) break;
438                         }
439                         if(a!=4) {
440                                 return addfacelist(em, v1, v2, v3, v4, NULL, NULL);
441                         }
442                 }
443         }
444         return NULL;
445 }
446
447 /* ******************************* */
448
449 /* this also allows to prevent triangles being made in quads */
450 static int compareface_overlaps(EditFace *vl1, EditFace *vl2)
451 {
452         EditVert *v1, *v2, *v3, *v4;
453         int equal= 0;
454         
455         v1= vl2->v1;
456         v2= vl2->v2;
457         v3= vl2->v3;
458         v4= vl2->v4;
459         
460         if(vl1==vl2) return 0;
461         
462         if(v4==NULL && vl1->v4==NULL) {
463                 if(vl1->v1==v1 || vl1->v2==v1 || vl1->v3==v1) equal++;
464                 if(vl1->v1==v2 || vl1->v2==v2 || vl1->v3==v2) equal++;
465                 if(vl1->v1==v3 || vl1->v2==v3 || vl1->v3==v3) equal++;
466         }
467         else {
468                 if(vl1->v1==v1 || vl1->v2==v1 || vl1->v3==v1 || vl1->v4==v1) equal++;
469                 if(vl1->v1==v2 || vl1->v2==v2 || vl1->v3==v2 || vl1->v4==v2) equal++;
470                 if(vl1->v1==v3 || vl1->v2==v3 || vl1->v3==v3 || vl1->v4==v3) equal++;
471                 if(vl1->v1==v4 || vl1->v2==v4 || vl1->v3==v4 || vl1->v4==v4) equal++;
472         }
473
474         if(v4 && vl1->v4) {
475                 if(equal==4) return 1;
476         }
477         else 
478                 if(equal>=3) return 1;
479         
480         return 0;
481 }
482
483 /* checks for existance, and for tria overlapping inside quad */
484 static EditFace *exist_face_overlaps(EditMesh *em, EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4)
485 {
486         EditFace *efa, efatest;
487         
488         efatest.v1= v1;
489         efatest.v2= v2;
490         efatest.v3= v3;
491         efatest.v4= v4;
492         
493         efa= em->faces.first;
494         while(efa) {
495                 if(compareface_overlaps(&efatest, efa)) return efa;
496                 efa= efa->next;
497         }
498         return NULL;
499 }
500
501 /* will be new face smooth or solid? depends on smoothness of face neighbours
502  * of new face, if function return 1, then new face will be smooth, when functio
503  * will return zero, then new face will be solid */
504 static void fix_new_face(EditMesh *em, EditFace *eface)
505 {
506         struct EditFace *efa;
507         struct EditEdge *eed=NULL;
508         struct EditVert *v1 = eface->v1, *v2 = eface->v2, *v3 = eface->v3, *v4 = eface->v4;
509         struct EditVert *ev1=NULL, *ev2=NULL;
510         short smooth=0; /* "total smoothnes" of faces in neighbourhood */
511         short coef;     /* "weight" of smoothness */
512         short count=0;  /* number of edges with same direction as eface */
513         short vi00=0, vi01=0, vi10=0, vi11=0; /* vertex indexes */
514
515         efa = em->faces.first;
516
517         while(efa) {
518
519                 if(efa==eface) {
520                         efa = efa->next;
521                         continue;
522                 }
523
524                 coef = 0;
525                 ev1 = ev2 = NULL;
526                 eed = NULL;
527
528                 if(efa->v1==v1 || efa->v2==v1 || efa->v3==v1 || efa->v4==v1) {
529                         ev1 = v1;
530                         coef++;
531                 }
532                 if(efa->v1==v2 || efa->v2==v2 || efa->v3==v2 || efa->v4==v2) {
533                         if(ev1) ev2 = v2;
534                         else ev1 = v2;
535                         coef++;
536                 }
537                 if(efa->v1==v3 || efa->v2==v3 || efa->v3==v3 || efa->v4==v3) {
538                         if(coef<2) {
539                                 if(ev1) ev2 = v3;
540                                 else ev1 = v3;
541                         }
542                         coef++;
543                 }
544                 if((v4) && (efa->v1==v4 || efa->v2==v4 || efa->v3==v4 || efa->v4==v4)) {
545                         if(ev1 && coef<2) ev2 = v4;
546                         coef++;
547                 }
548
549                 /* "democracy" of smoothness */
550                 if(efa->flag & ME_SMOOTH)
551                         smooth += coef;
552                 else
553                         smooth -= coef;
554
555                 /* try to find edge using vertexes ev1 and ev2 */
556                 if((ev1) && (ev2) && (ev1!=ev2)) eed = findedgelist(em, ev1, ev2);
557
558                 /* has bordering edge of efa same direction as edge of eface ? */
559                 if(eed) {
560                         if(eed->v1==v1) vi00 = 1;
561                         else if(eed->v1==v2) vi00 = 2;
562                         else if(eed->v1==v3) vi00 = 3;
563                         else if(v4 && eed->v1==v4) vi00 = 4;
564
565                         if(eed->v2==v1) vi01 = 1;
566                         else if(eed->v2==v2) vi01 = 2;
567                         else if(eed->v2==v3) vi01 = 3;
568                         else if(v4 && eed->v2==v4) vi01 = 4;
569
570                         if(v4) {
571                                 if(vi01==1 && vi00==4) vi00 = 0;
572                                 if(vi01==4 && vi00==1) vi01 = 0;
573                         }
574                         else {
575                                 if(vi01==1 && vi00==3) vi00 = 0;
576                                 if(vi01==3 && vi00==1) vi01 = 0;
577                         }
578
579                         if(eed->v1==efa->v1) vi10 = 1;
580                         else if(eed->v1==efa->v2) vi10 = 2;
581                         else if(eed->v1==efa->v3) vi10 = 3;
582                         else if(efa->v4 && eed->v1==efa->v4) vi10 = 4;
583
584                         if(eed->v2==efa->v1) vi11 = 1;
585                         else if(eed->v2==efa->v2) vi11 = 2;
586                         else if(eed->v2==efa->v3) vi11 = 3;
587                         else if(efa->v4 && eed->v2==efa->v4) vi11 = 4;
588
589                         if(efa->v4) {
590                                 if(vi11==1 && vi10==4) vi10 = 0;
591                                 if(vi11==4 && vi10==1) vi11 = 0;
592                         }
593                         else {
594                                 if(vi11==1 && vi10==3) vi10 = 0;
595                                 if(vi11==3 && vi10==1) vi11 = 0;
596                         }
597
598                         if(((vi00>vi01) && (vi10>vi11)) ||
599                                 ((vi00<vi01) && (vi10<vi11)))
600                                 count++;
601                         else
602                                 count--;
603                 }
604
605                 efa = efa->next;
606         }
607
608         /* set up smoothness according voting of face in neighbourhood */
609         if(smooth >= 0)
610                 eface->flag |= ME_SMOOTH;
611         else
612                 eface->flag &= ~ME_SMOOTH;
613
614         /* flip face, when too much "face normals" in neighbourhood is different */
615         if(count > 0) {
616                 flipface(em, eface);
617         }
618 }
619
620 /* only adds quads or trias when there's edges already */
621 void addfaces_from_edgenet(EditMesh *em)
622 {
623         EditVert *eve1, *eve2, *eve3, *eve4;
624         
625         for(eve1= em->verts.first; eve1; eve1= eve1->next) {
626                 for(eve2= em->verts.first; (eve1->f & 1) && eve2; eve2= eve2->next) {
627                         if(findedgelist(em, eve1,eve2)) {
628                                 for(eve3= em->verts.first; (eve2->f & 1) && eve3; eve3= eve3->next) {
629                                         if((eve2!=eve3 && (eve3->f & 1) && findedgelist(em, eve1,eve3))) {
630                                                 EditEdge *sh_edge= NULL;
631                                                 EditVert *sh_vert= NULL;
632                                                 
633                                                 sh_edge= findedgelist(em, eve2,eve3);
634                                                 
635                                                 if(sh_edge) { /* Add a triangle */
636                                                         if(!exist_face_overlaps(em, eve1,eve2,eve3,NULL))
637                                                                 fix_new_face(em, addfacelist(em, eve1,eve2,eve3,NULL,NULL,NULL));
638                                                 }
639                                                 else { /* Check for a shared vertex */
640                                                         for(eve4= em->verts.first; eve4; eve4= eve4->next) {
641                                                                 if(eve4!=eve1 && eve4!=eve2 && eve4!=eve3 && (eve4->f & 1) &&
642                                                                    !findedgelist(em, eve1,eve4) && findedgelist(em, eve2,eve4) &&
643                                                                    findedgelist(em, eve3,eve4)) {
644                                                                         sh_vert= eve4;
645                                                                         break;
646                                                                 }
647                                                         }
648                                                         
649                                                         if(sh_vert) {
650                                                                 if(sh_vert) {
651                                                                         if(!exist_face_overlaps(em, eve1,eve2,eve4,eve3))
652                                                                                 fix_new_face(em, addfacelist(em, eve1,eve2,eve4,eve3,NULL,NULL));
653                                                                 }
654                                                         }
655                                                 }
656                                         }
657                                 }
658                         }
659                 }
660         }
661
662         EM_select_flush(em);
663         
664 // XXX  DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
665 }
666
667 static void addedgeface_mesh(EditMesh *em, wmOperator *op)
668 {
669         EditVert *eve, *neweve[4];
670         EditEdge *eed;
671         EditFace *efa;
672         short amount=0;
673
674         /* how many selected ? */
675         if(em->selectmode & SCE_SELECT_EDGE) {
676                 /* in edge mode finding selected vertices means flushing down edge codes... */
677                 /* can't make face with only edge selection info... */
678                 EM_selectmode_set(em);
679         }
680         
681         for(eve= em->verts.first; eve; eve= eve->next) {
682                 if(eve->f & SELECT) {
683                         amount++;
684                         if(amount>4) break;                     
685                         neweve[amount-1]= eve;
686                 }
687         }
688
689         if(amount==2) {
690                 eed= addedgelist(em, neweve[0], neweve[1], NULL);
691                 EM_select_edge(eed, 1);
692
693                 // XXX          DAG_object_flush_update(scene, obedit, OB_RECALC_DATA); 
694                 return;
695         }
696         else if(amount > 4) {
697                 addfaces_from_edgenet(em);
698                 return;
699         }
700         else if(amount<2) {
701                 BKE_report(op->reports, RPT_ERROR, "More vertices are needed to make an edge/face");
702                 return;
703         }
704
705         efa= NULL; // check later
706
707         if(amount==3) {
708                 
709                 if(exist_face_overlaps(em, neweve[0], neweve[1], neweve[2], NULL)==0) {
710                         efa= addfacelist(em, neweve[0], neweve[1], neweve[2], 0, NULL, NULL);
711                         EM_select_face(efa, 1);
712                 }
713                 else BKE_report(op->reports, RPT_ERROR, "The selected vertices already form a face");
714         }
715         else if(amount==4) {
716                 /* this test survives when theres 2 triangles */
717                 if(exist_face(em, neweve[0], neweve[1], neweve[2], neweve[3])==0) {
718                         int tria= 0;
719                         
720                         /* remove trias if they exist, 4 cases.... */
721                         if(exist_face(em, neweve[0], neweve[1], neweve[2], NULL)) tria++;
722                         if(exist_face(em, neweve[0], neweve[1], neweve[3], NULL)) tria++;
723                         if(exist_face(em, neweve[0], neweve[2], neweve[3], NULL)) tria++;
724                         if(exist_face(em, neweve[1], neweve[2], neweve[3], NULL)) tria++;
725                 
726                         if(tria==2) join_triangles(em);
727                         else if(exist_face_overlaps(em, neweve[0], neweve[1], neweve[2], neweve[3])==0) {
728                                  /* If there are 4 Verts, But more selected edges, we need to call addfaces_from_edgenet */
729                                         EditEdge *eedcheck;
730                                         int count;
731                                         count = 0;
732                                         for(eedcheck= em->edges.first; eedcheck; eedcheck= eedcheck->next) {
733                                                 if(eedcheck->f & SELECT) {
734                                                         count++;
735                                                 }
736                                         }       
737                                 
738                                 if(count++ > 4){
739                                         addfaces_from_edgenet(em);
740                                         return;
741                                 } else {
742                                 /* if 4 edges exist, we just create the face, convex or not */
743                                         efa= addface_from_edges(em);
744                                         if(efa==NULL) {
745                                                 
746                                                 /* the order of vertices can be anything, 6 cases to check */
747                                                 if( convex(neweve[0]->co, neweve[1]->co, neweve[2]->co, neweve[3]->co) ) {
748                                                         efa= addfacelist(em, neweve[0], neweve[1], neweve[2], neweve[3], NULL, NULL);
749                                                 }
750                                                 else if( convex(neweve[0]->co, neweve[2]->co, neweve[3]->co, neweve[1]->co) ) {
751                                                         efa= addfacelist(em, neweve[0], neweve[2], neweve[3], neweve[1], NULL, NULL);
752                                                 }
753                                                 else if( convex(neweve[0]->co, neweve[2]->co, neweve[1]->co, neweve[3]->co) ) {
754                                                         efa= addfacelist(em, neweve[0], neweve[2], neweve[1], neweve[3], NULL, NULL);
755                                                 }
756                                                 else if( convex(neweve[0]->co, neweve[1]->co, neweve[3]->co, neweve[2]->co) ) {
757                                                         efa= addfacelist(em, neweve[0], neweve[1], neweve[3], neweve[2], NULL, NULL);
758                                                 }
759                                                 else if( convex(neweve[0]->co, neweve[3]->co, neweve[2]->co, neweve[1]->co) ) {
760                                                         efa= addfacelist(em, neweve[0], neweve[3], neweve[2], neweve[1], NULL, NULL);
761                                                 }
762                                                 else if( convex(neweve[0]->co, neweve[3]->co, neweve[1]->co, neweve[2]->co) ) {
763                                                         efa= addfacelist(em, neweve[0], neweve[3], neweve[1], neweve[2], NULL, NULL);
764                                                 }
765                                                 else printf("cannot find nice quad from concave set of vertices\n");
766                                         }
767                                 }
768                         }
769                         else BKE_report(op->reports, RPT_ERROR, "The selected vertices already form a face");
770                 }
771                 else BKE_report(op->reports, RPT_ERROR, "The selected vertices already form a face");
772         }
773         
774         if(efa) {
775                 EM_select_face(efa, 1);
776
777                 fix_new_face(em, efa);
778                 
779                 recalc_editnormals(em);
780         }
781         }
782
783 static int addedgeface_mesh_exec(bContext *C, wmOperator *op)
784 {
785         Object *obedit= CTX_data_edit_object(C);
786         EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
787         
788         addedgeface_mesh(em, op);
789         
790         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
791         
792         DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);     
793         
794         return OPERATOR_FINISHED;
795 }
796
797 void MESH_OT_add_edge_face(wmOperatorType *ot)
798 {
799         /* identifiers */
800         ot->name= "Make Edge/Face";
801         ot->idname= "MESH_OT_add_edge_face";
802         
803         /* api callbacks */
804         ot->exec= addedgeface_mesh_exec;
805         ot->poll= ED_operator_editmesh;
806         
807         /* flags */
808         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
809         
810 }
811
812
813
814 /* ************************ primitives ******************* */
815
816 // HACK: these can also be found in cmoview.tga.c, but are here so that they can be found by linker
817 // this hack is only used so that scons+mingw + split-sources hack works
818         // ------------------------------- start copied code
819 /* these are not the monkeys you are looking for */
820 int monkeyo= 4;
821 int monkeynv= 271;
822 int monkeynf= 250;
823 signed char monkeyv[271][3]= {
824 {-71,21,98},{-63,12,88},{-57,7,74},{-82,-3,79},{-82,4,92},
825 {-82,17,100},{-92,21,102},{-101,12,95},{-107,7,83},
826 {-117,31,84},{-109,31,95},{-96,31,102},{-92,42,102},
827 {-101,50,95},{-107,56,83},{-82,66,79},{-82,58,92},
828 {-82,46,100},{-71,42,98},{-63,50,88},{-57,56,74},
829 {-47,31,72},{-55,31,86},{-67,31,97},{-66,31,99},
830 {-70,43,100},{-82,48,103},{-93,43,105},{-98,31,105},
831 {-93,20,105},{-82,31,106},{-82,15,103},{-70,20,100},
832 {-127,55,95},{-127,45,105},{-127,-87,94},{-127,-41,100},
833 {-127,-24,102},{-127,-99,92},{-127,52,77},{-127,73,73},
834 {-127,115,-70},{-127,72,-109},{-127,9,-106},{-127,-49,-45},
835 {-101,-24,72},{-87,-56,73},{-82,-89,73},{-80,-114,68},
836 {-85,-121,67},{-104,-124,71},{-127,-126,74},{-71,-18,68},
837 {-46,-5,69},{-21,19,57},{-17,55,76},{-36,62,80},
838 {-64,77,88},{-86,97,94},{-107,92,97},{-119,63,96},
839 {-106,53,99},{-111,39,98},{-101,12,95},{-79,2,90},
840 {-64,8,86},{-47,24,83},{-45,38,83},{-50,48,85},
841 {-72,56,92},{-95,60,97},{-127,-98,94},{-113,-92,94},
842 {-112,-107,91},{-119,-113,89},{-127,-114,88},{-127,-25,96},
843 {-127,-18,95},{-114,-19,95},{-111,-29,96},{-116,-37,95},
844 {-76,-6,86},{-48,7,80},{-34,26,77},{-32,48,84},
845 {-39,53,93},{-71,70,102},{-87,82,107},{-101,79,109},
846 {-114,55,108},{-111,-13,104},{-100,-57,91},{-95,-90,88},
847 {-93,-105,85},{-97,-117,81},{-106,-119,81},{-127,-121,82},
848 {-127,6,93},{-127,27,98},{-85,61,95},{-106,18,96},
849 {-110,27,97},{-112,-88,94},{-117,-57,96},{-127,-57,96},
850 {-127,-42,95},{-115,-35,100},{-110,-29,102},{-113,-17,100},
851 {-122,-16,100},{-127,-26,106},{-121,-19,104},{-115,-20,104},
852 {-113,-29,106},{-117,-32,103},{-127,-37,103},{-94,-40,71},
853 {-106,-31,91},{-104,-40,91},{-97,-32,71},{-127,-112,88},
854 {-121,-111,88},{-115,-105,91},{-115,-95,93},{-127,-100,84},
855 {-115,-96,85},{-115,-104,82},{-121,-109,81},{-127,-110,81},
856 {-105,28,100},{-103,20,99},{-84,55,97},{-92,54,99},
857 {-73,51,99},{-55,45,89},{-52,37,88},{-53,25,87},
858 {-66,13,92},{-79,8,95},{-98,14,100},{-104,38,100},
859 {-100,48,100},{-97,46,97},{-102,38,97},{-96,16,97},
860 {-79,11,93},{-68,15,90},{-57,27,86},{-56,36,86},
861 {-59,43,87},{-74,50,96},{-91,51,98},{-84,52,96},
862 {-101,22,96},{-102,29,96},{-113,59,78},{-102,85,79},
863 {-84,88,76},{-65,71,71},{-40,58,63},{-25,52,59},
864 {-28,21,48},{-50,0,53},{-71,-12,60},{-127,115,37},
865 {-127,126,-10},{-127,-25,-86},{-127,-59,24},{-127,-125,59},
866 {-127,-103,44},{-127,-73,41},{-127,-62,36},{-18,30,7},
867 {-17,41,-6},{-28,34,-56},{-68,56,-90},{-33,-6,9},
868 {-51,-16,-21},{-45,-1,-55},{-84,7,-85},{-97,-45,52},
869 {-104,-53,33},{-90,-91,49},{-95,-64,50},{-85,-117,51},
870 {-109,-97,47},{-111,-69,46},{-106,-121,56},{-99,-36,55},
871 {-100,-29,60},{-101,-22,64},{-100,-50,21},{-89,-40,-34},
872 {-83,-19,-69},{-69,111,-49},{-69,119,-9},{-69,109,30},
873 {-68,67,55},{-34,52,43},{-46,58,36},{-45,90,7},
874 {-25,72,16},{-25,79,-15},{-45,96,-25},{-45,87,-57},
875 {-25,69,-46},{-48,42,-75},{-65,3,-70},{-22,42,-26},
876 {-75,-22,19},{-72,-25,-27},{-13,52,-30},{-28,-18,-16},
877 {6,-13,-42},{37,7,-55},{46,41,-54},{31,65,-54},
878 {4,61,-40},{3,53,-37},{25,56,-50},{35,37,-52},
879 {28,10,-52},{5,-5,-39},{-21,-9,-17},{-9,46,-28},
880 {-6,39,-37},{-14,-3,-27},{6,0,-47},{25,12,-57},
881 {31,32,-57},{23,46,-56},{4,44,-46},{-19,37,-27},
882 {-20,22,-35},{-30,12,-35},{-22,11,-35},{-19,2,-35},
883 {-23,-2,-35},{-34,0,-9},{-35,-3,-22},{-35,5,-24},
884 {-25,26,-27},{-13,31,-34},{-13,30,-41},{-23,-2,-41},
885 {-18,2,-41},{-21,10,-41},{-29,12,-41},{-19,22,-41},
886 {6,42,-53},{25,44,-62},{34,31,-63},{28,11,-62},
887 {7,0,-54},{-14,-2,-34},{-5,37,-44},{-13,14,-42},
888 {-7,8,-43},{1,16,-47},{-4,22,-45},{3,30,-48},
889 {8,24,-49},{15,27,-50},{12,35,-50},{4,56,-62},
890 {33,60,-70},{48,38,-64},{41,7,-68},{6,-11,-63},
891 {-26,-16,-42},{-17,49,-49},
892 };
893
894 signed char monkeyf[250][4]= {
895 {27,4,5,26}, {25,4,5,24}, {3,6,5,4}, {1,6,5,2}, {5,6,7,4}, 
896 {3,6,7,2}, {5,8,7,6}, {3,8,7,4}, {7,8,9,6}, 
897 {5,8,9,4}, {7,10,9,8}, {5,10,9,6}, {9,10,11,8}, 
898 {7,10,11,6}, {9,12,11,10}, {7,12,11,8}, {11,6,13,12}, 
899 {5,4,13,12}, {3,-2,13,12}, {-3,-4,13,12}, {-5,-10,13,12}, 
900 {-11,-12,14,12}, {-13,-18,14,13}, {-19,4,5,13}, {10,12,4,4}, 
901 {10,11,9,9}, {8,7,9,9}, {7,5,6,6}, {6,3,4,4}, 
902 {5,1,2,2}, {4,-1,0,0}, {3,-3,-2,-2}, {22,67,68,23}, 
903 {20,65,66,21}, {18,63,64,19}, {16,61,62,17}, {14,59,60,15}, 
904 {12,19,48,57}, {18,19,48,47}, {18,19,48,47}, {18,19,48,47}, 
905 {18,19,48,47}, {18,19,48,47}, {18,19,48,47}, {18,19,48,47}, 
906 {18,19,48,47}, {18,-9,-8,47}, {18,27,45,46}, {26,55,43,44}, 
907 {24,41,42,54}, {22,39,40,23}, {20,37,38,21}, {18,35,36,19}, 
908 {16,33,34,17}, {14,31,32,15}, {12,39,30,13}, {11,48,45,38}, 
909 {8,36,-19,9}, {8,-20,44,47}, {42,45,46,43}, {18,19,40,39}, 
910 {16,17,38,37}, {14,15,36,35}, {32,44,43,33}, {12,33,32,42}, 
911 {19,44,43,42}, {40,41,42,-27}, {8,9,39,-28}, {15,43,42,16}, 
912 {13,43,42,14}, {11,43,42,12}, {9,-30,42,10}, {37,12,38,-32}, 
913 {-33,37,45,46}, {-33,40,41,39}, {38,40,41,37}, {36,40,41,35}, 
914 {34,40,41,33}, {36,39,38,37}, {35,40,39,38}, {1,2,14,21}, 
915 {1,2,40,13}, {1,2,40,39}, {1,24,12,39}, {-34,36,38,11}, 
916 {35,38,36,37}, {-37,8,35,37}, {-11,-12,-45,40}, {-11,-12,39,38}, 
917 {-11,-12,37,36}, {-11,-12,35,34}, {33,34,40,41}, {33,34,38,39}, 
918 {33,34,36,37}, {33,-52,34,35}, {33,37,36,34}, {33,35,34,34}, 
919 {8,7,37,36}, {-32,7,35,46}, {-34,-33,45,46}, {4,-33,43,34}, 
920 {-34,-33,41,42}, {-34,-33,39,40}, {-34,-33,37,38}, {-34,-33,35,36}, 
921 {-34,-33,33,34}, {-34,-33,31,32}, {-34,-4,28,30}, {-5,-34,28,27}, 
922 {-35,-44,36,27}, {26,35,36,45}, {24,25,44,45}, {25,23,44,42}, 
923 {25,24,41,40}, {25,24,39,38}, {25,24,37,36}, {25,24,35,34}, 
924 {25,24,33,32}, {25,24,31,30}, {15,24,29,38}, {25,24,27,26}, 
925 {23,12,37,26}, {11,12,35,36}, {-86,-59,36,-80}, {-60,-61,36,35}, 
926 {-62,-63,36,35}, {-64,-65,36,35}, {-66,-67,36,35}, {-68,-69,36,35}, 
927 {-70,-71,36,35}, {-72,-73,36,35}, {-74,-75,36,35}, {42,43,53,58}, 
928 {40,41,57,56}, {38,39,55,57}, {-81,-80,37,56}, {-83,-82,55,52}, 
929 {-85,-84,51,49}, {-87,-86,48,49}, {47,50,51,48}, {46,48,51,49}, 
930 {43,46,49,44}, {-92,-91,45,42}, {-23,49,50,-20}, {-94,40,48,-24}, 
931 {-96,-22,48,49}, {-97,48,21,-90}, {-100,36,50,23}, {22,49,48,-100}, 
932 {-101,47,46,22}, {21,45,35,25}, {33,34,44,41}, {13,14,28,24}, 
933 {-107,26,30,-106}, {14,46,45,15}, {14,44,43,-110}, {-111,42,23,-110}, 
934 {6,7,45,46}, {45,44,47,46}, {45,46,47,48}, {47,46,49,48}, 
935 {17,49,47,48}, {17,36,46,48}, {35,36,44,45}, {35,36,40,43}, 
936 {35,36,38,39}, {-4,-3,37,35}, {-123,34,33,1}, {-9,-8,-7,-6}, 
937 {-10,-7,32,-125}, {-127,-11,-126,-126}, {-7,-6,5,31}, {4,5,33,30}, 
938 {4,39,33,32}, {4,35,32,38}, {20,21,39,38}, {4,37,38,5}, 
939 {-11,-10,36,3}, {-11,15,14,35}, {13,16,34,34}, {-13,14,13,13}, 
940 {-3,1,30,29}, {-3,28,29,1}, {-2,31,28,-1}, {12,13,27,30}, 
941 {-2,26,12,12}, {35,29,42,36}, {34,35,36,33}, {32,35,36,31}, 
942 {30,35,36,29}, {28,35,36,27}, {26,35,36,25}, {34,39,38,35}, 
943 {32,39,38,33}, {30,39,38,31}, {28,39,38,29}, {26,39,38,27}, 
944 {25,31,32,38}, {-18,-17,45,44}, {-18,17,28,44}, {-24,-20,42,-23}, 
945 {11,35,27,14}, {25,28,39,41}, {37,41,40,38}, {34,40,36,35}, 
946 {32,40,39,33}, {30,39,31,40}, {21,29,39,22}, {-31,37,28,4}, 
947 {-32,33,35,36}, {32,33,34,34}, {18,35,36,48}, {34,25,40,35}, 
948 {24,25,38,39}, {24,25,36,37}, {24,25,34,35}, {24,25,32,33}, 
949 {24,13,41,31}, {17,11,41,35}, {15,16,34,35}, {13,14,34,35}, 
950 {11,12,34,35}, {9,10,34,35}, {7,8,34,35}, {26,25,37,36}, 
951 {35,36,37,38}, {37,36,39,38}, {37,38,39,40}, {25,31,36,39}, 
952 {18,34,35,30}, {17,22,30,33}, {19,29,21,20}, {16,26,29,17}, 
953 {24,29,28,25}, {22,31,28,23}, {20,31,30,21}, {18,31,30,19}, 
954 {16,30,17,17}, {-21,-22,35,34}, {-21,-22,33,32}, {-21,-22,31,30}, 
955 {-21,-22,29,28}, {-21,-22,27,26}, {-28,-22,25,31}, {24,28,29,30}, 
956 {23,24,26,27}, {23,24,25,25}, {-69,-35,-32,27}, {-70,26,25,-66}, 
957 {-68,-67,24,-33}, 
958 };
959         // ------------------------------- end copied code
960
961
962 #define PRIM_PLANE              0
963 #define PRIM_CUBE               1
964 #define PRIM_CIRCLE             4
965 #define PRIM_CYLINDER   5
966 #define PRIM_CONE               7
967 #define PRIM_GRID               10
968 #define PRIM_UVSPHERE   11
969 #define PRIM_ICOSPHERE  12
970 #define PRIM_MONKEY             13
971
972 static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int seg,
973                 int subdiv, float dia, float depth, int ext, int fill)
974 {
975         /*
976          * type - for the type of shape
977          * dia - the radius for cone,sphere cylinder etc.
978          * depth - 
979          * ext - extrude
980          * fill - end capping, and option to fill in circle
981          * cent[3] - center of the data. 
982          * */
983         EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
984         EditVert *eve, *v1=NULL, *v2, *v3, *v4=NULL, *vtop, *vdown;
985         float phi, phid, vec[3];
986         float q[4], cmat[3][3], nor[3]= {0.0, 0.0, 0.0};
987         short a, b;
988         
989         EM_clear_flag_all(em, SELECT);
990
991         phid= 2*M_PI/tot;
992         phi= .25*M_PI;
993
994         switch(type) {
995         case PRIM_GRID: /*  grid */
996                 /* clear flags */
997                 eve= em->verts.first;
998                 while(eve) {
999                         eve->f= 0;
1000                         eve= eve->next;
1001                 }
1002                 /* one segment first: the X axis */
1003                 phi= 1.0; 
1004                 phid= 2.0/((float)tot-1);
1005                 for(a=0;a<tot;a++) {
1006                         vec[0]= dia*phi;
1007                         vec[1]= - dia;
1008                         vec[2]= 0.0f;
1009                         Mat4MulVecfl(mat,vec);
1010                         eve= addvertlist(em, vec, NULL);
1011                         eve->f= 1+2+4;
1012                         if (a) {
1013                                 addedgelist(em, eve->prev, eve, NULL);
1014                         }
1015                         phi-=phid;
1016                 }
1017                 /* extrude and translate */
1018                 vec[0]= vec[2]= 0.0;
1019                 vec[1]= dia*phid;
1020                 Mat4Mul3Vecfl(mat, vec);
1021                 
1022                 for(a=0;a<seg-1;a++) {
1023                         extrudeflag_vert(obedit, em, 2, nor);   // nor unused
1024                         translateflag(em, 2, vec);
1025                 }
1026                 break;
1027         case PRIM_UVSPHERE: /*  UVsphere */
1028                 
1029                 /* clear all flags */
1030                 eve= em->verts.first;
1031                 while(eve) {
1032                         eve->f= 0;
1033                         eve= eve->next;
1034                 }
1035                 
1036                 /* one segment first */
1037                 phi= 0; 
1038                 phid/=2;
1039                 for(a=0; a<=tot; a++) {
1040                         vec[0]= dia*sin(phi);
1041                         vec[1]= 0.0;
1042                         vec[2]= dia*cos(phi);
1043                         eve= addvertlist(em, vec, NULL);
1044                         eve->f= 1+2+4;
1045                         if(a==0) v1= eve;
1046                         else addedgelist(em, eve->prev, eve, NULL);
1047                         phi+= phid;
1048                 }
1049                 
1050                 /* extrude and rotate */
1051                 phi= M_PI/seg;
1052                 q[0]= cos(phi);
1053                 q[3]= sin(phi);
1054                 q[1]=q[2]= 0;
1055                 QuatToMat3(q, cmat);
1056                 
1057                 for(a=0; a<seg; a++) {
1058                         extrudeflag_vert(obedit, em, 2, nor); // nor unused
1059                         rotateflag(em, 2, v1->co, cmat);
1060                 }
1061
1062                 removedoublesflag(em, 4, 0, 0.0001);
1063
1064                 /* and now do imat */
1065                 eve= em->verts.first;
1066                 while(eve) {
1067                         if(eve->f & SELECT) {
1068                                 Mat4MulVecfl(mat,eve->co);
1069                         }
1070                         eve= eve->next;
1071                 }
1072                 break;
1073         case PRIM_ICOSPHERE: /* Icosphere */
1074                 {
1075                         EditVert *eva[12];
1076                         EditEdge *eed;
1077                         
1078                         /* clear all flags */
1079                         eve= em->verts.first;
1080                         while(eve) {
1081                                 eve->f= 0;
1082                                 eve= eve->next;
1083                         }
1084                         dia/=200;
1085                         for(a=0;a<12;a++) {
1086                                 vec[0]= dia*icovert[a][0];
1087                                 vec[1]= dia*icovert[a][1];
1088                                 vec[2]= dia*icovert[a][2];
1089                                 eva[a]= addvertlist(em, vec, NULL);
1090                                 eva[a]->f= 1+2;
1091                         }
1092                         for(a=0;a<20;a++) {
1093                                 EditFace *evtemp;
1094                                 v1= eva[ icoface[a][0] ];
1095                                 v2= eva[ icoface[a][1] ];
1096                                 v3= eva[ icoface[a][2] ];
1097                                 evtemp = addfacelist(em, v1, v2, v3, 0, NULL, NULL);
1098                                 evtemp->e1->f = 1+2;
1099                                 evtemp->e2->f = 1+2;
1100                                 evtemp->e3->f = 1+2;
1101                         }
1102
1103                         dia*=200;
1104                         for(a=1; a<subdiv; a++) esubdivideflag(obedit, em, 2, dia, 0,1,0);
1105                         /* and now do imat */
1106                         eve= em->verts.first;
1107                         while(eve) {
1108                                 if(eve->f & 2) {
1109                                         Mat4MulVecfl(mat,eve->co);
1110                                 }
1111                                 eve= eve->next;
1112                         }
1113                         
1114                         // Clear the flag 2 from the edges
1115                         for(eed=em->edges.first;eed;eed=eed->next){
1116                                 if(eed->f & 2){
1117                                            eed->f &= !2;
1118                                 }   
1119                         }
1120                 }
1121                 break;
1122         case PRIM_MONKEY: /* Monkey */
1123                 {
1124                         //extern int monkeyo, monkeynv, monkeynf;
1125                         //extern signed char monkeyf[][4];
1126                         //extern signed char monkeyv[][3];
1127                         EditVert **tv= MEM_mallocN(sizeof(*tv)*monkeynv*2, "tv");
1128                         int i;
1129
1130                         for (i=0; i<monkeynv; i++) {
1131                                 float v[3];
1132                                 v[0]= (monkeyv[i][0]+127)/128.0, v[1]= monkeyv[i][1]/128.0, v[2]= monkeyv[i][2]/128.0;
1133                                 tv[i]= addvertlist(em, v, NULL);
1134                                 tv[i]->f |= SELECT;
1135                                 tv[monkeynv+i]= (fabs(v[0]= -v[0])<0.001)?tv[i]:addvertlist(em, v, NULL);
1136                                 tv[monkeynv+i]->f |= SELECT;
1137                         }
1138                         for (i=0; i<monkeynf; i++) {
1139                                 addfacelist(em, tv[monkeyf[i][0]+i-monkeyo], tv[monkeyf[i][1]+i-monkeyo], tv[monkeyf[i][2]+i-monkeyo], (monkeyf[i][3]!=monkeyf[i][2])?tv[monkeyf[i][3]+i-monkeyo]:NULL, NULL, NULL);
1140                                 addfacelist(em, tv[monkeynv+monkeyf[i][2]+i-monkeyo], tv[monkeynv+monkeyf[i][1]+i-monkeyo], tv[monkeynv+monkeyf[i][0]+i-monkeyo], (monkeyf[i][3]!=monkeyf[i][2])?tv[monkeynv+monkeyf[i][3]+i-monkeyo]:NULL, NULL, NULL);
1141                         }
1142
1143                         MEM_freeN(tv);
1144
1145                         /* and now do imat */
1146                         for(eve= em->verts.first; eve; eve= eve->next) {
1147                                 if(eve->f & SELECT) {
1148                                         Mat4MulVecfl(mat,eve->co);
1149                                 }
1150                         }
1151                         recalc_editnormals(em);
1152                 }
1153                 break;
1154         default: /* all types except grid, sphere... */
1155                 if(type==PRIM_CONE);
1156                 else if(ext==0) 
1157                         depth= 0.0f;
1158         
1159                 /* vertices */
1160                 vtop= vdown= v1= v2= 0;
1161                 for(b=0; b<=ext; b++) {
1162                         for(a=0; a<tot; a++) {
1163                                 
1164                                 vec[0]= dia*sin(phi);
1165                                 vec[1]= dia*cos(phi);
1166                                 vec[2]= b?depth:-depth;
1167                                 
1168                                 Mat4MulVecfl(mat, vec);
1169                                 eve= addvertlist(em, vec, NULL);
1170                                 eve->f= SELECT;
1171                                 if(a==0) {
1172                                         if(b==0) v1= eve;
1173                                         else v2= eve;
1174                                 }
1175                                 phi+=phid;
1176                         }
1177                 }
1178                         
1179                 /* center vertices */
1180                 /* type PRIM_CONE can only have 1 one side filled
1181                  * if the cone has no capping, dont add vtop */
1182                 if((fill && type>1) || type == PRIM_CONE) {
1183                         vec[0]= vec[1]= 0.0f;
1184                         vec[2]= -depth;
1185                         Mat4MulVecfl(mat, vec);
1186                         vdown= addvertlist(em, vec, NULL);
1187                         if((ext || type==PRIM_CONE) && fill) {
1188                                 vec[0]= vec[1]= 0.0f;
1189                                 vec[2]= depth;
1190                                 Mat4MulVecfl(mat,vec);
1191                                 vtop= addvertlist(em, vec, NULL);
1192                         }
1193                 } else {
1194                         vdown= v1;
1195                         vtop= v2;
1196                 }
1197                 if(vtop) vtop->f= SELECT;
1198                 if(vdown) vdown->f= SELECT;
1199         
1200                 /* top and bottom face */
1201                 if(fill || type==PRIM_CONE) {
1202                         if(tot==4 && (type==0 || type==1)) {
1203                                 v3= v1->next->next;
1204                                 if(ext) v4= v2->next->next;
1205                                 
1206                                 addfacelist(em, v3, v1->next, v1, v3->next, NULL, NULL);
1207                                 if(ext) addfacelist(em, v2, v2->next, v4, v4->next, NULL, NULL);
1208                                 
1209                         }
1210                         else {
1211                                 v3= v1;
1212                                 v4= v2;
1213                                 for(a=1; a<tot; a++) {
1214                                         addfacelist(em, vdown, v3, v3->next, 0, NULL, NULL);
1215                                         v3= v3->next;
1216                                         if(ext && fill) {
1217                                                 addfacelist(em, vtop, v4, v4->next, 0, NULL, NULL);
1218                                                 v4= v4->next;
1219                                         }
1220                                 }
1221                                 if(type>1) {
1222                                         addfacelist(em, vdown, v3, v1, 0, NULL, NULL);
1223                                         if(ext) addfacelist(em, vtop, v4, v2, 0, NULL, NULL);
1224                                 }
1225                         }
1226                 }
1227                 else if(type==PRIM_CIRCLE) {  /* we need edges for a circle */
1228                         v3= v1;
1229                         for(a=1;a<tot;a++) {
1230                                 addedgelist(em, v3, v3->next, NULL);
1231                                 v3= v3->next;
1232                         }
1233                         addedgelist(em, v3, v1, NULL);
1234                 }
1235                 /* side faces */
1236                 if(ext) {
1237                         v3= v1;
1238                         v4= v2;
1239                         for(a=1; a<tot; a++) {
1240                                 addfacelist(em, v3, v3->next, v4->next, v4, NULL, NULL);
1241                                 v3= v3->next;
1242                                 v4= v4->next;
1243                         }
1244                         addfacelist(em, v3, v1, v2, v4, NULL, NULL);
1245                 }
1246                 else if(type==PRIM_CONE && fill) {
1247                         /* add the bottom flat area of the cone
1248                          * if capping is disabled dont bother */
1249                         v3= v1;
1250                         for(a=1; a<tot; a++) {
1251                                 addfacelist(em, vtop, v3->next, v3, 0, NULL, NULL);
1252                                 v3= v3->next;
1253                         }
1254                         addfacelist(em, vtop, v1, v3, 0, NULL, NULL);
1255                 }
1256         }
1257         
1258         EM_stats_update(em);
1259         /* simple selection flush OK, based on fact it's a single model */
1260         EM_select_flush(em); /* flushes vertex -> edge -> face selection */
1261         
1262         if(type!=0 && type!=13)
1263                 righthandfaces(em, 1);  /* otherwise monkey has eyes in wrong direction */
1264 }
1265
1266
1267 /* uses context to figure out transform for primitive */
1268 /* returns standard diameter */
1269 static float new_primitive_matrix(bContext *C, float primmat[][4])
1270 {
1271         Object *obedit= CTX_data_edit_object(C);
1272         Scene *scene = CTX_data_scene(C);
1273         View3D *v3d =CTX_wm_view3d(C);
1274         ARegion *ar= CTX_wm_region(C);
1275         float *curs, mat[3][3], vmat[3][3], cmat[3][3], imat[3][3];
1276         
1277         Mat4One(primmat);
1278         
1279         if(ar)
1280                 Mat3CpyMat4(vmat, ((RegionView3D *)ar->regiondata)->viewmat);
1281         else
1282                 Mat3One(vmat);
1283         
1284         /* inverse transform for view and object */
1285         Mat3CpyMat4(mat, obedit->obmat);
1286         Mat3MulMat3(cmat, vmat, mat);
1287         Mat3Inv(imat, cmat);
1288         Mat4CpyMat3(primmat, imat);
1289
1290         /* center */
1291         curs= give_cursor(scene, v3d);
1292         VECCOPY(primmat[3], curs);
1293         Mat3Inv(imat, mat);
1294         Mat3MulVecfl(imat, primmat[3]);
1295         VECSUB(primmat[3], primmat[3], obedit->obmat[3]);
1296         
1297         if(v3d) return v3d->grid;
1298         return 1.0f;
1299 }
1300
1301 /* ********* add primitive operators ************* */
1302
1303 static int add_primitive_plane_exec(bContext *C, wmOperator *op)
1304 {
1305         Object *obedit= CTX_data_edit_object(C);
1306         float dia, mat[4][4];
1307         
1308         dia= new_primitive_matrix(C, mat);
1309         /* plane (diameter of 1.41 makes it unit size) */
1310         dia*= sqrt(2.0f);
1311         
1312         make_prim(obedit, PRIM_PLANE, mat, 4, 0, 0, dia, 0.0f, 0, 1);
1313         
1314         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
1315         
1316         return OPERATOR_FINISHED;       
1317 }
1318
1319 void MESH_OT_add_primitive_plane(wmOperatorType *ot)
1320 {
1321         /* identifiers */
1322         ot->name= "Add Plane";
1323         ot->idname= "MESH_OT_add_primitive_plane";
1324         
1325         /* api callbacks */
1326         ot->exec= add_primitive_plane_exec;
1327         ot->poll= ED_operator_editmesh;
1328         
1329         /* flags */
1330         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1331 }
1332
1333 static int add_primitive_cube_exec(bContext *C, wmOperator *op)
1334 {
1335         Object *obedit= CTX_data_edit_object(C);
1336         float dia, mat[4][4];
1337         
1338         dia= new_primitive_matrix(C, mat);
1339         /* plane (diameter of 1.41 makes it unit size) */
1340         dia*= sqrt(2.0f);
1341         
1342         make_prim(obedit, PRIM_CUBE, mat, 4, 0, 0, dia, 1.0f, 1, 1);
1343         
1344         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
1345         
1346         return OPERATOR_FINISHED;       
1347 }
1348
1349 void MESH_OT_add_primitive_cube(wmOperatorType *ot)
1350 {
1351         /* identifiers */
1352         ot->name= "Add Cube";
1353         ot->idname= "MESH_OT_add_primitive_cube";
1354         
1355         /* api callbacks */
1356         ot->exec= add_primitive_cube_exec;
1357         ot->poll= ED_operator_editmesh;
1358         
1359         /* flags */
1360         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1361 }
1362
1363 static int add_primitive_circle_exec(bContext *C, wmOperator *op)
1364 {
1365         Object *obedit= CTX_data_edit_object(C);
1366         float dia, mat[4][4];
1367         
1368         dia= new_primitive_matrix(C, mat);
1369         dia *= RNA_float_get(op->ptr,"radius");
1370         
1371         make_prim(obedit, PRIM_CIRCLE, mat, RNA_int_get(op->ptr, "vertices"), 0, 0, dia, 0.0f, 0, 
1372                           RNA_boolean_get(op->ptr, "fill"));
1373         
1374         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
1375         
1376         return OPERATOR_FINISHED;       
1377 }
1378
1379 void MESH_OT_add_primitive_circle(wmOperatorType *ot)
1380 {
1381         /* identifiers */
1382         ot->name= "Add Circle";
1383         ot->idname= "MESH_OT_add_primitive_circle";
1384         
1385         /* api callbacks */
1386         ot->exec= add_primitive_circle_exec;
1387         ot->poll= ED_operator_editmesh;
1388         
1389         /* flags */
1390         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1391         
1392         /* props */
1393         RNA_def_int(ot->srna, "vertices", 32, INT_MIN, INT_MAX, "Vertices", "", 3, 500);
1394         RNA_def_float(ot->srna, "radius", 1.0f, -FLT_MAX, FLT_MAX, "Radius", "", 0.001, 100.00);
1395         RNA_def_boolean(ot->srna, "fill", 0, "Fill", "");
1396 }
1397
1398 static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
1399 {
1400         Object *obedit= CTX_data_edit_object(C);
1401         float dia, mat[4][4];
1402         
1403         dia= new_primitive_matrix(C, mat);
1404         dia *= RNA_float_get(op->ptr, "radius");
1405         
1406         make_prim(obedit, PRIM_CYLINDER, mat, RNA_int_get(op->ptr, "vertices"), 0, 0, dia, 
1407                           RNA_float_get(op->ptr, "depth"), 1, 1);
1408         
1409         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
1410         
1411         return OPERATOR_FINISHED;       
1412 }
1413
1414 void MESH_OT_add_primitive_cylinder(wmOperatorType *ot)
1415 {
1416         /* identifiers */
1417         ot->name= "Add Cylinder";
1418         ot->idname= "MESH_OT_add_primitive_cylinder";
1419         
1420         /* api callbacks */
1421         ot->exec= add_primitive_cylinder_exec;
1422         ot->poll= ED_operator_editmesh;
1423         
1424         /* flags */
1425         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1426         
1427         /* props */
1428         RNA_def_int(ot->srna, "vertices", 32, INT_MIN, INT_MAX, "Vertices", "", 2, 500);
1429         RNA_def_float(ot->srna, "radius", 1.0f, -FLT_MAX, FLT_MAX, "Radius", "", 0.001, 100.00);
1430         RNA_def_float(ot->srna, "depth", 1.0f, -FLT_MAX, FLT_MAX, "Depth", "", 0.001, 100.00);
1431 }
1432
1433 static int add_primitive_tube_exec(bContext *C, wmOperator *op)
1434 {
1435         Object *obedit= CTX_data_edit_object(C);
1436         float dia, mat[4][4];
1437         
1438         dia= new_primitive_matrix(C, mat);
1439         dia *= RNA_float_get(op->ptr, "radius");
1440         
1441         make_prim(obedit, PRIM_CYLINDER, mat, RNA_int_get(op->ptr, "vertices"), 0, 0, dia, 
1442                           RNA_float_get(op->ptr, "depth"), 1, 0);
1443         
1444         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
1445         
1446         return OPERATOR_FINISHED;       
1447 }
1448
1449 void MESH_OT_add_primitive_tube(wmOperatorType *ot)
1450 {
1451         /* identifiers */
1452         ot->name= "Add Tube";
1453         ot->idname= "MESH_OT_add_primitive_tube";
1454         
1455         /* api callbacks */
1456         ot->exec= add_primitive_tube_exec;
1457         ot->poll= ED_operator_editmesh;
1458         
1459         /* flags */
1460         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1461         
1462         /* props */
1463         RNA_def_int(ot->srna, "vertices", 32, INT_MIN, INT_MAX, "Vertices", "", 2, 500);
1464         RNA_def_float(ot->srna, "radius", 1.0f, -FLT_MAX, FLT_MAX, "Radius", "", 0.001, 100.00);
1465         RNA_def_float(ot->srna, "depth", 1.0f, -FLT_MAX, FLT_MAX, "Depth", "", 0.001, 100.00);
1466 }
1467
1468 static int add_primitive_cone_exec(bContext *C, wmOperator *op)
1469 {
1470         Object *obedit= CTX_data_edit_object(C);
1471         float dia, mat[4][4];
1472         
1473         dia= new_primitive_matrix(C, mat);
1474         dia *= RNA_float_get(op->ptr, "radius");
1475         
1476         make_prim(obedit, PRIM_CONE, mat, RNA_int_get(op->ptr, "vertices"), 0, 0, dia, 
1477                           RNA_float_get(op->ptr, "depth"), 0, RNA_boolean_get(op->ptr, "cap_end"));
1478         
1479         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
1480         
1481         return OPERATOR_FINISHED;       
1482 }
1483
1484 void MESH_OT_add_primitive_cone(wmOperatorType *ot)
1485 {
1486         /* identifiers */
1487         ot->name= "Add Cone";
1488         ot->idname= "MESH_OT_add_primitive_cone";
1489         
1490         /* api callbacks */
1491         ot->exec= add_primitive_cone_exec;
1492         ot->poll= ED_operator_editmesh;
1493         
1494         /* flags */
1495         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1496         
1497         /* props */
1498         RNA_def_int(ot->srna, "vertices", 32, INT_MIN, INT_MAX, "Vertices", "", 2, 500);
1499         RNA_def_float(ot->srna, "radius", 1.0f, -FLT_MAX, FLT_MAX, "Radius", "", 0.001, 100.00);
1500         RNA_def_float(ot->srna, "depth", 1.0f, -FLT_MAX, FLT_MAX, "Depth", "", 0.001, 100.00);
1501         RNA_def_boolean(ot->srna, "cap_end", 0, "Cap End", "");
1502
1503 }
1504
1505 static int add_primitive_grid_exec(bContext *C, wmOperator *op)
1506 {
1507         Object *obedit= CTX_data_edit_object(C);
1508         float dia, mat[4][4];
1509         
1510         dia= new_primitive_matrix(C, mat);
1511         dia*= RNA_float_get(op->ptr, "size");
1512         
1513         make_prim(obedit, PRIM_GRID, mat, RNA_int_get(op->ptr, "x_subdivisions"), 
1514                           RNA_int_get(op->ptr, "y_subdivisions"), 0, dia, 0.0f, 0, 1);
1515         
1516         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
1517         
1518         return OPERATOR_FINISHED;       
1519 }
1520
1521 void MESH_OT_add_primitive_grid(wmOperatorType *ot)
1522 {
1523         /* identifiers */
1524         ot->name= "Add Grid";
1525         ot->idname= "MESH_OT_add_primitive_grid";
1526         
1527         /* api callbacks */
1528         ot->exec= add_primitive_grid_exec;
1529         ot->poll= ED_operator_editmesh;
1530         
1531         /* flags */
1532         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1533         
1534         /* props */
1535         RNA_def_int(ot->srna, "x_subdivisions", 10, INT_MIN, INT_MAX, "X Subdivisions", "", 3, 1000);
1536         RNA_def_int(ot->srna, "y_subdivisions", 10, INT_MIN, INT_MAX, "Y Subdivisons", "", 3, 1000);
1537         RNA_def_float(ot->srna, "size", 1.0f, -FLT_MAX, FLT_MAX, "Size", "", 0.001, FLT_MAX);
1538 }
1539
1540 static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
1541 {
1542         Object *obedit= CTX_data_edit_object(C);
1543         float mat[4][4];
1544         
1545         new_primitive_matrix(C, mat);
1546         
1547         make_prim(obedit, PRIM_MONKEY, mat, 0, 0, 2, 0.0f, 0.0f, 0, 0);
1548         
1549         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
1550         
1551         return OPERATOR_FINISHED;       
1552 }
1553
1554 void MESH_OT_add_primitive_monkey(wmOperatorType *ot)
1555 {
1556         /* identifiers */
1557         ot->name= "Add Monkey";
1558         ot->idname= "MESH_OT_add_primitive_monkey";
1559         
1560         /* api callbacks */
1561         ot->exec= add_primitive_monkey_exec;
1562         ot->poll= ED_operator_editmesh;
1563         
1564         /* flags */
1565         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1566 }
1567
1568 static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
1569 {
1570         Object *obedit= CTX_data_edit_object(C);
1571         float dia, mat[4][4];
1572         
1573         dia= new_primitive_matrix(C, mat);
1574         dia*= RNA_float_get(op->ptr, "size");
1575
1576         make_prim(obedit, PRIM_UVSPHERE, mat, RNA_int_get(op->ptr, "rings"), 
1577                           RNA_int_get(op->ptr, "segments"), 0, dia, 0.0f, 0, 0);
1578         
1579         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
1580         
1581         return OPERATOR_FINISHED;       
1582 }
1583
1584 void MESH_OT_add_primitive_uv_sphere(wmOperatorType *ot)
1585 {
1586         /* identifiers */
1587         ot->name= "Add UV Sphere";
1588         ot->idname= "MESH_OT_add_primitive_uv_sphere";
1589         
1590         /* api callbacks */
1591         ot->exec= add_primitive_uvsphere_exec;
1592         ot->poll= ED_operator_editmesh;
1593         
1594         /* flags */
1595         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1596         
1597         /* props */
1598         RNA_def_int(ot->srna, "segments", 32, INT_MIN, INT_MAX, "Segments", "", 3, 500);
1599         RNA_def_int(ot->srna, "rings", 24, INT_MIN, INT_MAX, "Rings", "", 3, 500);
1600         RNA_def_float(ot->srna, "size", 1.0f, -FLT_MAX, FLT_MAX, "Size", "", 0.001, 100.00);
1601 }
1602
1603 static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
1604 {
1605         Object *obedit= CTX_data_edit_object(C);
1606         float dia, mat[4][4];
1607         
1608         dia= new_primitive_matrix(C, mat);
1609         dia*= RNA_float_get(op->ptr, "size");
1610         
1611         make_prim(obedit, PRIM_ICOSPHERE, mat, 0, 0, 
1612                           RNA_int_get(op->ptr, "subdivisions"), dia, 0.0f, 0, 0);
1613         
1614         WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
1615         
1616         return OPERATOR_FINISHED;       
1617 }
1618
1619 void MESH_OT_add_primitive_ico_sphere(wmOperatorType *ot)
1620 {
1621         /* identifiers */
1622         ot->name= "Add Ico Sphere";
1623         ot->idname= "MESH_OT_add_primitive_ico_sphere";
1624         
1625         /* api callbacks */
1626         ot->exec= add_primitive_icosphere_exec;
1627         ot->poll= ED_operator_editmesh;
1628         
1629         /* flags */
1630         ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
1631         
1632         /* props */
1633         RNA_def_int(ot->srna, "subdivisions", 2, 0, 6, "Subdivisions", "", 0, 8);
1634         RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, "Size", "", 0.001f, 100.00);
1635 }
1636