diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-04-02 13:58:01 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-04-02 13:58:01 +0400 |
commit | dabf9378d786b8a27811dcdbe9f2d52c28921bb3 (patch) | |
tree | 09834a4fd485a9250edd4858265b2f95e3a1b4bb | |
parent | d5605414ee50d0d73e330520463c81db48b2ef0a (diff) |
added a python slot to the "Add->Mesh" menu.
-rw-r--r-- | source/blender/python/BPY_menus.c | 5 | ||||
-rw-r--r-- | source/blender/python/BPY_menus.h | 1 | ||||
-rw-r--r-- | source/blender/src/header_info.c | 97 | ||||
-rw-r--r-- | source/blender/src/toolbox.c | 74 |
4 files changed, 121 insertions, 56 deletions
diff --git a/source/blender/python/BPY_menus.c b/source/blender/python/BPY_menus.c index d4fc6f9a0de..5f16aa0241b 100644 --- a/source/blender/python/BPY_menus.c +++ b/source/blender/python/BPY_menus.c @@ -111,6 +111,8 @@ static int bpymenu_group_atoi( char *str ) return PYMENU_SCRIPTTEMPLATE; else if( !strcmp( str, "MeshFaceKey" ) ) return PYMENU_MESHFACEKEY; + else if( !strcmp( str, "AddMesh" ) ) + return PYMENU_ADDMESH; /* "Misc" or an inexistent group name: use misc */ else return PYMENU_MISC; @@ -188,6 +190,9 @@ char *BPyMenu_group_itoa( short menugroup ) case PYMENU_MESHFACEKEY: return "MeshFaceKey"; break; + case PYMENU_ADDMESH: + return "AddMesh"; + break; case PYMENU_MISC: return "Misc"; break; diff --git a/source/blender/python/BPY_menus.h b/source/blender/python/BPY_menus.h index 443960c369c..89491ce3ef2 100644 --- a/source/blender/python/BPY_menus.h +++ b/source/blender/python/BPY_menus.h @@ -106,6 +106,7 @@ typedef enum { PYMENU_HELPSYSTEM,/* Resources, troubleshooting, system tools */ PYMENU_HELPWEBSITES,/* Help -> Websites submenu */ PYMENU_MESHFACEKEY, /* face key in mesh editmode */ + PYMENU_ADDMESH, /* adds mesh */ PYMENU_TOTAL } PYMENUHOOKS; diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index bacfb3f42d4..c3bdffdc681 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -1007,46 +1007,49 @@ static uiBlock *info_filemenu(void *arg_unused) void do_info_add_meshmenu(void *arg, int event) { - - switch(event) { - case 0: - /* Plane */ - add_primitiveMesh(0); - break; - case 1: - /* Cube */ - add_primitiveMesh(1); - break; - case 2: - /* Circle */ - add_primitiveMesh(4); - break; - case 3: - /* UVsphere */ - add_primitiveMesh(11); - break; - case 4: - /* IcoSphere */ - add_primitiveMesh(12); - break; - case 5: - /* Cylinder */ - add_primitiveMesh(5); - break; - case 7: - /* Cone */ - add_primitiveMesh(7); - break; - case 8: - /* Grid */ - add_primitiveMesh(10); - break; - case 9: - /* Monkey */ - add_primitiveMesh(13); - break; - default: - break; + if (event>=20) { + BPY_menu_do_python(PYMENU_ADDMESH, event - 20); + } else { + switch(event) { + case 0: + /* Plane */ + add_primitiveMesh(0); + break; + case 1: + /* Cube */ + add_primitiveMesh(1); + break; + case 2: + /* Circle */ + add_primitiveMesh(4); + break; + case 3: + /* UVsphere */ + add_primitiveMesh(11); + break; + case 4: + /* IcoSphere */ + add_primitiveMesh(12); + break; + case 5: + /* Cylinder */ + add_primitiveMesh(5); + break; + case 7: + /* Cone */ + add_primitiveMesh(7); + break; + case 8: + /* Grid */ + add_primitiveMesh(10); + break; + case 9: + /* Monkey */ + add_primitiveMesh(13); + break; + default: + break; + } } allqueue(REDRAWINFO, 0); } @@ -1057,6 +1060,10 @@ static uiBlock *info_add_meshmenu(void *arg_unused) uiBlock *block; short yco= 0; + /* Python Menu */ + BPyMenu *pym; + int i=0; + block= uiNewBlock(&curarea->uiblocks, "add_meshmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin); uiBlockSetButmFunc(block, do_info_add_meshmenu, NULL); @@ -1071,6 +1078,16 @@ static uiBlock *info_add_meshmenu(void *arg_unused) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Grid|", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 8, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Monkey|", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 9, ""); + + pym = BPyMenuTable[PYMENU_ADDMESH]; + if (pym) { + uiDefIconTextBut(block, SEPR, 0, ICON_BLANK1, "", 0, yco-=6, 160, 6, NULL, 0.0, 0.0, 0, 0, ""); + + for (; pym; pym = pym->next, i++) { + uiDefIconTextBut(block, BUTM, 1, ICON_PYTHON, pym->name, 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, i+20, pym->tooltip?pym->tooltip:pym->filename); + } + } + uiBlockSetDirection(block, UI_RIGHT); uiTextBoundsBlock(block, 50); diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index 3127d635014..298ffc28226 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -122,6 +122,10 @@ #include "butspace.h" #include "mydevice.h" +/* bpymenu */ +#include "BPY_extern.h" +#include "BPY_menus.h" + void asciitoraw(int ch, unsigned short *event, unsigned short *qual) { if( isalpha(ch)==0 ) return; @@ -1410,19 +1414,6 @@ static TBitem tb_transform_editmode2[]= { /* *************ADD ********** */ -static TBitem addmenu_mesh[]= { -{ 0, "Plane", 0, NULL}, -{ 0, "Cube", 1, NULL}, -{ 0, "Circle", 2, NULL}, -{ 0, "UVsphere", 3, NULL}, -{ 0, "Icosphere", 4, NULL}, -{ 0, "Cylinder", 5, NULL}, -{ 0, "Cone", 7, NULL}, -{ 0, "SEPR", 0, NULL}, -{ 0, "Grid", 8, NULL}, -{ 0, "Monkey", 9, NULL}, -{ -1, "", 0, do_info_add_meshmenu}}; - static TBitem addmenu_curve[]= { { 0, "Bezier Curve", 0, NULL}, { 0, "Bezier Circle", 1, NULL}, @@ -1471,11 +1462,12 @@ static TBitem addmenu_armature[]= { { -1, "", 0, do_info_addmenu}}; /* dynamic items */ +#define TB_ADD_MESH 0 #define TB_ADD_GROUP 7 #define TB_ADD_LAMP 10 static TBitem tb_add[]= { -{ 0, "Mesh", 0, addmenu_mesh}, +{ 0, "Mesh", 0, NULL}, { 0, "Curve", 1, addmenu_curve}, { 0, "Surface", 2, addmenu_surf}, { 0, "Meta", 3, addmenu_meta}, @@ -1878,6 +1870,55 @@ static TBitem *create_group_all_sublevels(ListBase *storage) return groupmenu; } +static TBitem *create_mesh_sublevel(ListBase *storage) +{ + Link *link; + TBitem *meshmenu, *mm; + int totmenu= 10, totpymenu=0, a=0; + + /* Python Menu */ + BPyMenu *pym; + + /* count the python menu items*/ + for (pym = BPyMenuTable[PYMENU_ADDMESH]; pym; pym = pym->next, totpymenu++) {} + if (totpymenu) totmenu += totpymenu+1; /* add 1 for the seperator */ + + link= MEM_callocN(sizeof(Link) + sizeof(TBitem)*(totmenu+1), "mesh menu"); + BLI_addtail(storage, link); + mm= meshmenu= (TBitem *)(link+1); + + mm->icon = 0; mm->retval= a; mm->name = "Plane"; mm++; a++; + mm->icon = 0; mm->retval= a; mm->name = "Cube"; mm++; a++; + mm->icon = 0; mm->retval= a; mm->name = "Circle"; mm++; a++; + mm->icon = 0; mm->retval= a; mm->name = "UVsphere"; mm++; a++; + mm->icon = 0; mm->retval= a; mm->name = "Icosphere"; mm++; a++; + mm->icon = 0; mm->retval= a; mm->name = "Cylinder"; mm++; a++; a++; + mm->icon = 0; mm->retval= a; mm->name = "Cone"; mm++; a++; + mm->icon = 0; mm->retval= 0; mm->name = "SEPR"; mm++; + mm->icon = 0; mm->retval= a; mm->name = "Grid"; mm++; a++; + mm->icon = 0; mm->retval= a; mm->name = "Monkey"; mm++; a++; + /* a == 10 */ + + if (totpymenu) { + int i=0; + mm->icon = 0; mm->retval= 0; mm->name = "SEPR"; mm++; + + /* note that we account for the 10 previous entries with i+4: */ + for (pym = BPyMenuTable[PYMENU_ADDMESH]; pym; pym = pym->next, i++) { + mm->icon = 0; + mm->retval= i+20; + mm->name = pym->name; + mm++; a++; + } + } + + /* terminate the menu */ + mm->icon= -1; mm->retval= a; mm->name= ""; mm->poin= do_info_add_meshmenu; + + return meshmenu; +} + + void toolbox_n(void) { @@ -1913,6 +1954,7 @@ void toolbox_n(void) /* dynamic menu entries */ tb_add[TB_ADD_GROUP].poin= create_group_all_sublevels(&storage); + tb_add[TB_ADD_MESH].poin= create_mesh_sublevel(&storage); /* static */ if (G.scene->r.renderer==R_YAFRAY) @@ -1948,7 +1990,7 @@ void toolbox_n(void) if(U.uiflag & USER_PLAINMENUS) { switch(G.obedit->type){ case OB_MESH: - menu1= addmenu_mesh; + menu1= create_mesh_sublevel(&storage); menu2= tb_mesh_edit; menu3= tb_mesh_select; menu4= tb_transform_editmode1; @@ -1993,7 +2035,7 @@ void toolbox_n(void) } else { if(G.obedit->type==OB_MESH) { menu1= tb_mesh; str1= "Mesh"; - menu2= addmenu_mesh; + menu2= create_mesh_sublevel(&storage); menu3= tb_mesh_select; menu4= tb_mesh_edit; menu5= tb_transform_editmode1; |