archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
23626e0149f25f13855735bbb7f65121e0c40ca0
blender-archive/source/blender/editors/mesh/editmesh_add.c

578 lines
17 KiB
C
Raw Normal View History

remove $Id from headers
2011-10-24 23:32:24 +00:00
/*
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
* ***** 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,
GPL Header Cleanup
2012-02-11 04:16:17 +00:00
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
*
* The Original Code is Copyright (C) 2004 by Blender Foundation.
* All rights reserved.
*
* The Original Code is: all of this file.
*
* Contributor(s): Joseph Eagar
*
* ***** END GPL LICENSE BLOCK *****
*/
sync some changes with trunk and rename bmeshutils.c
2012-02-19 17:11:40 +00:00
/** \file blender/editors/mesh/editmesh_add.c
* \ingroup edmesh
*/
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
#include "DNA_object_types.h"
Include DNA_scene_types before ED_object instead of forward enum declaration Forward enum declaration is a bad idea, especially for C++ which requires enum specification to dteermine which data type to use to store it. Alternative would be to not use enum as an arument and pass it as int, but actually would rather be strict on typing -- using explicit enum as parameter type helps understanding the code and prevents possible mistakes when using the function.
2013-06-25 09:27:31 +00:00
#include "DNA_scene_types.h"
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
#include "BLI_math.h"
I18n users request: add the ability to use a translated name for newly added/created objects or other datablocks. This simply adds a third "translation type" (in addition to iface and tip), "new data", with relevant user settings flag and helper funcs/macros (and py api). Currently implemented name translation when adding new objects, as well as modifiers and constraints, will add the others (cd layers, scenes, perhaps nodes [though I think they do not need this], etc.) later.
2013-03-20 18:42:09 +00:00
#include "BLF_translation.h"
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
#include "BKE_context.h"
fix [#30141] Add primitive sets only the default name "Mesh"
2012-02-16 19:13:04 +00:00
#include "BKE_library.h"
code cleanup: rename BKE_tessmesh -> BKE_editmesh, rename EditDerivedBMesh.tc -> em. ('tc' is odd name which isn't used elsewhere).
2013-04-13 20:31:52 +00:00
#include "BKE_editmesh.h"
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
use bool for rna funcs.
2013-03-07 02:44:55 +00:00
#include "RNA_define.h"
#include "RNA_access.h"
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
#include "WM_api.h"
#include "WM_types.h"
#include "ED_mesh.h"
#include "ED_screen.h"
#include "ED_object.h"
code cleanup: split editmesh_tools.c, into inset, bevel (both modal operators) and moved extrude operators into their own file. also move some selection operators from editmesh_tools.c into editmesh_select.c
2013-04-01 10:18:01 +00:00
#include "mesh_intern.h" /* own include */
style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions
2012-03-27 04:46:52 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* ********* add primitive operators ************* */
fix for crashes caused by mixups when adding objects when incompatible object types were already in editmode.
2012-09-23 07:18:50 +00:00
static Object *make_prim_init(bContext *C, const char *idname,
define the size of matrix args for both rows/cols.
2012-12-11 14:29:01 +00:00
float *dia, float mat[4][4],
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool *was_editmode, const float loc[3], const float rot[3], const unsigned int layer)
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
{
style cleanup: mainly for mesh code, also some WM function use.
2012-03-24 02:51:46 +00:00
Object *obedit = CTX_data_edit_object(C);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
*was_editmode = false;
style cleanup: mainly for mesh code, also some WM function use.
2012-03-24 02:51:46 +00:00
if (obedit == NULL || obedit->type != OB_MESH) {
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
obedit = ED_object_add_type(C, OB_MESH, loc, rot, false, layer);
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
fix [#30141] Add primitive sets only the default name "Mesh"
2012-02-16 19:13:04 +00:00
rename_id((ID *)obedit, idname);
rename_id((ID *)obedit->data, idname);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* create editmode */
code cleanup: rename editmode functions so we have ED_object_editmode_load/enter/exit
2013-03-21 14:18:17 +00:00
ED_object_editmode_enter(C, EM_DO_UNDO | EM_IGNORE_LAYER); /* rare cases the active layer is messed up */
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
*was_editmode = true;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
*dia = ED_object_new_primitive_matrix(C, obedit, loc, rot, mat, false);
fix for crashes caused by mixups when adding objects when incompatible object types were already in editmode.
2012-09-23 07:18:50 +00:00
return obedit;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
static void make_prim_finish(bContext *C, Object *obedit, bool was_editmode, int enter_editmode)
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
{
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
BMEditMesh *em = BKE_editmesh_from_object(obedit);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
const int exit_editmode = ((was_editmode == true) && (enter_editmode == false));
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
Fix selection when adding a primitive while already in edge/face-select mode
2011-10-06 02:29:39 +00:00
/* Primitive has all verts selected, use vert select flush
reviewed selection flushing code, some of this was incorrect, checked all uses against trunk. loop select also was incorrectly calling EDBM_select_flush() rather then EDBM_store_selection(), tsk tsk. (and strange nobody noticed this).
2012-02-10 06:16:21 +00:00
* to push this up to edges & faces. */
EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);
Added call to flushing function for primitives: ---------------------------------------------- Editmode selection flushing wasn't getting called on primitive addition. This caused inconsistent selection state.
2011-06-21 00:03:38 +00:00
skip recalculating tessface when adding objects if 'EnterEdit-mode' is disabled.
2012-11-29 02:37:39 +00:00
/* only recalc editmode tessface if we are staying in editmode */
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
EDBM_update_generic(em, !exit_editmode, true);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* userdef */
fix own mistake with recent commit to skip calculating tessface. If you were already in editmode the tessfaces wouldn't get recalculated. also minor edits to bmesh rst.
2012-12-03 02:26:13 +00:00
if (exit_editmode) {
code cleanup: rename editmode functions so we have ED_object_editmode_load/enter/exit
2013-03-21 14:18:17 +00:00
ED_object_editmode_exit(C, EM_FREEDATA); /* adding EM_DO_UNDO messes up operator redo */
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
style cleanup: editors/mesh - mostly whitespace around operators
2012-03-26 02:56:48 +00:00
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, obedit);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
sync some changes with trunk and rename bmeshutils.c
2012-02-19 17:11:40 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
static int add_primitive_plane_exec(bContext *C, wmOperator *op)
{
Object *obedit;
BMEditMesh *em;
fix invalid *= on an un-initialized value when adding primitives.
2012-03-28 22:11:19 +00:00
float loc[3], rot[3], mat[4][4], dia;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool enter_editmode;
bool was_editmode;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Plane"), &dia, mat, &was_editmode, loc, rot, layer);
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
em = BKE_editmesh_from_object(obedit);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
triangulate and beauty fill also needed changes to selection handling after recent changes.
2013-07-25 07:00:07 +00:00
if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,
"create_grid x_segments=%i y_segments=%i size=%f matrix=%m4",
1, 1, RNA_float_get(op->ptr, "radius"), mat))
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
{
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
return OPERATOR_CANCELLED;
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
}
grid size was being ignored for grid and plane primitives
2012-02-05 22:27:44 +00:00
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
make_prim_finish(C, obedit, was_editmode, enter_editmode);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
minor code/style cleanup
2012-03-27 05:03:23 +00:00
return OPERATOR_FINISHED;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
void MESH_OT_primitive_plane_add(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Plane";
ot->description = "Construct a filled planar mesh with 4 vertices";
ot->idname = "MESH_OT_primitive_plane_add";
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* api callbacks */
fix [#34851] "UnitSettings.scale_length" not beeing calculated the same way for all objects
2013-05-28 23:07:16 +00:00
ot->invoke = WM_operator_view3d_distance_invoke;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = add_primitive_plane_exec;
ot->poll = ED_operator_scene_editable;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* flags */
style cleanup: editors/mesh - mostly whitespace around operators
2012-03-26 02:56:48 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
move make_prim_radius_prop into a generic function.
2013-09-16 00:18:09 +00:00
ED_object_add_unit_props(ot);
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
ED_object_add_generic_props(ot, true);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
static int add_primitive_cube_exec(bContext *C, wmOperator *op)
{
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool enter_editmode;
bool was_editmode;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cube"), &dia, mat, &was_editmode, loc, rot, layer);
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
em = BKE_editmesh_from_object(obedit);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
triangulate and beauty fill also needed changes to selection handling after recent changes.
2013-07-25 07:00:07 +00:00
if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,
"create_cube matrix=%m4 size=%f",
mat, RNA_float_get(op->ptr, "radius") * 2.0f))
fix [#34851] "UnitSettings.scale_length" not beeing calculated the same way for all objects
2013-05-28 23:07:16 +00:00
{
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
return OPERATOR_CANCELLED;
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
removed some bmesh todo comments which are not needed and minor edits on previous commit.
2011-12-08 00:28:42 +00:00
/* BMESH_TODO make plane side this: M_SQRT2 - plane (diameter of 1.41 makes it unit size) */
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
make_prim_finish(C, obedit, was_editmode, enter_editmode);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
sync some changes with trunk and rename bmeshutils.c
2012-02-19 17:11:40 +00:00
return OPERATOR_FINISHED;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
void MESH_OT_primitive_cube_add(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Cube";
ot->description = "Construct a cube mesh";
ot->idname = "MESH_OT_primitive_cube_add";
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* api callbacks */
fix [#34851] "UnitSettings.scale_length" not beeing calculated the same way for all objects
2013-05-28 23:07:16 +00:00
ot->invoke = WM_operator_view3d_distance_invoke;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = add_primitive_cube_exec;
ot->poll = ED_operator_scene_editable;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* flags */
style cleanup: editors/mesh - mostly whitespace around operators
2012-03-26 02:56:48 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
move make_prim_radius_prop into a generic function.
2013-09-16 00:18:09 +00:00
ED_object_add_unit_props(ot);
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
ED_object_add_generic_props(ot, true);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
style cleanup: editors/mesh - mostly whitespace around operators
2012-03-26 02:56:48 +00:00
static const EnumPropertyItem fill_type_items[] = {
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
{0, "NOTHING", 0, "Nothing", "Don't fill at all"},
{1, "NGON", 0, "Ngon", "Use ngons"},
{2, "TRIFAN", 0, "Triangle Fan", "Use triangle fans"},
{0, NULL, 0, NULL, NULL}};
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
static int add_primitive_circle_exec(bContext *C, wmOperator *op)
{
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool enter_editmode;
int cap_end, cap_tri;
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
unsigned int layer;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool was_editmode;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
cap_end = RNA_enum_get(op->ptr, "fill_type");
style cleanup: mainly for mesh code, also some WM function use.
2012-03-24 02:51:46 +00:00
cap_tri = (cap_end == 2);
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Circle"), &dia, mat, &was_editmode, loc, rot, layer);
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
em = BKE_editmesh_from_object(obedit);
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
triangulate and beauty fill also needed changes to selection handling after recent changes.
2013-07-25 07:00:07 +00:00
if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,
"create_circle segments=%i diameter=%f cap_ends=%b cap_tris=%b matrix=%m4",
RNA_int_get(op->ptr, "vertices"), RNA_float_get(op->ptr, "radius"),
cap_end, cap_tri, mat))
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
{
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
return OPERATOR_CANCELLED;
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
make_prim_finish(C, obedit, was_editmode, enter_editmode);
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
return OPERATOR_FINISHED;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
void MESH_OT_primitive_circle_add(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Circle";
ot->description = "Construct a circle mesh";
ot->idname = "MESH_OT_primitive_circle_add";
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* api callbacks */
fix [#33442] Units adding meshes were scaling the user input values so the distance on the button didnt relate to the scale of the object added. Now use an invoke function that scales unset default values.
2012-12-09 10:48:18 +00:00
ot->invoke = WM_operator_view3d_distance_invoke;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = add_primitive_circle_exec;
ot->poll = ED_operator_scene_editable;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* flags */
style cleanup: editors/mesh - mostly whitespace around operators
2012-03-26 02:56:48 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* props */
sync some changes with trunk and rename bmeshutils.c
2012-02-19 17:11:40 +00:00
RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500);
move make_prim_radius_prop into a generic function.
2013-09-16 00:18:09 +00:00
ED_object_add_unit_props(ot);
=bmesh= Cut out some unwanted differences with trunk in preparation for merge. Also fixed some warnings, though many remain.
2011-05-07 02:48:14 +00:00
RNA_def_enum(ot->srna, "fill_type", fill_type_items, 0, "Fill Type", "");
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
ED_object_add_generic_props(ot, true);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool enter_editmode;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool was_editmode;
minor edits to DM_update_weight_mcol(), skip getting vars when in editmode, also remove old/invalid comment.
2013-04-15 08:43:17 +00:00
const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type");
const bool cap_end = (end_fill_type != 0);
const bool cap_tri = (end_fill_type == 2);
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cylinder"), &dia, mat, &was_editmode, loc, rot, layer);
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
em = BKE_editmesh_from_object(obedit);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions
2012-03-27 04:46:52 +00:00
if (!EDBM_op_call_and_selectf(
triangulate and beauty fill also needed changes to selection handling after recent changes.
2013-07-25 07:00:07 +00:00
em, op, "verts.out", false,
bmesh operator naming - use clearer names for args eg: (mat -> matrix, use_singleedge -> use_single_edge) also remove duplicate docs for operator arg formatting.
2012-11-28 00:16:06 +00:00
"create_cone segments=%i diameter1=%f diameter2=%f cap_ends=%b cap_tris=%b depth=%f matrix=%m4",
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
RNA_int_get(op->ptr, "vertices"),
fix [#33442] Units adding meshes were scaling the user input values so the distance on the button didnt relate to the scale of the object added. Now use an invoke function that scales unset default values.
2012-12-09 10:48:18 +00:00
RNA_float_get(op->ptr, "radius"),
RNA_float_get(op->ptr, "radius"),
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
cap_end, cap_tri,
fix [#33442] Units adding meshes were scaling the user input values so the distance on the button didnt relate to the scale of the object added. Now use an invoke function that scales unset default values.
2012-12-09 10:48:18 +00:00
RNA_float_get(op->ptr, "depth"), mat))
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
return OPERATOR_CANCELLED;
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
make_prim_finish(C, obedit, was_editmode, enter_editmode);
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
return OPERATOR_FINISHED;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
void MESH_OT_primitive_cylinder_add(wmOperatorType *ot)
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
{
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
PropertyRNA *prop;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Cylinder";
ot->description = "Construct a cylinder mesh";
ot->idname = "MESH_OT_primitive_cylinder_add";
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* api callbacks */
fix [#33442] Units adding meshes were scaling the user input values so the distance on the button didnt relate to the scale of the object added. Now use an invoke function that scales unset default values.
2012-12-09 10:48:18 +00:00
ot->invoke = WM_operator_view3d_distance_invoke;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = add_primitive_cylinder_exec;
ot->poll = ED_operator_scene_editable;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* flags */
style cleanup: editors/mesh - mostly whitespace around operators
2012-03-26 02:56:48 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* props */
Fix bug 30696, circular mesh objects had wrong orientation. Behavior now matches 2.62, circle, cone, and cylinder get first vertex at 0 degrees. Also fixed range for vertex property of add-cone and add-cylinder operators, changed minumum from two to three.
2012-03-27 10:28:06 +00:00
RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500);
move make_prim_radius_prop into a generic function.
2013-09-16 00:18:09 +00:00
ED_object_add_unit_props(ot);
use same default as trunk for cylinder depth
2012-01-23 14:03:09 +00:00
prop = RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
RNA_def_property_subtype(prop, PROP_DISTANCE);
=bmesh= Cut out some unwanted differences with trunk in preparation for merge. Also fixed some warnings, though many remain.
2011-05-07 02:48:14 +00:00
RNA_def_enum(ot->srna, "end_fill_type", fill_type_items, 1, "Cap Fill Type", "");
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
ED_object_add_generic_props(ot, true);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
static int add_primitive_cone_exec(bContext *C, wmOperator *op)
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool enter_editmode;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool was_editmode;
minor edits to DM_update_weight_mcol(), skip getting vars when in editmode, also remove old/invalid comment.
2013-04-15 08:43:17 +00:00
const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type");
const bool cap_end = (end_fill_type != 0);
const bool cap_tri = (end_fill_type == 2);
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cone"), &dia, mat, &was_editmode, loc, rot, layer);
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
em = BKE_editmesh_from_object(obedit);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions
2012-03-27 04:46:52 +00:00
if (!EDBM_op_call_and_selectf(
triangulate and beauty fill also needed changes to selection handling after recent changes.
2013-07-25 07:00:07 +00:00
em, op, "verts.out", false,
bmesh operator naming - use clearer names for args eg: (mat -> matrix, use_singleedge -> use_single_edge) also remove duplicate docs for operator arg formatting.
2012-11-28 00:16:06 +00:00
"create_cone segments=%i diameter1=%f diameter2=%f cap_ends=%b cap_tris=%b depth=%f matrix=%m4",
fix [#33442] Units adding meshes were scaling the user input values so the distance on the button didnt relate to the scale of the object added. Now use an invoke function that scales unset default values.
2012-12-09 10:48:18 +00:00
RNA_int_get(op->ptr, "vertices"), RNA_float_get(op->ptr, "radius1"),
RNA_float_get(op->ptr, "radius2"), cap_end, cap_tri, RNA_float_get(op->ptr, "depth"), mat))
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
return OPERATOR_CANCELLED;
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
make_prim_finish(C, obedit, was_editmode, enter_editmode);
ported triangles to quads.
2010-02-18 10:09:52 +00:00
"Fix" [#30431] UI string spelling & similar fixes. All suggested changes looked good to me, thx to Michael Färber for this list of changes!
2012-03-02 21:14:37 +00:00
return OPERATOR_FINISHED;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
void MESH_OT_primitive_cone_add(wmOperatorType *ot)
{
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
PropertyRNA *prop;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Cone";
ot->description = "Construct a conic mesh";
ot->idname = "MESH_OT_primitive_cone_add";
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* api callbacks */
fix [#33442] Units adding meshes were scaling the user input values so the distance on the button didnt relate to the scale of the object added. Now use an invoke function that scales unset default values.
2012-12-09 10:48:18 +00:00
ot->invoke = WM_operator_view3d_distance_invoke;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = add_primitive_cone_exec;
ot->poll = ED_operator_scene_editable;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* flags */
style cleanup: editors/mesh - mostly whitespace around operators
2012-03-26 02:56:48 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* props */
Fix bug 30696, circular mesh objects had wrong orientation. Behavior now matches 2.62, circle, cone, and cylinder get first vertex at 0 degrees. Also fixed range for vertex property of add-cone and add-cylinder operators, changed minumum from two to three.
2012-03-27 10:28:06 +00:00
RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500);
sync some changes with trunk and rename bmeshutils.c
2012-02-19 17:11:40 +00:00
prop = RNA_def_float(ot->srna, "radius1", 1.0f, 0.0, FLT_MAX, "Radius 1", "", 0.001, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);
prop = RNA_def_float(ot->srna, "radius2", 0.0f, 0.0, FLT_MAX, "Radius 2", "", 0.001, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);
fix [#30208] Bmesh Edit Mode: Add Primitive keeps old verts selected. cone depth was also incorrectly defaulting to 1.0
2012-02-16 19:33:46 +00:00
prop = RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
RNA_def_property_subtype(prop, PROP_DISTANCE);
=bmesh= Cut out some unwanted differences with trunk in preparation for merge. Also fixed some warnings, though many remain.
2011-05-07 02:48:14 +00:00
RNA_def_enum(ot->srna, "end_fill_type", fill_type_items, 1, "Base Fill Type", "");
sync some changes with trunk and rename bmeshutils.c
2012-02-19 17:11:40 +00:00
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
ED_object_add_generic_props(ot, true);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
static int add_primitive_grid_exec(bContext *C, wmOperator *op)
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
Object *obedit;
BMEditMesh *em;
fix invalid *= on an un-initialized value when adding primitives.
2012-03-28 22:11:19 +00:00
float loc[3], rot[3], mat[4][4], dia;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool enter_editmode;
bool was_editmode;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Grid"), &dia, mat, &was_editmode, loc, rot, layer);
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
em = BKE_editmesh_from_object(obedit);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
triangulate and beauty fill also needed changes to selection handling after recent changes.
2013-07-25 07:00:07 +00:00
if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,
"create_grid x_segments=%i y_segments=%i size=%f matrix=%m4",
RNA_int_get(op->ptr, "x_subdivisions"),
RNA_int_get(op->ptr, "y_subdivisions"),
RNA_float_get(op->ptr, "radius"), mat))
ported triangles to quads.
2010-02-18 10:09:52 +00:00
{
return OPERATOR_CANCELLED;
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
make_prim_finish(C, obedit, was_editmode, enter_editmode);
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
return OPERATOR_FINISHED;
}
void MESH_OT_primitive_grid_add(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Grid";
ot->description = "Construct a grid mesh";
ot->idname = "MESH_OT_primitive_grid_add";
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* api callbacks */
fix [#33442] Units adding meshes were scaling the user input values so the distance on the button didnt relate to the scale of the object added. Now use an invoke function that scales unset default values.
2012-12-09 10:48:18 +00:00
ot->invoke = WM_operator_view3d_distance_invoke;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = add_primitive_grid_exec;
ot->poll = ED_operator_scene_editable;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* flags */
style cleanup: editors/mesh - mostly whitespace around operators
2012-03-26 02:56:48 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* props */
sync some changes with trunk and rename bmeshutils.c
2012-02-19 17:11:40 +00:00
RNA_def_int(ot->srna, "x_subdivisions", 10, 3, INT_MAX, "X Subdivisions", "", 3, 1000);
RNA_def_int(ot->srna, "y_subdivisions", 10, 3, INT_MAX, "Y Subdivisions", "", 3, 1000);
move make_prim_radius_prop into a generic function.
2013-09-16 00:18:09 +00:00
ED_object_add_unit_props(ot);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
ED_object_add_generic_props(ot, true);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool enter_editmode;
bool is_view_aligned;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool was_editmode;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, &is_view_aligned);
if (!is_view_aligned)
code cleanup: double promotion & some style cleanup
2012-05-03 21:35:04 +00:00
rot[0] += (float)M_PI / 2.0f;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Suzanne"), &dia, mat, &was_editmode, loc, rot, layer);
fix [#34851] "UnitSettings.scale_length" not beeing calculated the same way for all objects
2013-05-28 23:07:16 +00:00
dia = RNA_float_get(op->ptr, "radius");
Fix #32219: Inconsistent influence of Units Scale on new objects Made it so meshes, curves, surfaces and metaballs are scaling to a grid cell size, which makes them behave consistently now. There're still issues to be resolved still: - Lattice is not scaled to grid cell size yet, it uses slightly different add function which makes scaling a bit tricky and hacky. Would prefer to do a bit bigger refactor here, so it's a TODO for now. - Cameras, speakers and other helpers are not scaling. They don't have data on which scale could be applied and perhaps it should be some kind of draw scale. Also would consider it's a TODO for now.
2012-10-19 12:53:03 +00:00
mat[0][0] *= dia;
mat[1][1] *= dia;
mat[2][2] *= dia;
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
em = BKE_editmesh_from_object(obedit);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
triangulate and beauty fill also needed changes to selection handling after recent changes.
2013-07-25 07:00:07 +00:00
if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,
"create_monkey matrix=%m4", mat))
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
return OPERATOR_CANCELLED;
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
make_prim_finish(C, obedit, was_editmode, enter_editmode);
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
return OPERATOR_FINISHED;
}
void MESH_OT_primitive_monkey_add(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Monkey";
ot->description = "Construct a Suzanne mesh";
ot->idname = "MESH_OT_primitive_monkey_add";
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* api callbacks */
fix [#34851] "UnitSettings.scale_length" not beeing calculated the same way for all objects
2013-05-28 23:07:16 +00:00
ot->invoke = WM_operator_view3d_distance_invoke;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = add_primitive_monkey_exec;
ot->poll = ED_operator_scene_editable;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* flags */
move make_prim_radius_prop into a generic function.
2013-09-16 00:18:09 +00:00
ED_object_add_unit_props(ot);
style cleanup: editors/mesh - mostly whitespace around operators
2012-03-26 02:56:48 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
ED_object_add_generic_props(ot, true);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
{
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool enter_editmode;
bool was_editmode;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Sphere"), &dia, mat, &was_editmode, loc, rot, layer);
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
em = BKE_editmesh_from_object(obedit);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
triangulate and beauty fill also needed changes to selection handling after recent changes.
2013-07-25 07:00:07 +00:00
if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,
"create_uvsphere u_segments=%i v_segments=%i diameter=%f matrix=%m4",
RNA_int_get(op->ptr, "segments"), RNA_int_get(op->ptr, "ring_count"),
RNA_float_get(op->ptr, "size"), mat))
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
{
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
return OPERATOR_CANCELLED;
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
make_prim_finish(C, obedit, was_editmode, enter_editmode);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
2012-10-21 05:46:41 +00:00
return OPERATOR_FINISHED;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot)
{
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
PropertyRNA *prop;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add UV Sphere";
ot->description = "Construct a UV sphere mesh";
ot->idname = "MESH_OT_primitive_uv_sphere_add";
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* api callbacks */
fix [#33442] Units adding meshes were scaling the user input values so the distance on the button didnt relate to the scale of the object added. Now use an invoke function that scales unset default values.
2012-12-09 10:48:18 +00:00
ot->invoke = WM_operator_view3d_distance_invoke;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = add_primitive_uvsphere_exec;
ot->poll = ED_operator_scene_editable;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* flags */
style cleanup: editors/mesh - mostly whitespace around operators
2012-03-26 02:56:48 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* props */
sync some changes with trunk and rename bmeshutils.c
2012-02-19 17:11:40 +00:00
RNA_def_int(ot->srna, "segments", 32, 3, INT_MAX, "Segments", "", 3, 500);
RNA_def_int(ot->srna, "ring_count", 16, 3, INT_MAX, "Rings", "", 3, 500);
prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, 100.00);
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
RNA_def_property_subtype(prop, PROP_DISTANCE);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
ED_object_add_generic_props(ot, true);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool enter_editmode;
bool was_editmode;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Icosphere"), &dia, mat, &was_editmode, loc, rot, layer);
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
em = BKE_editmesh_from_object(obedit);
ported triangles to quads.
2010-02-18 10:09:52 +00:00
style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions
2012-03-27 04:46:52 +00:00
if (!EDBM_op_call_and_selectf(
triangulate and beauty fill also needed changes to selection handling after recent changes.
2013-07-25 07:00:07 +00:00
em, op, "verts.out", false,
bmesh operator naming - use clearer names for args eg: (mat -> matrix, use_singleedge -> use_single_edge) also remove duplicate docs for operator arg formatting.
2012-11-28 00:16:06 +00:00
"create_icosphere subdivisions=%i diameter=%f matrix=%m4",
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
RNA_int_get(op->ptr, "subdivisions"),
fix [#33442] Units adding meshes were scaling the user input values so the distance on the button didnt relate to the scale of the object added. Now use an invoke function that scales unset default values.
2012-12-09 10:48:18 +00:00
RNA_float_get(op->ptr, "size"), mat))
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious. also corrected some error reports.
2012-02-20 01:52:35 +00:00
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
return OPERATOR_CANCELLED;
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
make_prim_finish(C, obedit, was_editmode, enter_editmode);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
return OPERATOR_FINISHED;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot)
{
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
PropertyRNA *prop;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Ico Sphere";
ot->description = "Construct an Icosphere mesh";
ot->idname = "MESH_OT_primitive_ico_sphere_add";
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* api callbacks */
fix [#33442] Units adding meshes were scaling the user input values so the distance on the button didnt relate to the scale of the object added. Now use an invoke function that scales unset default values.
2012-12-09 10:48:18 +00:00
ot->invoke = WM_operator_view3d_distance_invoke;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = add_primitive_icosphere_exec;
ot->poll = ED_operator_scene_editable;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* flags */
style cleanup: editors/mesh - mostly whitespace around operators
2012-03-26 02:56:48 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* props */
sync some changes with trunk and rename bmeshutils.c
2012-02-19 17:11:40 +00:00
RNA_def_int(ot->srna, "subdivisions", 2, 1, INT_MAX, "Subdivisions", "", 1, 8);
prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, "Size", "", 0.001f, 100.00);
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
RNA_def_property_subtype(prop, PROP_DISTANCE);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
ED_object_add_generic_props(ot, true);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
Copy Permalink