2010-04-11 22:12:30 +00:00
|
|
|
/*
|
2011-10-23 17:52:20 +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,
|
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2005 by the Blender Foundation.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Contributor(s): Daniel Dunbar
|
|
|
|
* Ton Roosendaal,
|
|
|
|
* Ben Batt,
|
|
|
|
* Brecht Van Lommel,
|
|
|
|
* Campbell Barton
|
|
|
|
*
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
*
|
|
|
|
*/
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2011-02-25 13:57:17 +00:00
|
|
|
/** \file blender/modifiers/intern/MOD_screw.c
|
|
|
|
* \ingroup modifiers
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2010-04-12 22:33:43 +00:00
|
|
|
/* Screw modifier: revolves the edges about an axis */
|
2013-11-21 10:35:48 +11:00
|
|
|
#include <limits.h>
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2010-04-12 00:36:50 +00:00
|
|
|
#include "DNA_meshdata_types.h"
|
2010-08-04 04:01:27 +00:00
|
|
|
#include "DNA_object_types.h"
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2010-04-12 22:33:43 +00:00
|
|
|
#include "BLI_math.h"
|
2013-11-26 21:22:56 +11:00
|
|
|
#include "BLI_alloca.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "BLI_utildefines.h"
|
2010-04-12 22:33:43 +00:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
#include "BKE_cdderivedmesh.h"
|
2015-10-08 14:21:11 +02:00
|
|
|
#include "BKE_library_query.h"
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
#include "depsgraph_private.h"
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 15:05:57 +05:00
|
|
|
#include "DEG_depsgraph_build.h"
|
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
#include "MOD_modifiertypes.h"
|
2010-04-12 01:09:59 +00:00
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
2013-11-21 10:35:48 +11:00
|
|
|
#include "BLI_strict_flags.h"
|
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* used for gathering edge connectivity */
|
|
|
|
typedef struct ScrewVertConnect {
|
|
|
|
float dist; /* distance from the center axis */
|
2018-09-03 16:49:08 +02:00
|
|
|
float co[3]; /* location relative to the transformed axis */
|
2010-04-11 22:12:30 +00:00
|
|
|
float no[3]; /* calc normal of the vertex */
|
2013-11-21 10:35:48 +11:00
|
|
|
unsigned int v[2]; /* 2 verts on either side of this one */
|
2010-04-11 22:12:30 +00:00
|
|
|
MEdge *e[2]; /* edges on either side, a bit of a waste since each edge ref's 2 edges */
|
|
|
|
char flag;
|
|
|
|
} ScrewVertConnect;
|
|
|
|
|
|
|
|
typedef struct ScrewVertIter {
|
2012-05-06 13:38:33 +00:00
|
|
|
ScrewVertConnect *v_array;
|
|
|
|
ScrewVertConnect *v_poin;
|
2013-11-21 10:35:48 +11:00
|
|
|
unsigned int v, v_other;
|
2010-04-11 22:12:30 +00:00
|
|
|
MEdge *e;
|
|
|
|
} ScrewVertIter;
|
|
|
|
|
2013-11-21 10:35:48 +11:00
|
|
|
#define SV_UNUSED (UINT_MAX)
|
|
|
|
#define SV_INVALID ((UINT_MAX) - 1)
|
2016-06-01 00:19:01 +10:00
|
|
|
#define SV_IS_VALID(v) ((v) < SV_INVALID)
|
2010-08-05 23:40:21 +00:00
|
|
|
|
2013-11-21 10:35:48 +11:00
|
|
|
static void screwvert_iter_init(ScrewVertIter *iter, ScrewVertConnect *array, unsigned int v_init, unsigned int dir)
|
2010-08-05 23:40:21 +00:00
|
|
|
{
|
|
|
|
iter->v_array = array;
|
|
|
|
iter->v = v_init;
|
|
|
|
|
2013-11-21 10:35:48 +11:00
|
|
|
if (SV_IS_VALID(v_init)) {
|
2010-08-05 23:40:21 +00:00
|
|
|
iter->v_poin = &array[v_init];
|
|
|
|
iter->v_other = iter->v_poin->v[dir];
|
|
|
|
iter->e = iter->v_poin->e[!dir];
|
|
|
|
}
|
|
|
|
else {
|
2012-05-06 13:38:33 +00:00
|
|
|
iter->v_poin = NULL;
|
|
|
|
iter->e = NULL;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2018-06-17 17:04:27 +02:00
|
|
|
}
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
|
2010-08-05 23:40:21 +00:00
|
|
|
static void screwvert_iter_step(ScrewVertIter *iter)
|
|
|
|
{
|
|
|
|
if (iter->v_poin->v[0] == iter->v_other) {
|
2012-05-06 13:38:33 +00:00
|
|
|
iter->v_other = iter->v;
|
|
|
|
iter->v = iter->v_poin->v[1];
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2010-08-05 23:40:21 +00:00
|
|
|
else if (iter->v_poin->v[1] == iter->v_other) {
|
2012-05-06 13:38:33 +00:00
|
|
|
iter->v_other = iter->v;
|
|
|
|
iter->v = iter->v_poin->v[0];
|
2010-08-05 23:40:21 +00:00
|
|
|
}
|
2013-11-21 10:35:48 +11:00
|
|
|
if (SV_IS_VALID(iter->v)) {
|
2012-05-06 13:38:33 +00:00
|
|
|
iter->v_poin = &iter->v_array[iter->v];
|
|
|
|
iter->e = iter->v_poin->e[(iter->v_poin->e[0] == iter->e)];
|
2010-08-05 23:40:21 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-06 13:38:33 +00:00
|
|
|
iter->e = NULL;
|
|
|
|
iter->v_poin = NULL;
|
2010-08-05 23:40:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-07 00:10:13 +10:00
|
|
|
static DerivedMesh *dm_remove_doubles_on_axis(
|
|
|
|
DerivedMesh *result, MVert *mvert_new, const uint totvert, const uint step_tot,
|
|
|
|
const float axis_vec[3], const float axis_offset[3], const float merge_threshold)
|
|
|
|
{
|
|
|
|
const float merge_threshold_sq = SQUARE(merge_threshold);
|
|
|
|
const bool use_offset = axis_offset != NULL;
|
|
|
|
uint tot_doubles = 0;
|
|
|
|
for (uint i = 0; i < totvert; i += 1) {
|
|
|
|
float axis_co[3];
|
|
|
|
if (use_offset) {
|
|
|
|
float offset_co[3];
|
|
|
|
sub_v3_v3v3(offset_co, mvert_new[i].co, axis_offset);
|
|
|
|
project_v3_v3v3_normalized(axis_co, offset_co, axis_vec);
|
|
|
|
add_v3_v3(axis_co, axis_offset);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
project_v3_v3v3_normalized(axis_co, mvert_new[i].co, axis_vec);
|
|
|
|
}
|
|
|
|
const float dist_sq = len_squared_v3v3(axis_co, mvert_new[i].co);
|
|
|
|
if (dist_sq <= merge_threshold_sq) {
|
|
|
|
mvert_new[i].flag |= ME_VERT_TMP_TAG;
|
|
|
|
tot_doubles += 1;
|
|
|
|
copy_v3_v3(mvert_new[i].co, axis_co);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tot_doubles != 0) {
|
|
|
|
uint tot = totvert * step_tot;
|
2018-01-14 22:14:20 +01:00
|
|
|
int *full_doubles_map = MEM_malloc_arrayN(tot, sizeof(int), __func__);
|
2017-09-07 00:10:13 +10:00
|
|
|
copy_vn_i(full_doubles_map, (int)tot, -1);
|
|
|
|
|
|
|
|
uint tot_doubles_left = tot_doubles;
|
|
|
|
for (uint i = 0; i < totvert; i += 1) {
|
|
|
|
if (mvert_new[i].flag & ME_VERT_TMP_TAG) {
|
|
|
|
int *doubles_map = &full_doubles_map[totvert + i] ;
|
|
|
|
for (uint step = 1; step < step_tot; step += 1) {
|
|
|
|
*doubles_map = (int)i;
|
|
|
|
doubles_map += totvert;
|
|
|
|
}
|
|
|
|
tot_doubles_left -= 1;
|
|
|
|
if (tot_doubles_left == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
result = CDDM_merge_verts(result, full_doubles_map, (int)(tot_doubles * (step_tot - 1)), CDDM_MERGE_VERTS_DUMP_IF_MAPPED);
|
|
|
|
MEM_freeN(full_doubles_map);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
2010-08-05 23:40:21 +00:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
static void initData(ModifierData *md)
|
|
|
|
{
|
2012-05-06 13:38:33 +00:00
|
|
|
ScrewModifierData *ltmd = (ScrewModifierData *) md;
|
|
|
|
ltmd->ob_axis = NULL;
|
2013-11-21 10:35:48 +11:00
|
|
|
ltmd->angle = (float)(M_PI * 2.0);
|
2012-05-06 13:38:33 +00:00
|
|
|
ltmd->axis = 2;
|
2012-05-18 10:37:49 +00:00
|
|
|
ltmd->flag = MOD_SCREW_SMOOTH_SHADING;
|
2012-05-06 13:38:33 +00:00
|
|
|
ltmd->steps = 16;
|
|
|
|
ltmd->render_steps = 16;
|
|
|
|
ltmd->iter = 1;
|
2017-09-07 00:10:13 +10:00
|
|
|
ltmd->merge_dist = 0.01f;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
2018-05-12 08:04:56 +02:00
|
|
|
static DerivedMesh *applyModifier(
|
|
|
|
ModifierData *md, Object *ob,
|
|
|
|
DerivedMesh *derivedData,
|
|
|
|
ModifierApplyFlag flag)
|
2010-04-11 22:12:30 +00:00
|
|
|
{
|
2012-05-06 13:38:33 +00:00
|
|
|
DerivedMesh *dm = derivedData;
|
2010-04-11 22:12:30 +00:00
|
|
|
DerivedMesh *result;
|
2012-05-06 13:38:33 +00:00
|
|
|
ScrewModifierData *ltmd = (ScrewModifierData *) md;
|
2015-04-20 23:37:04 +10:00
|
|
|
const bool use_render_params = (flag & MOD_APPLY_RENDER) != 0;
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
int *origindex;
|
2012-05-06 13:38:33 +00:00
|
|
|
int mpoly_index = 0;
|
2013-11-21 10:35:48 +11:00
|
|
|
unsigned int step;
|
|
|
|
unsigned int i, j;
|
2011-12-27 03:54:23 +00:00
|
|
|
unsigned int i1, i2;
|
2015-04-20 23:37:04 +10:00
|
|
|
unsigned int step_tot = use_render_params ? ltmd->render_steps : ltmd->steps;
|
2015-06-04 15:28:26 +10:00
|
|
|
const bool do_flip = (ltmd->flag & MOD_SCREW_NORMAL_FLIP) != 0;
|
2013-11-26 21:07:24 +11:00
|
|
|
|
|
|
|
const int quad_ord[4] = {
|
|
|
|
do_flip ? 3 : 0,
|
|
|
|
do_flip ? 2 : 1,
|
|
|
|
do_flip ? 1 : 2,
|
|
|
|
do_flip ? 0 : 3,
|
|
|
|
};
|
|
|
|
const int quad_ord_ofs[4] = {
|
|
|
|
do_flip ? 2 : 0,
|
2015-06-04 15:51:49 +10:00
|
|
|
1,
|
2013-11-26 21:07:24 +11:00
|
|
|
do_flip ? 0 : 2,
|
2015-06-04 15:51:49 +10:00
|
|
|
3,
|
2013-11-26 21:07:24 +11:00
|
|
|
};
|
|
|
|
|
2013-11-21 10:35:48 +11:00
|
|
|
unsigned int maxVerts = 0, maxEdges = 0, maxPolys = 0;
|
|
|
|
const unsigned int totvert = (unsigned int)dm->getNumVerts(dm);
|
|
|
|
const unsigned int totedge = (unsigned int)dm->getNumEdges(dm);
|
|
|
|
const unsigned int totpoly = (unsigned int)dm->getNumPolys(dm);
|
2013-11-26 21:22:56 +11:00
|
|
|
|
|
|
|
unsigned int *edge_poly_map = NULL; /* orig edge to orig poly */
|
|
|
|
unsigned int *vert_loop_map = NULL; /* orig vert to orig loop */
|
|
|
|
|
|
|
|
/* UV Coords */
|
|
|
|
const unsigned int mloopuv_layers_tot = (unsigned int)CustomData_number_of_layers(&dm->loopData, CD_MLOOPUV);
|
|
|
|
MLoopUV **mloopuv_layers = BLI_array_alloca(mloopuv_layers, mloopuv_layers_tot);
|
|
|
|
float uv_u_scale;
|
|
|
|
float uv_v_minmax[2] = {FLT_MAX, -FLT_MAX};
|
2015-09-04 14:24:22 +10:00
|
|
|
float uv_v_range_inv;
|
2013-11-26 21:22:56 +11:00
|
|
|
float uv_axis_plane[4];
|
2013-11-21 10:35:48 +11:00
|
|
|
|
|
|
|
char axis_char = 'X';
|
|
|
|
bool close;
|
2012-05-06 13:38:33 +00:00
|
|
|
float angle = ltmd->angle;
|
|
|
|
float screw_ofs = ltmd->screw_ofs;
|
|
|
|
float axis_vec[3] = {0.0f, 0.0f, 0.0f};
|
2018-06-17 17:04:27 +02:00
|
|
|
float tmp_vec1[3], tmp_vec2[3];
|
2010-04-11 22:12:30 +00:00
|
|
|
float mat3[3][3];
|
|
|
|
float mtx_tx[4][4]; /* transform the coords by an object relative to this objects transformation */
|
|
|
|
float mtx_tx_inv[4][4]; /* inverted */
|
|
|
|
float mtx_tmp_a[4][4];
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2013-11-21 10:35:48 +11:00
|
|
|
unsigned int vc_tot_linked = 0;
|
2010-04-11 22:12:30 +00:00
|
|
|
short other_axis_1, other_axis_2;
|
2014-04-27 00:24:11 +10:00
|
|
|
const float *tmpf1, *tmpf2;
|
2012-01-04 20:11:08 +00:00
|
|
|
|
2013-11-21 10:35:48 +11:00
|
|
|
unsigned int edge_offset;
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2015-09-04 14:24:22 +10:00
|
|
|
MPoly *mpoly_orig, *mpoly_new, *mp_new;
|
2013-11-19 13:11:31 +11:00
|
|
|
MLoop *mloop_orig, *mloop_new, *ml_new;
|
2010-04-11 22:12:30 +00:00
|
|
|
MEdge *medge_orig, *med_orig, *med_new, *med_new_firstloop, *medge_new;
|
|
|
|
MVert *mvert_new, *mvert_orig, *mv_orig, *mv_new, *mv_new_base;
|
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
ScrewVertConnect *vc, *vc_tmp, *vert_connect = NULL;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-05-18 10:37:49 +00:00
|
|
|
const char mpoly_flag = (ltmd->flag & MOD_SCREW_SMOOTH_SHADING) ? ME_SMOOTH : 0;
|
|
|
|
|
2012-03-18 07:38:51 +00:00
|
|
|
/* don't do anything? */
|
2010-04-11 22:12:30 +00:00
|
|
|
if (!totvert)
|
2010-07-19 04:44:37 +00:00
|
|
|
return CDDM_from_template(dm, 0, 0, 0, 0, 0);
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (ltmd->axis) {
|
2012-05-06 13:38:33 +00:00
|
|
|
case 0:
|
|
|
|
other_axis_1 = 1;
|
|
|
|
other_axis_2 = 2;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
other_axis_1 = 0;
|
|
|
|
other_axis_2 = 2;
|
|
|
|
break;
|
|
|
|
default: /* 2, use default to quiet warnings */
|
|
|
|
other_axis_1 = 0;
|
|
|
|
other_axis_2 = 1;
|
|
|
|
break;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
axis_vec[ltmd->axis] = 1.0f;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
if (ltmd->ob_axis) {
|
|
|
|
/* calc the matrix relative to the axis object */
|
|
|
|
invert_m4_m4(mtx_tmp_a, ob->obmat);
|
|
|
|
copy_m4_m4(mtx_tx_inv, ltmd->ob_axis->obmat);
|
2013-05-26 18:36:25 +00:00
|
|
|
mul_m4_m4m4(mtx_tx, mtx_tmp_a, mtx_tx_inv);
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/* calc the axis vec */
|
2010-08-06 00:13:44 +00:00
|
|
|
mul_mat3_m4_v3(mtx_tx, axis_vec); /* only rotation component */
|
2010-04-11 22:12:30 +00:00
|
|
|
normalize_v3(axis_vec);
|
|
|
|
|
|
|
|
/* screw */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (ltmd->flag & MOD_SCREW_OBJECT_OFFSET) {
|
2010-04-11 22:12:30 +00:00
|
|
|
/* find the offset along this axis relative to this objects matrix */
|
|
|
|
float totlen = len_v3(mtx_tx[3]);
|
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (totlen != 0.0f) {
|
2012-05-06 13:38:33 +00:00
|
|
|
float zero[3] = {0.0f, 0.0f, 0.0f};
|
2012-10-21 05:46:41 +00:00
|
|
|
float cp[3];
|
2012-05-06 13:38:33 +00:00
|
|
|
screw_ofs = closest_to_line_v3(cp, mtx_tx[3], zero, axis_vec);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-06 13:38:33 +00:00
|
|
|
screw_ofs = 0.0f;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* angle */
|
|
|
|
|
2018-09-03 16:49:08 +02:00
|
|
|
#if 0 /* can't include this, not predictable enough, though quite fun. */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (ltmd->flag & MOD_SCREW_OBJECT_ANGLE) {
|
2010-08-06 00:13:44 +00:00
|
|
|
float mtx3_tx[3][3];
|
|
|
|
copy_m3_m4(mtx3_tx, mtx_tx);
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
float vec[3] = {0, 1, 0};
|
2010-04-11 22:12:30 +00:00
|
|
|
float cross1[3];
|
|
|
|
float cross2[3];
|
|
|
|
cross_v3_v3v3(cross1, vec, axis_vec);
|
|
|
|
|
|
|
|
mul_v3_m3v3(cross2, mtx3_tx, cross1);
|
|
|
|
{
|
|
|
|
float c1[3];
|
|
|
|
float c2[3];
|
|
|
|
float axis_tmp[3];
|
|
|
|
|
|
|
|
cross_v3_v3v3(c1, cross2, axis_vec);
|
|
|
|
cross_v3_v3v3(c2, axis_vec, c1);
|
|
|
|
|
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
angle = angle_v3v3(cross1, c2);
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
cross_v3_v3v3(axis_tmp, cross1, c2);
|
|
|
|
normalize_v3(axis_tmp);
|
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (len_v3v3(axis_tmp, axis_vec) > 1.0f)
|
2012-05-06 13:38:33 +00:00
|
|
|
angle = -angle;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* exis char is used by i_rotate*/
|
2013-11-21 10:35:48 +11:00
|
|
|
axis_char = (char)(axis_char + ltmd->axis); /* 'X' + axis */
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/* useful to be able to use the axis vec in some cases still */
|
|
|
|
zero_v3(axis_vec);
|
2012-05-06 13:38:33 +00:00
|
|
|
axis_vec[ltmd->axis] = 1.0f;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* apply the multiplier */
|
2013-11-21 10:35:48 +11:00
|
|
|
angle *= (float)ltmd->iter;
|
|
|
|
screw_ofs *= (float)ltmd->iter;
|
2013-11-26 21:22:56 +11:00
|
|
|
uv_u_scale = 1.0f / (float)(step_tot);
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/* multiplying the steps is a bit tricky, this works best */
|
2010-08-05 23:40:21 +00:00
|
|
|
step_tot = ((step_tot + 1) * ltmd->iter) - (ltmd->iter - 1);
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/* will the screw be closed?
|
2013-01-08 01:48:14 +00:00
|
|
|
* Note! smaller then FLT_EPSILON * 100 gives problems with float precision so its never closed. */
|
2012-05-06 13:38:33 +00:00
|
|
|
if (fabsf(screw_ofs) <= (FLT_EPSILON * 100.0f) &&
|
|
|
|
fabsf(fabsf(angle) - ((float)M_PI * 2.0f)) <= (FLT_EPSILON * 100.0f))
|
|
|
|
{
|
|
|
|
close = 1;
|
2010-08-05 23:40:21 +00:00
|
|
|
step_tot--;
|
2012-05-06 13:38:33 +00:00
|
|
|
if (step_tot < 3) step_tot = 3;
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2012-06-23 23:22:19 +00:00
|
|
|
maxVerts = totvert * step_tot; /* -1 because we're joining back up */
|
|
|
|
maxEdges = (totvert * step_tot) + /* these are the edges between new verts */
|
|
|
|
(totedge * step_tot); /* -1 because vert edges join */
|
|
|
|
maxPolys = totedge * step_tot;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
screw_ofs = 0.0f;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-06 13:38:33 +00:00
|
|
|
close = 0;
|
|
|
|
if (step_tot < 3) step_tot = 3;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
maxVerts = totvert * step_tot; /* -1 because we're joining back up */
|
|
|
|
maxEdges = (totvert * (step_tot - 1)) + /* these are the edges between new verts */
|
|
|
|
(totedge * step_tot); /* -1 because vert edges join */
|
|
|
|
maxPolys = totedge * (step_tot - 1);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2013-11-26 21:22:56 +11:00
|
|
|
|
|
|
|
if ((ltmd->flag & MOD_SCREW_UV_STRETCH_U) == 0) {
|
|
|
|
uv_u_scale = (uv_u_scale / (float)ltmd->iter) * (angle / ((float)M_PI * 2.0f));
|
|
|
|
}
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2013-11-21 10:35:48 +11:00
|
|
|
result = CDDM_from_template(dm, (int)maxVerts, (int)maxEdges, 0, (int)maxPolys * 4, (int)maxPolys);
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* copy verts from mesh */
|
2012-05-06 13:38:33 +00:00
|
|
|
mvert_orig = dm->getVertArray(dm);
|
|
|
|
medge_orig = dm->getEdgeArray(dm);
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
mvert_new = result->getVertArray(result);
|
|
|
|
mpoly_new = result->getPolyArray(result);
|
|
|
|
mloop_new = result->getLoopArray(result);
|
|
|
|
medge_new = result->getEdgeArray(result);
|
2012-01-04 20:11:08 +00:00
|
|
|
|
|
|
|
if (!CustomData_has_layer(&result->polyData, CD_ORIGINDEX)) {
|
2013-11-21 10:35:48 +11:00
|
|
|
CustomData_add_layer(&result->polyData, CD_ORIGINDEX, CD_CALLOC, NULL, (int)maxPolys);
|
2012-01-04 20:11:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
origindex = CustomData_get_layer(&result->polyData, CD_ORIGINDEX);
|
2010-09-27 20:48:50 +00:00
|
|
|
|
2013-11-21 10:35:48 +11:00
|
|
|
DM_copy_vert_data(dm, result, 0, 0, (int)totvert); /* copy first otherwise this overwrites our own vertex normals */
|
2013-11-26 21:22:56 +11:00
|
|
|
|
|
|
|
if (mloopuv_layers_tot) {
|
|
|
|
float zero_co[3] = {0};
|
|
|
|
plane_from_point_normal_v3(uv_axis_plane, zero_co, axis_vec);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mloopuv_layers_tot) {
|
|
|
|
unsigned int uv_lay;
|
|
|
|
for (uv_lay = 0; uv_lay < mloopuv_layers_tot; uv_lay++) {
|
|
|
|
mloopuv_layers[uv_lay] = CustomData_get_layer_n(&result->loopData, CD_MLOOPUV, (int)uv_lay);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ltmd->flag & MOD_SCREW_UV_STRETCH_V) {
|
|
|
|
for (i = 0, mv_orig = mvert_orig; i < totvert; i++, mv_orig++) {
|
2014-08-13 14:34:58 +10:00
|
|
|
const float v = dist_signed_squared_to_plane_v3(mv_orig->co, uv_axis_plane);
|
2013-11-26 21:22:56 +11:00
|
|
|
uv_v_minmax[0] = min_ff(v, uv_v_minmax[0]);
|
|
|
|
uv_v_minmax[1] = max_ff(v, uv_v_minmax[1]);
|
|
|
|
}
|
|
|
|
uv_v_minmax[0] = sqrtf_signed(uv_v_minmax[0]);
|
|
|
|
uv_v_minmax[1] = sqrtf_signed(uv_v_minmax[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
uv_v_range_inv = uv_v_minmax[1] - uv_v_minmax[0];
|
|
|
|
uv_v_range_inv = uv_v_range_inv ? 1.0f / uv_v_range_inv : 0.0f;
|
|
|
|
}
|
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* Set the locations of the first set of verts */
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
mv_new = mvert_new;
|
|
|
|
mv_orig = mvert_orig;
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* Copy the first set of edges */
|
2012-05-06 13:38:33 +00:00
|
|
|
med_orig = medge_orig;
|
|
|
|
med_new = medge_new;
|
|
|
|
for (i = 0; i < totedge; i++, med_orig++, med_new++) {
|
|
|
|
med_new->v1 = med_orig->v1;
|
|
|
|
med_new->v2 = med_orig->v2;
|
|
|
|
med_new->crease = med_orig->crease;
|
|
|
|
med_new->flag = med_orig->flag & ~ME_LOOSEEDGE;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2013-11-19 13:11:31 +11:00
|
|
|
/* build polygon -> edge map */
|
|
|
|
if (totpoly) {
|
|
|
|
MPoly *mp_orig;
|
|
|
|
|
|
|
|
mpoly_orig = dm->getPolyArray(dm);
|
|
|
|
mloop_orig = dm->getLoopArray(dm);
|
2018-01-14 22:14:20 +01:00
|
|
|
edge_poly_map = MEM_malloc_arrayN(totedge, sizeof(*edge_poly_map), __func__);
|
2013-11-21 10:35:48 +11:00
|
|
|
memset(edge_poly_map, 0xff, sizeof(*edge_poly_map) * totedge);
|
2013-11-19 13:11:31 +11:00
|
|
|
|
2018-01-14 22:14:20 +01:00
|
|
|
vert_loop_map = MEM_malloc_arrayN(totvert, sizeof(*vert_loop_map), __func__);
|
2013-11-26 21:22:56 +11:00
|
|
|
memset(vert_loop_map, 0xff, sizeof(*vert_loop_map) * totvert);
|
|
|
|
|
2013-11-19 13:11:31 +11:00
|
|
|
for (i = 0, mp_orig = mpoly_orig; i < totpoly; i++, mp_orig++) {
|
2013-11-26 21:22:56 +11:00
|
|
|
unsigned int loopstart = (unsigned int)mp_orig->loopstart;
|
|
|
|
unsigned int loopend = loopstart + (unsigned int)mp_orig->totloop;
|
|
|
|
|
|
|
|
MLoop *ml_orig = &mloop_orig[loopstart];
|
|
|
|
unsigned int k;
|
|
|
|
for (k = loopstart; k < loopend; k++, ml_orig++) {
|
2013-11-19 13:11:31 +11:00
|
|
|
edge_poly_map[ml_orig->e] = i;
|
2013-11-26 21:22:56 +11:00
|
|
|
vert_loop_map[ml_orig->v] = k;
|
2013-11-19 13:11:31 +11:00
|
|
|
|
|
|
|
/* also order edges based on faces */
|
|
|
|
if (medge_new[ml_orig->e].v1 != ml_orig->v) {
|
|
|
|
SWAP(unsigned int, medge_new[ml_orig->e].v1, medge_new[ml_orig->e].v2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (ltmd->flag & MOD_SCREW_NORMAL_CALC) {
|
2010-04-11 22:12:30 +00:00
|
|
|
/*
|
|
|
|
* Normal Calculation (for face flipping)
|
|
|
|
* Sort edge verts for correct face flipping
|
|
|
|
* NOT REALLY NEEDED but face flipping is nice.
|
|
|
|
*
|
|
|
|
* */
|
|
|
|
|
|
|
|
|
|
|
|
/* Notice!
|
|
|
|
*
|
|
|
|
* Since we are only ordering the edges here it can avoid mallocing the
|
2012-03-04 04:35:12 +00:00
|
|
|
* extra space by abusing the vert array before its filled with new verts.
|
2010-04-11 22:12:30 +00:00
|
|
|
* The new array for vert_connect must be at least sizeof(ScrewVertConnect) * totvert
|
|
|
|
* and the size of our resulting meshes array is sizeof(MVert) * totvert * 3
|
|
|
|
* so its safe to use the second 2 thrids of MVert the array for vert_connect,
|
2013-04-07 15:09:06 +00:00
|
|
|
* just make sure ScrewVertConnect struct is no more than twice as big as MVert,
|
2010-04-11 22:12:30 +00:00
|
|
|
* at the moment there is no chance of that being a problem,
|
|
|
|
* unless MVert becomes half its current size.
|
|
|
|
*
|
|
|
|
* once the edges are ordered, vert_connect is not needed and it can be used for verts
|
|
|
|
*
|
|
|
|
* This makes the modifier faster with one less alloc.
|
|
|
|
*/
|
|
|
|
|
2018-01-14 22:14:20 +01:00
|
|
|
vert_connect = MEM_malloc_arrayN(totvert, sizeof(ScrewVertConnect), "ScrewVertConnect");
|
2012-10-26 04:14:10 +00:00
|
|
|
//vert_connect = (ScrewVertConnect *) &medge_new[totvert]; /* skip the first slice of verts */
|
2012-05-06 13:38:33 +00:00
|
|
|
vc = vert_connect;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/* Copy Vert Locations */
|
|
|
|
/* - We can do this in a later loop - only do here if no normal calc */
|
|
|
|
if (!totedge) {
|
2012-05-06 13:38:33 +00:00
|
|
|
for (i = 0; i < totvert; i++, mv_orig++, mv_new++) {
|
2010-04-11 22:12:30 +00:00
|
|
|
copy_v3_v3(mv_new->co, mv_orig->co);
|
2011-10-17 06:39:13 +00:00
|
|
|
normalize_v3_v3(vc->no, mv_new->co); /* no edges- this is really a dummy normal */
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/*printf("\n\n\n\n\nStarting Modifier\n");*/
|
|
|
|
/* set edge users */
|
2012-05-06 13:38:33 +00:00
|
|
|
med_new = medge_new;
|
|
|
|
mv_new = mvert_new;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
if (ltmd->ob_axis) {
|
|
|
|
/*mtx_tx is initialized early on */
|
2012-05-06 13:38:33 +00:00
|
|
|
for (i = 0; i < totvert; i++, mv_new++, mv_orig++, vc++) {
|
|
|
|
vc->co[0] = mv_new->co[0] = mv_orig->co[0];
|
|
|
|
vc->co[1] = mv_new->co[1] = mv_orig->co[1];
|
|
|
|
vc->co[2] = mv_new->co[2] = mv_orig->co[2];
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
vc->flag = 0;
|
|
|
|
vc->e[0] = vc->e[1] = NULL;
|
2013-11-21 10:35:48 +11:00
|
|
|
vc->v[0] = vc->v[1] = SV_UNUSED;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
mul_m4_v3(mtx_tx, vc->co);
|
2012-03-18 07:38:51 +00:00
|
|
|
/* length in 2d, don't sqrt because this is only for comparison */
|
2012-09-17 22:22:06 +00:00
|
|
|
vc->dist = vc->co[other_axis_1] * vc->co[other_axis_1] +
|
2012-05-06 13:38:33 +00:00
|
|
|
vc->co[other_axis_2] * vc->co[other_axis_2];
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/* printf("location %f %f %f -- %f\n", vc->co[0], vc->co[1], vc->co[2], vc->dist);*/
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-05-06 13:38:33 +00:00
|
|
|
for (i = 0; i < totvert; i++, mv_new++, mv_orig++, vc++) {
|
|
|
|
vc->co[0] = mv_new->co[0] = mv_orig->co[0];
|
|
|
|
vc->co[1] = mv_new->co[1] = mv_orig->co[1];
|
|
|
|
vc->co[2] = mv_new->co[2] = mv_orig->co[2];
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
vc->flag = 0;
|
|
|
|
vc->e[0] = vc->e[1] = NULL;
|
2013-11-21 10:35:48 +11:00
|
|
|
vc->v[0] = vc->v[1] = SV_UNUSED;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-03-18 07:38:51 +00:00
|
|
|
/* length in 2d, don't sqrt because this is only for comparison */
|
2012-09-17 22:22:06 +00:00
|
|
|
vc->dist = vc->co[other_axis_1] * vc->co[other_axis_1] +
|
2012-05-06 13:38:33 +00:00
|
|
|
vc->co[other_axis_2] * vc->co[other_axis_2];
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/* printf("location %f %f %f -- %f\n", vc->co[0], vc->co[1], vc->co[2], vc->dist);*/
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* this loop builds connectivity info for verts */
|
2012-05-06 13:38:33 +00:00
|
|
|
for (i = 0; i < totedge; i++, med_new++) {
|
|
|
|
vc = &vert_connect[med_new->v1];
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2013-11-21 10:35:48 +11:00
|
|
|
if (vc->v[0] == SV_UNUSED) { /* unused */
|
2012-05-06 13:38:33 +00:00
|
|
|
vc->v[0] = med_new->v2;
|
|
|
|
vc->e[0] = med_new;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2013-11-21 10:35:48 +11:00
|
|
|
else if (vc->v[1] == SV_UNUSED) {
|
2012-05-06 13:38:33 +00:00
|
|
|
vc->v[1] = med_new->v2;
|
|
|
|
vc->e[1] = med_new;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
else {
|
2013-11-21 10:35:48 +11:00
|
|
|
vc->v[0] = vc->v[1] = SV_INVALID; /* error value - don't use, 3 edges on vert */
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
vc = &vert_connect[med_new->v2];
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/* same as above but swap v1/2 */
|
2013-11-21 10:35:48 +11:00
|
|
|
if (vc->v[0] == SV_UNUSED) { /* unused */
|
2012-05-06 13:38:33 +00:00
|
|
|
vc->v[0] = med_new->v1;
|
|
|
|
vc->e[0] = med_new;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2013-11-21 10:35:48 +11:00
|
|
|
else if (vc->v[1] == SV_UNUSED) {
|
2012-05-06 13:38:33 +00:00
|
|
|
vc->v[1] = med_new->v1;
|
|
|
|
vc->e[1] = med_new;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
else {
|
2013-11-21 10:35:48 +11:00
|
|
|
vc->v[0] = vc->v[1] = SV_INVALID; /* error value - don't use, 3 edges on vert */
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* find the first vert */
|
2012-05-06 13:38:33 +00:00
|
|
|
vc = vert_connect;
|
|
|
|
for (i = 0; i < totvert; i++, vc++) {
|
2010-04-11 22:12:30 +00:00
|
|
|
/* Now do search for connected verts, order all edges and flip them
|
|
|
|
* so resulting faces are flipped the right way */
|
2012-05-06 13:38:33 +00:00
|
|
|
vc_tot_linked = 0; /* count the number of linked verts for this loop */
|
2010-08-05 23:40:21 +00:00
|
|
|
if (vc->flag == 0) {
|
2013-11-21 10:35:48 +11:00
|
|
|
unsigned int v_best = SV_UNUSED, ed_loop_closed = 0; /* vert and vert new */
|
2011-02-13 03:21:27 +00:00
|
|
|
ScrewVertIter lt_iter;
|
2012-05-06 13:38:33 +00:00
|
|
|
float fl = -1.0f;
|
|
|
|
|
|
|
|
/* compiler complains if not initialized, but it should be initialized below */
|
2013-11-21 10:35:48 +11:00
|
|
|
bool ed_loop_flip = false;
|
2011-02-13 03:21:27 +00:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/*printf("Loop on connected vert: %i\n", i);*/
|
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
for (j = 0; j < 2; j++) {
|
2010-04-11 22:12:30 +00:00
|
|
|
/*printf("\tSide: %i\n", j);*/
|
2010-08-05 23:40:21 +00:00
|
|
|
screwvert_iter_init(<_iter, vert_connect, i, j);
|
|
|
|
if (j == 1) {
|
|
|
|
screwvert_iter_step(<_iter);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
while (lt_iter.v_poin) {
|
|
|
|
/*printf("\t\tVERT: %i\n", lt_iter.v);*/
|
|
|
|
if (lt_iter.v_poin->flag) {
|
|
|
|
/*printf("\t\t\tBreaking Found end\n");*/
|
2013-11-21 10:35:48 +11:00
|
|
|
//endpoints[0] = endpoints[1] = SV_UNUSED;
|
2012-05-06 13:38:33 +00:00
|
|
|
ed_loop_closed = 1; /* circle */
|
2010-04-11 22:12:30 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-05-06 13:38:33 +00:00
|
|
|
lt_iter.v_poin->flag = 1;
|
2010-04-11 22:12:30 +00:00
|
|
|
vc_tot_linked++;
|
|
|
|
/*printf("Testing 2 floats %f : %f\n", fl, lt_iter.v_poin->dist);*/
|
|
|
|
if (fl <= lt_iter.v_poin->dist) {
|
2012-05-06 13:38:33 +00:00
|
|
|
fl = lt_iter.v_poin->dist;
|
|
|
|
v_best = lt_iter.v;
|
2010-08-05 23:40:21 +00:00
|
|
|
/*printf("\t\t\tVERT BEST: %i\n", v_best);*/
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2010-08-05 23:40:21 +00:00
|
|
|
screwvert_iter_step(<_iter);
|
2010-04-11 22:12:30 +00:00
|
|
|
if (!lt_iter.v_poin) {
|
|
|
|
/*printf("\t\t\tFound End Also Num %i\n", j);*/
|
2012-10-22 08:15:51 +00:00
|
|
|
/*endpoints[j] = lt_iter.v_other;*/ /* other is still valid */
|
2010-04-11 22:12:30 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* now we have a collection of used edges. flip their edges the right way*/
|
2013-11-21 10:35:48 +11:00
|
|
|
/*if (v_best != SV_UNUSED) - */
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/*printf("Done Looking - vc_tot_linked: %i\n", vc_tot_linked);*/
|
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
if (vc_tot_linked > 1) {
|
2010-04-11 22:12:30 +00:00
|
|
|
float vf_1, vf_2, vf_best;
|
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
vc_tmp = &vert_connect[v_best];
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
tmpf1 = vert_connect[vc_tmp->v[0]].co;
|
|
|
|
tmpf2 = vert_connect[vc_tmp->v[1]].co;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* edge connects on each side! */
|
2013-11-21 10:35:48 +11:00
|
|
|
if (SV_IS_VALID(vc_tmp->v[0]) && SV_IS_VALID(vc_tmp->v[1])) {
|
2010-04-11 22:12:30 +00:00
|
|
|
/*printf("Verts on each side (%i %i)\n", vc_tmp->v[0], vc_tmp->v[1]);*/
|
|
|
|
/* find out which is higher */
|
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
vf_1 = tmpf1[ltmd->axis];
|
|
|
|
vf_2 = tmpf2[ltmd->axis];
|
|
|
|
vf_best = vc_tmp->co[ltmd->axis];
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
if (vf_1 < vf_best && vf_best < vf_2) {
|
2012-05-06 13:38:33 +00:00
|
|
|
ed_loop_flip = 0;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
else if (vf_1 > vf_best && vf_best > vf_2) {
|
2012-05-06 13:38:33 +00:00
|
|
|
ed_loop_flip = 1;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* not so simple to work out which edge is higher */
|
|
|
|
sub_v3_v3v3(tmp_vec1, tmpf1, vc_tmp->co);
|
2010-08-06 00:13:44 +00:00
|
|
|
sub_v3_v3v3(tmp_vec2, tmpf2, vc_tmp->co);
|
2010-04-11 22:12:30 +00:00
|
|
|
normalize_v3(tmp_vec1);
|
|
|
|
normalize_v3(tmp_vec2);
|
|
|
|
|
|
|
|
if (tmp_vec1[ltmd->axis] < tmp_vec2[ltmd->axis]) {
|
2012-05-06 13:38:33 +00:00
|
|
|
ed_loop_flip = 1;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-06 13:38:33 +00:00
|
|
|
ed_loop_flip = 0;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-11-21 10:35:48 +11:00
|
|
|
else if (SV_IS_VALID(vc_tmp->v[0])) { /*vertex only connected on 1 side */
|
2010-04-11 22:12:30 +00:00
|
|
|
/*printf("Verts on ONE side (%i %i)\n", vc_tmp->v[0], vc_tmp->v[1]);*/
|
|
|
|
if (tmpf1[ltmd->axis] < vc_tmp->co[ltmd->axis]) { /* best is above */
|
2012-05-06 13:38:33 +00:00
|
|
|
ed_loop_flip = 1;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2018-09-03 16:49:08 +02:00
|
|
|
else { /* best is below or even... in even case we can't know what to do. */
|
2012-05-06 13:38:33 +00:00
|
|
|
ed_loop_flip = 0;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
2012-03-09 18:28:30 +00:00
|
|
|
}
|
|
|
|
#if 0
|
|
|
|
else {
|
2010-04-11 22:12:30 +00:00
|
|
|
printf("No Connected ___\n");
|
2012-03-09 18:28:30 +00:00
|
|
|
}
|
|
|
|
#endif
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/*printf("flip direction %i\n", ed_loop_flip);*/
|
|
|
|
|
|
|
|
|
2010-08-05 23:40:21 +00:00
|
|
|
/* switch the flip option if set
|
|
|
|
* note: flip is now done at face level so copying vgroup slizes is easier */
|
2012-03-09 18:28:30 +00:00
|
|
|
#if 0
|
2010-08-05 23:40:21 +00:00
|
|
|
if (do_flip)
|
2012-05-06 13:38:33 +00:00
|
|
|
ed_loop_flip = !ed_loop_flip;
|
2012-03-09 18:28:30 +00:00
|
|
|
#endif
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
if (angle < 0.0f)
|
2012-05-06 13:38:33 +00:00
|
|
|
ed_loop_flip = !ed_loop_flip;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/* if its closed, we only need 1 loop */
|
2012-05-06 13:38:33 +00:00
|
|
|
for (j = ed_loop_closed; j < 2; j++) {
|
2010-04-11 22:12:30 +00:00
|
|
|
/*printf("Ordering Side J %i\n", j);*/
|
|
|
|
|
2010-08-05 23:40:21 +00:00
|
|
|
screwvert_iter_init(<_iter, vert_connect, v_best, j);
|
2010-04-11 22:12:30 +00:00
|
|
|
/*printf("\n\nStarting - Loop\n");*/
|
2012-05-06 13:38:33 +00:00
|
|
|
lt_iter.v_poin->flag = 1; /* so a non loop will traverse the other side */
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* If this is the vert off the best vert and
|
|
|
|
* the best vert has 2 edges connected too it
|
|
|
|
* then swap the flip direction */
|
2013-11-21 10:35:48 +11:00
|
|
|
if (j == 1 && SV_IS_VALID(vc_tmp->v[0]) && SV_IS_VALID(vc_tmp->v[1]))
|
2012-05-06 13:38:33 +00:00
|
|
|
ed_loop_flip = !ed_loop_flip;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
while (lt_iter.v_poin && lt_iter.v_poin->flag != 2) {
|
|
|
|
/*printf("\tOrdering Vert V %i\n", lt_iter.v);*/
|
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
lt_iter.v_poin->flag = 2;
|
2010-04-11 22:12:30 +00:00
|
|
|
if (lt_iter.e) {
|
|
|
|
if (lt_iter.v == lt_iter.e->v1) {
|
2010-08-05 23:40:21 +00:00
|
|
|
if (ed_loop_flip == 0) {
|
2010-04-11 22:12:30 +00:00
|
|
|
/*printf("\t\t\tFlipping 0\n");*/
|
2011-12-27 03:54:23 +00:00
|
|
|
SWAP(unsigned int, lt_iter.e->v1, lt_iter.e->v2);
|
2012-03-24 06:24:53 +00:00
|
|
|
}
|
|
|
|
/* else {
|
2012-05-06 13:38:33 +00:00
|
|
|
printf("\t\t\tFlipping Not 0\n");
|
|
|
|
}*/
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
else if (lt_iter.v == lt_iter.e->v2) {
|
2010-08-05 23:40:21 +00:00
|
|
|
if (ed_loop_flip == 1) {
|
2010-04-11 22:12:30 +00:00
|
|
|
/*printf("\t\t\tFlipping 1\n");*/
|
2011-12-27 03:54:23 +00:00
|
|
|
SWAP(unsigned int, lt_iter.e->v1, lt_iter.e->v2);
|
2012-03-24 06:24:53 +00:00
|
|
|
}
|
|
|
|
/* else {
|
2012-05-06 13:38:33 +00:00
|
|
|
printf("\t\t\tFlipping Not 1\n");
|
|
|
|
}*/
|
2012-03-24 06:24:53 +00:00
|
|
|
}
|
|
|
|
/* else {
|
2012-05-06 13:38:33 +00:00
|
|
|
printf("\t\tIncorrect edge topology");
|
|
|
|
}*/
|
2012-03-24 06:24:53 +00:00
|
|
|
}
|
|
|
|
/* else {
|
2012-05-06 13:38:33 +00:00
|
|
|
printf("\t\tNo Edge at this point\n");
|
|
|
|
}*/
|
2010-08-05 23:40:21 +00:00
|
|
|
screwvert_iter_step(<_iter);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* *VERTEX NORMALS*
|
|
|
|
* we know the surrounding edges are ordered correctly now
|
|
|
|
* so its safe to create vertex normals.
|
|
|
|
*
|
2012-03-01 12:20:18 +00:00
|
|
|
* calculate vertex normals that can be propagated on lathing
|
2010-04-11 22:12:30 +00:00
|
|
|
* use edge connectivity work this out */
|
2013-11-21 10:35:48 +11:00
|
|
|
if (SV_IS_VALID(vc->v[0])) {
|
|
|
|
if (SV_IS_VALID(vc->v[1])) {
|
2010-04-11 22:12:30 +00:00
|
|
|
/* 2 edges connedted */
|
|
|
|
/* make 2 connecting vert locations relative to the middle vert */
|
|
|
|
sub_v3_v3v3(tmp_vec1, mvert_new[vc->v[0]].co, mvert_new[i].co);
|
|
|
|
sub_v3_v3v3(tmp_vec2, mvert_new[vc->v[1]].co, mvert_new[i].co);
|
|
|
|
/* normalize so both edges have the same influence, no matter their length */
|
|
|
|
normalize_v3(tmp_vec1);
|
|
|
|
normalize_v3(tmp_vec2);
|
|
|
|
|
|
|
|
/* vc_no_tmp1 - this line is the average direction of both connecting edges
|
|
|
|
*
|
|
|
|
* Use the edge order to make the subtraction, flip the normal the right way
|
|
|
|
* edge should be there but check just in case... */
|
2013-07-13 14:16:59 +00:00
|
|
|
if (vc->e[0]->v1 == i) {
|
2010-04-23 23:57:00 +00:00
|
|
|
sub_v3_v3(tmp_vec1, tmp_vec2);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
sub_v3_v3v3(tmp_vec1, tmp_vec2, tmp_vec1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* only 1 edge connected - same as above except
|
2012-03-18 07:38:51 +00:00
|
|
|
* don't need to average edge direction */
|
2013-07-14 13:18:05 +00:00
|
|
|
if (vc->e[0]->v2 == i) {
|
2010-04-11 22:12:30 +00:00
|
|
|
sub_v3_v3v3(tmp_vec1, mvert_new[i].co, mvert_new[vc->v[0]].co);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sub_v3_v3v3(tmp_vec1, mvert_new[vc->v[0]].co, mvert_new[i].co);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-19 07:53:20 +11:00
|
|
|
/* tmp_vec2 - is a line 90d from the pivot to the vec
|
2010-04-11 22:12:30 +00:00
|
|
|
* This is used so the resulting normal points directly away from the middle */
|
|
|
|
cross_v3_v3v3(tmp_vec2, axis_vec, vc->co);
|
|
|
|
|
2013-12-19 07:53:20 +11:00
|
|
|
if (UNLIKELY(is_zero_v3(tmp_vec2))) {
|
|
|
|
/* we're _on_ the axis, so copy it based on our winding */
|
|
|
|
if (vc->e[0]->v2 == i) {
|
|
|
|
negate_v3_v3(vc->no, axis_vec);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
copy_v3_v3(vc->no, axis_vec);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* edge average vector and right angle to the pivot make the normal */
|
|
|
|
cross_v3_v3v3(vc->no, tmp_vec1, tmp_vec2);
|
|
|
|
}
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
copy_v3_v3(vc->no, vc->co);
|
|
|
|
}
|
|
|
|
|
2018-09-03 16:49:08 +02:00
|
|
|
/* we won't be looping on this data again so copy normals here */
|
2015-08-27 19:22:16 +10:00
|
|
|
if ((angle < 0.0f) != do_flip)
|
2010-04-11 22:12:30 +00:00
|
|
|
negate_v3(vc->no);
|
|
|
|
|
|
|
|
normalize_v3(vc->no);
|
|
|
|
normal_float_to_short_v3(mvert_new[i].no, vc->no);
|
|
|
|
|
|
|
|
/* Done with normals */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-05-06 13:38:33 +00:00
|
|
|
mv_orig = mvert_orig;
|
|
|
|
mv_new = mvert_new;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
for (i = 0; i < totvert; i++, mv_new++, mv_orig++) {
|
2010-08-05 23:40:21 +00:00
|
|
|
copy_v3_v3(mv_new->co, mv_orig->co);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* done with edge connectivity based normal flipping */
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* Add Faces */
|
2012-05-06 13:38:33 +00:00
|
|
|
for (step = 1; step < step_tot; step++) {
|
2013-11-21 10:35:48 +11:00
|
|
|
const unsigned int varray_stride = totvert * step;
|
2010-04-11 22:12:30 +00:00
|
|
|
float step_angle;
|
2010-08-06 00:13:44 +00:00
|
|
|
float nor_tx[3];
|
2010-11-28 06:03:30 +00:00
|
|
|
float mat[4][4];
|
2010-04-11 22:12:30 +00:00
|
|
|
/* Rotation Matrix */
|
2013-11-21 10:35:48 +11:00
|
|
|
step_angle = (angle / (float)(step_tot - (!close))) * (float)step;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
if (ltmd->ob_axis) {
|
2013-04-15 15:16:11 +00:00
|
|
|
axis_angle_normalized_to_mat3(mat3, axis_vec, step_angle);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
else {
|
2016-11-25 16:20:30 +11:00
|
|
|
axis_angle_to_mat3_single(mat3, axis_char, step_angle);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2016-11-25 16:20:30 +11:00
|
|
|
copy_m4_m3(mat, mat3);
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (screw_ofs)
|
2012-05-06 13:38:33 +00:00
|
|
|
madd_v3_v3fl(mat[3], axis_vec, screw_ofs * ((float)step / (float)(step_tot - 1)));
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2010-08-05 23:40:21 +00:00
|
|
|
/* copy a slice */
|
2013-11-21 10:35:48 +11:00
|
|
|
DM_copy_vert_data(dm, result, 0, (int)varray_stride, (int)totvert);
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
mv_new_base = mvert_new;
|
|
|
|
mv_new = &mvert_new[varray_stride]; /* advance to the next slice */
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
for (j = 0; j < totvert; j++, mv_new_base++, mv_new++) {
|
2010-04-11 22:12:30 +00:00
|
|
|
/* set normal */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (vert_connect) {
|
2010-08-06 00:13:44 +00:00
|
|
|
mul_v3_m3v3(nor_tx, mat3, vert_connect[j].no);
|
2010-04-11 22:12:30 +00:00
|
|
|
|
|
|
|
/* set the normal now its transformed */
|
2010-08-06 00:13:44 +00:00
|
|
|
normal_float_to_short_v3(mv_new->no, nor_tx);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* set location */
|
|
|
|
copy_v3_v3(mv_new->co, mv_new_base->co);
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* only need to set these if using non cleared memory */
|
2012-10-26 04:14:10 +00:00
|
|
|
/*mv_new->mat_nr = mv_new->flag = 0;*/
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
if (ltmd->ob_axis) {
|
|
|
|
sub_v3_v3(mv_new->co, mtx_tx[3]);
|
|
|
|
|
|
|
|
mul_m4_v3(mat, mv_new->co);
|
|
|
|
|
|
|
|
add_v3_v3(mv_new->co, mtx_tx[3]);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
mul_m4_v3(mat, mv_new->co);
|
|
|
|
}
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* add the new edge */
|
2012-05-06 13:38:33 +00:00
|
|
|
med_new->v1 = varray_stride + j;
|
|
|
|
med_new->v2 = med_new->v1 - totvert;
|
|
|
|
med_new->flag = ME_EDGEDRAW | ME_EDGERENDER;
|
2010-04-11 22:12:30 +00:00
|
|
|
med_new++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we can avoid if using vert alloc trick */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (vert_connect) {
|
2010-04-11 22:12:30 +00:00
|
|
|
MEM_freeN(vert_connect);
|
2012-05-06 13:38:33 +00:00
|
|
|
vert_connect = NULL;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (close) {
|
2018-09-03 16:49:08 +02:00
|
|
|
/* last loop of edges, previous loop doesn't account for the last set of edges */
|
2013-11-21 10:35:48 +11:00
|
|
|
const unsigned int varray_stride = (step_tot - 1) * totvert;
|
2010-08-05 23:40:21 +00:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
for (i = 0; i < totvert; i++) {
|
|
|
|
med_new->v1 = i;
|
|
|
|
med_new->v2 = varray_stride + i;
|
|
|
|
med_new->flag = ME_EDGEDRAW | ME_EDGERENDER;
|
2010-04-11 22:12:30 +00:00
|
|
|
med_new++;
|
|
|
|
}
|
|
|
|
}
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
mp_new = mpoly_new;
|
|
|
|
ml_new = mloop_new;
|
|
|
|
med_new_firstloop = medge_new;
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2012-01-04 20:11:08 +00:00
|
|
|
/* more of an offset in this case */
|
|
|
|
edge_offset = totedge + (totvert * (step_tot - (close ? 0 : 1)));
|
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
for (i = 0; i < totedge; i++, med_new_firstloop++) {
|
2013-11-26 21:07:24 +11:00
|
|
|
const unsigned int step_last = step_tot - (close ? 1 : 2);
|
|
|
|
const unsigned int mpoly_index_orig = totpoly ? edge_poly_map[i] : UINT_MAX;
|
|
|
|
const bool has_mpoly_orig = (mpoly_index_orig != UINT_MAX);
|
2015-09-04 14:24:22 +10:00
|
|
|
float uv_v_offset_a, uv_v_offset_b;
|
2013-11-26 21:22:56 +11:00
|
|
|
|
|
|
|
const unsigned int mloop_index_orig[2] = {
|
|
|
|
vert_loop_map ? vert_loop_map[medge_new[i].v1] : UINT_MAX,
|
|
|
|
vert_loop_map ? vert_loop_map[medge_new[i].v2] : UINT_MAX,
|
|
|
|
};
|
|
|
|
const bool has_mloop_orig = mloop_index_orig[0] != UINT_MAX;
|
2013-11-26 21:07:24 +11:00
|
|
|
|
2013-11-19 13:11:31 +11:00
|
|
|
short mat_nr;
|
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* for each edge, make a cylinder of quads */
|
2012-05-06 13:38:33 +00:00
|
|
|
i1 = med_new_firstloop->v1;
|
|
|
|
i2 = med_new_firstloop->v2;
|
2010-08-05 23:40:21 +00:00
|
|
|
|
2013-11-26 21:07:24 +11:00
|
|
|
if (has_mpoly_orig) {
|
|
|
|
mat_nr = mpoly_orig[mpoly_index_orig].mat_nr;
|
2013-11-19 13:11:31 +11:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
mat_nr = 0;
|
|
|
|
}
|
|
|
|
|
2013-11-26 21:22:56 +11:00
|
|
|
if (has_mloop_orig == false && mloopuv_layers_tot) {
|
2014-08-13 14:34:58 +10:00
|
|
|
uv_v_offset_a = dist_signed_to_plane_v3(mvert_new[medge_new[i].v1].co, uv_axis_plane);
|
|
|
|
uv_v_offset_b = dist_signed_to_plane_v3(mvert_new[medge_new[i].v2].co, uv_axis_plane);
|
2013-11-26 21:22:56 +11:00
|
|
|
|
|
|
|
if (ltmd->flag & MOD_SCREW_UV_STRETCH_V) {
|
|
|
|
uv_v_offset_a = (uv_v_offset_a - uv_v_minmax[0]) * uv_v_range_inv;
|
|
|
|
uv_v_offset_b = (uv_v_offset_b - uv_v_minmax[0]) * uv_v_range_inv;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-26 21:07:24 +11:00
|
|
|
for (step = 0; step <= step_last; step++) {
|
|
|
|
|
|
|
|
/* Polygon */
|
|
|
|
if (has_mpoly_orig) {
|
|
|
|
DM_copy_poly_data(dm, result, (int)mpoly_index_orig, (int)mpoly_index, 1);
|
|
|
|
origindex[mpoly_index] = (int)mpoly_index_orig;
|
2010-08-05 23:40:21 +00:00
|
|
|
}
|
|
|
|
else {
|
2013-11-26 21:07:24 +11:00
|
|
|
origindex[mpoly_index] = ORIGINDEX_NONE;
|
|
|
|
mp_new->flag = mpoly_flag;
|
|
|
|
mp_new->mat_nr = mat_nr;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2012-01-04 20:11:08 +00:00
|
|
|
mp_new->loopstart = mpoly_index * 4;
|
|
|
|
mp_new->totloop = 4;
|
2013-11-26 21:07:24 +11:00
|
|
|
|
2013-11-26 21:22:56 +11:00
|
|
|
|
|
|
|
/* Loop-Custom-Data */
|
|
|
|
if (has_mloop_orig) {
|
|
|
|
int l_index = (int)(ml_new - mloop_new);
|
|
|
|
DM_copy_loop_data(dm, result, (int)mloop_index_orig[0], l_index + 0, 1);
|
|
|
|
DM_copy_loop_data(dm, result, (int)mloop_index_orig[1], l_index + 1, 1);
|
|
|
|
DM_copy_loop_data(dm, result, (int)mloop_index_orig[1], l_index + 2, 1);
|
|
|
|
DM_copy_loop_data(dm, result, (int)mloop_index_orig[0], l_index + 3, 1);
|
|
|
|
|
|
|
|
if (mloopuv_layers_tot) {
|
|
|
|
unsigned int uv_lay;
|
|
|
|
const float uv_u_offset_a = (float)(step) * uv_u_scale;
|
|
|
|
const float uv_u_offset_b = (float)(step + 1) * uv_u_scale;
|
|
|
|
for (uv_lay = 0; uv_lay < mloopuv_layers_tot; uv_lay++) {
|
|
|
|
MLoopUV *mluv = &mloopuv_layers[uv_lay][l_index];
|
|
|
|
|
|
|
|
mluv[quad_ord[0]].uv[0] += uv_u_offset_a;
|
|
|
|
mluv[quad_ord[1]].uv[0] += uv_u_offset_a;
|
|
|
|
mluv[quad_ord[2]].uv[0] += uv_u_offset_b;
|
|
|
|
mluv[quad_ord[3]].uv[0] += uv_u_offset_b;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (mloopuv_layers_tot) {
|
|
|
|
int l_index = (int)(ml_new - mloop_new);
|
|
|
|
|
|
|
|
unsigned int uv_lay;
|
|
|
|
const float uv_u_offset_a = (float)(step) * uv_u_scale;
|
|
|
|
const float uv_u_offset_b = (float)(step + 1) * uv_u_scale;
|
|
|
|
for (uv_lay = 0; uv_lay < mloopuv_layers_tot; uv_lay++) {
|
|
|
|
MLoopUV *mluv = &mloopuv_layers[uv_lay][l_index];
|
|
|
|
|
|
|
|
copy_v2_fl2(mluv[quad_ord[0]].uv, uv_u_offset_a, uv_v_offset_a);
|
|
|
|
copy_v2_fl2(mluv[quad_ord[1]].uv, uv_u_offset_a, uv_v_offset_b);
|
|
|
|
copy_v2_fl2(mluv[quad_ord[2]].uv, uv_u_offset_b, uv_v_offset_b);
|
|
|
|
copy_v2_fl2(mluv[quad_ord[3]].uv, uv_u_offset_b, uv_v_offset_a);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-26 21:07:24 +11:00
|
|
|
/* Loop-Data */
|
|
|
|
if (!(close && step == step_last)) {
|
|
|
|
/* regular segments */
|
|
|
|
ml_new[quad_ord[0]].v = i1;
|
|
|
|
ml_new[quad_ord[1]].v = i2;
|
|
|
|
ml_new[quad_ord[2]].v = i2 + totvert;
|
|
|
|
ml_new[quad_ord[3]].v = i1 + totvert;
|
|
|
|
|
|
|
|
ml_new[quad_ord_ofs[0]].e = step == 0 ? i : (edge_offset + step + (i * (step_tot - 1))) - 1;
|
|
|
|
ml_new[quad_ord_ofs[1]].e = totedge + i2;
|
|
|
|
ml_new[quad_ord_ofs[2]].e = edge_offset + step + (i * (step_tot - 1));
|
|
|
|
ml_new[quad_ord_ofs[3]].e = totedge + i1;
|
|
|
|
|
|
|
|
|
|
|
|
/* new vertical edge */
|
|
|
|
if (step) { /* The first set is already done */
|
|
|
|
med_new->v1 = i1;
|
|
|
|
med_new->v2 = i2;
|
|
|
|
med_new->flag = med_new_firstloop->flag;
|
|
|
|
med_new->crease = med_new_firstloop->crease;
|
|
|
|
med_new++;
|
|
|
|
}
|
|
|
|
i1 += totvert;
|
|
|
|
i2 += totvert;
|
2010-08-05 23:40:21 +00:00
|
|
|
}
|
|
|
|
else {
|
2013-11-26 21:07:24 +11:00
|
|
|
/* last segment */
|
|
|
|
ml_new[quad_ord[0]].v = i1;
|
|
|
|
ml_new[quad_ord[1]].v = i2;
|
|
|
|
ml_new[quad_ord[2]].v = med_new_firstloop->v2;
|
|
|
|
ml_new[quad_ord[3]].v = med_new_firstloop->v1;
|
|
|
|
|
|
|
|
ml_new[quad_ord_ofs[0]].e = (edge_offset + step + (i * (step_tot - 1))) - 1;
|
|
|
|
ml_new[quad_ord_ofs[1]].e = totedge + i2;
|
|
|
|
ml_new[quad_ord_ofs[2]].e = i;
|
|
|
|
ml_new[quad_ord_ofs[3]].e = totedge + i1;
|
2010-08-05 23:40:21 +00:00
|
|
|
}
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-01-04 20:11:08 +00:00
|
|
|
mp_new++;
|
|
|
|
ml_new += 4;
|
|
|
|
mpoly_index++;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2018-06-17 17:04:27 +02:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* new vertical edge */
|
2012-05-06 13:38:33 +00:00
|
|
|
med_new->v1 = i1;
|
|
|
|
med_new->v2 = i2;
|
|
|
|
med_new->flag = med_new_firstloop->flag & ~ME_LOOSEEDGE;
|
|
|
|
med_new->crease = med_new_firstloop->crease;
|
2010-04-11 22:12:30 +00:00
|
|
|
med_new++;
|
|
|
|
}
|
2011-09-07 02:00:44 +00:00
|
|
|
|
2012-01-04 20:11:08 +00:00
|
|
|
/* validate loop edges */
|
|
|
|
#if 0
|
|
|
|
{
|
2013-11-21 10:35:48 +11:00
|
|
|
unsigned i = 0;
|
2012-01-04 20:11:08 +00:00
|
|
|
printf("\n");
|
2012-05-06 13:38:33 +00:00
|
|
|
for (; i < maxPolys * 4; i += 4) {
|
2013-11-21 10:35:48 +11:00
|
|
|
unsigned int ii;
|
2012-01-04 20:11:08 +00:00
|
|
|
ml_new = mloop_new + i;
|
|
|
|
ii = findEd(medge_new, maxEdges, ml_new[0].v, ml_new[1].v);
|
|
|
|
printf("%d %d -- ", ii, ml_new[0].e);
|
|
|
|
ml_new[0].e = ii;
|
|
|
|
|
|
|
|
ii = findEd(medge_new, maxEdges, ml_new[1].v, ml_new[2].v);
|
|
|
|
printf("%d %d -- ", ii, ml_new[1].e);
|
|
|
|
ml_new[1].e = ii;
|
|
|
|
|
|
|
|
ii = findEd(medge_new, maxEdges, ml_new[2].v, ml_new[3].v);
|
|
|
|
printf("%d %d -- ", ii, ml_new[2].e);
|
|
|
|
ml_new[2].e = ii;
|
|
|
|
|
|
|
|
ii = findEd(medge_new, maxEdges, ml_new[3].v, ml_new[0].v);
|
|
|
|
printf("%d %d\n", ii, ml_new[3].e);
|
|
|
|
ml_new[3].e = ii;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-11-19 13:11:31 +11:00
|
|
|
if (edge_poly_map) {
|
|
|
|
MEM_freeN(edge_poly_map);
|
|
|
|
}
|
|
|
|
|
2013-11-26 21:22:56 +11:00
|
|
|
if (vert_loop_map) {
|
|
|
|
MEM_freeN(vert_loop_map);
|
|
|
|
}
|
|
|
|
|
2017-09-07 00:10:13 +10:00
|
|
|
if ((ltmd->flag & MOD_SCREW_MERGE) && (screw_ofs == 0.0f)) {
|
|
|
|
DerivedMesh *result_prev = result;
|
|
|
|
result = dm_remove_doubles_on_axis(
|
|
|
|
result, mvert_new, totvert, step_tot,
|
|
|
|
axis_vec, ltmd->ob_axis ? mtx_tx[3] : NULL, ltmd->merge_dist);
|
|
|
|
if (result != result_prev) {
|
|
|
|
result->dirty |= DM_DIRTY_NORMALS;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if ((ltmd->flag & MOD_SCREW_NORMAL_CALC) == 0) {
|
2013-05-30 17:36:43 +00:00
|
|
|
result->dirty |= DM_DIRTY_NORMALS;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
2011-09-07 02:00:44 +00:00
|
|
|
return result;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-02-22 12:54:06 +01:00
|
|
|
static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
|
2010-04-11 22:12:30 +00:00
|
|
|
{
|
2012-05-06 13:38:33 +00:00
|
|
|
ScrewModifierData *ltmd = (ScrewModifierData *) md;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (ltmd->ob_axis) {
|
2018-02-22 12:54:06 +01:00
|
|
|
DagNode *curNode = dag_get_node(ctx->forest, ltmd->ob_axis);
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2018-02-22 12:54:06 +01:00
|
|
|
dag_add_relation(ctx->forest, curNode, ctx->obNode,
|
2012-05-06 13:38:33 +00:00
|
|
|
DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
|
|
|
|
"Screw Modifier");
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-22 12:54:06 +01:00
|
|
|
static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 15:05:57 +05:00
|
|
|
{
|
|
|
|
ScrewModifierData *ltmd = (ScrewModifierData *)md;
|
|
|
|
if (ltmd->ob_axis != NULL) {
|
2018-02-22 12:54:06 +01:00
|
|
|
DEG_add_object_relation(ctx->node, ltmd->ob_axis, DEG_OB_COMP_TRANSFORM, "Screw Modifier");
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 15:05:57 +05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
static void foreachObjectLink(
|
2012-05-06 13:38:33 +00:00
|
|
|
ModifierData *md, Object *ob,
|
2015-10-05 15:57:10 +02:00
|
|
|
ObjectWalkFunc walk, void *userData)
|
2010-04-11 22:12:30 +00:00
|
|
|
{
|
2012-05-06 13:38:33 +00:00
|
|
|
ScrewModifierData *ltmd = (ScrewModifierData *) md;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2017-01-31 09:47:59 +01:00
|
|
|
walk(userData, ob, <md->ob_axis, IDWALK_CB_NOP);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ModifierTypeInfo modifierType_Screw = {
|
|
|
|
/* name */ "Screw",
|
|
|
|
/* structName */ "ScrewModifierData",
|
|
|
|
/* structSize */ sizeof(ScrewModifierData),
|
|
|
|
/* type */ eModifierTypeType_Constructive,
|
|
|
|
|
2012-05-06 13:38:33 +00:00
|
|
|
/* flags */ eModifierTypeFlag_AcceptsMesh |
|
|
|
|
eModifierTypeFlag_AcceptsCVs |
|
|
|
|
eModifierTypeFlag_SupportsEditmode |
|
|
|
|
eModifierTypeFlag_EnableInEditmode,
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2018-05-08 15:04:10 +02:00
|
|
|
/* copyData */ modifier_copyData_generic,
|
2011-03-05 10:29:10 +00:00
|
|
|
/* deformVerts */ NULL,
|
|
|
|
/* deformMatrices */ NULL,
|
|
|
|
/* deformVertsEM */ NULL,
|
|
|
|
/* deformMatricesEM */ NULL,
|
2010-04-11 22:12:30 +00:00
|
|
|
/* applyModifier */ applyModifier,
|
2013-05-02 14:42:05 +00:00
|
|
|
/* applyModifierEM */ NULL,
|
2010-04-11 22:12:30 +00:00
|
|
|
/* initData */ initData,
|
2011-03-05 10:29:10 +00:00
|
|
|
/* requiredDataMask */ NULL,
|
|
|
|
/* freeData */ NULL,
|
|
|
|
/* isDisabled */ NULL,
|
2010-04-11 22:12:30 +00:00
|
|
|
/* updateDepgraph */ updateDepgraph,
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 15:05:57 +05:00
|
|
|
/* updateDepsgraph */ updateDepsgraph,
|
2013-06-02 03:59:19 +00:00
|
|
|
/* dependsOnTime */ NULL,
|
2011-03-05 10:29:10 +00:00
|
|
|
/* dependsOnNormals */ NULL,
|
2010-04-11 22:12:30 +00:00
|
|
|
/* foreachObjectLink */ foreachObjectLink,
|
2011-03-05 10:29:10 +00:00
|
|
|
/* foreachIDLink */ NULL,
|
2011-08-12 18:11:22 +00:00
|
|
|
/* foreachTexLink */ NULL,
|
2010-04-11 22:12:30 +00:00
|
|
|
};
|