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
de13d0a80c3cb6a7445245b2999a29fe70e49953
blender-archive/source/blender/modifiers/intern/MOD_warp.c

382 lines
10 KiB
C
Raw Normal View History

warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
/*
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
* 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.
*/
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
doxygen: add newline after \file While \file doesn't need an argument, it can't have another doxy command after it.
2019-02-18 08:08:12 +11:00
/** \file
* \ingroup modifiers
Minor: Bah, doxygen file's doc comments were also missing from warp and navmesh modifiers...
2011-09-22 12:00:24 +00:00
*/
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
#include <string.h>
#include "MEM_guardedalloc.h"
Modifier stack: Port Warp to new Mesh-based system.
2018-05-08 18:41:43 +02:00
#include "DNA_mesh_types.h"
- improve select grouped prefix/suffix from recent patch - added select similar direction (Y axis)
2012-04-30 08:24:44 +00:00
#include "DNA_meshdata_types.h"
Modifier stack: Port Warp to new Mesh-based system.
2018-05-08 18:41:43 +02:00
#include "DNA_object_types.h"
- improve select grouped prefix/suffix from recent patch - added select similar direction (Y axis)
2012-04-30 08:24:44 +00:00
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
#include "BLI_math.h"
#include "BLI_utildefines.h"
Modifier stack: Port Warp to new Mesh-based system.
2018-05-08 18:41:43 +02:00
#include "BKE_editmesh.h"
#include "BKE_library.h"
Modifiers: add 'cd_flag' parameter to their ID looping callbacks, needed since some IDs (objects) are not 'refcounted' while others (textures) are... Partial merge from id-remap branch.
2015-10-08 14:21:11 +02:00
#include "BKE_library_query.h"
Modifier stack: Port Warp to new Mesh-based system.
2018-05-08 18:41:43 +02:00
#include "BKE_mesh.h"
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
#include "BKE_modifier.h"
#include "BKE_deform.h"
#include "BKE_texture.h"
#include "BKE_colortools.h"
Fix modifiers not using depsgraph time for texture evaluation. Texture animation seems to be broken anyway currently, but at leat modifier side it should now be OK.
2018-05-23 15:52:35 +02:00
#include "DEG_depsgraph.h"
Modifiers: Remove lots of usages of md->scene
2018-06-22 15:03:42 +02:00
#include "DEG_depsgraph_query.h"
Fix modifiers not using depsgraph time for texture evaluation. Texture animation seems to be broken anyway currently, but at leat modifier side it should now be OK.
2018-05-23 15:52:35 +02:00
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
#include "RE_shader_ext.h"
#include "MOD_util.h"
static void initData(ModifierData *md)
{
style cleanup: modifiers
2012-05-06 13:38:33 +00:00
WarpModifierData *wmd = (WarpModifierData *) md;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
wmd->curfalloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
wmd->texture = NULL;
wmd->strength = 1.0f;
wmd->falloff_radius = 1.0f;
wmd->falloff_type = eWarp_Falloff_Smooth;
wmd->flag = 0;
}
Pass copy flag to modifier copyData function This will allow modifiers to decide whether to copy or share caches between ModifierData copies.
2018-07-04 12:45:30 +02:00
static void copyData(const ModifierData *md, ModifierData *target, const int flag)
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
{
Cleanup: Nuke empty dummy wrappers around modifier_copyData_generic(). This also changes signature of modifier copy callback, first (source) parameter is now a const, which is saner anyway!
2018-05-08 15:04:10 +02:00
const WarpModifierData *wmd = (const WarpModifierData *) md;
style cleanup: modifiers
2012-05-06 13:38:33 +00:00
WarpModifierData *twmd = (WarpModifierData *) target;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
Pass copy flag to modifier copyData function This will allow modifiers to decide whether to copy or share caches between ModifierData copies.
2018-07-04 12:45:30 +02:00
modifier_copyData_generic(md, target, flag);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
twmd->curfalloff = curvemapping_copy(wmd->curfalloff);
}
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
{
WarpModifierData *wmd = (WarpModifierData *)md;
CustomDataMask dataMask = 0;
/* ask for vertexgroups if we need them */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:24:53 +00:00
if (wmd->defgrp_name[0]) dataMask |= (CD_MASK_MDEFORMVERT);
Fix #27930: many modifiers crashed when used on a lattice with a vertex group.
2011-07-11 09:15:20 +00:00
dataMask |= (CD_MASK_MDEFORMVERT);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
/* ask for UV coordinates if we need them */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:24:53 +00:00
if (wmd->texmapping == MOD_DISP_MAP_UV) dataMask |= (1 << CD_MTFACE);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
return dataMask;
}
use booleans for modifiers and api callbacks.
2013-06-02 03:59:19 +00:00
static bool dependsOnTime(ModifierData *md)
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
{
WarpModifierData *wmd = (WarpModifierData *)md;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:24:53 +00:00
if (wmd->texture) {
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
return BKE_texture_dependsOnTime(wmd->texture);
}
else {
use booleans for modifiers and api callbacks.
2013-06-02 03:59:19 +00:00
return false;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
}
static void freeData(ModifierData *md)
{
WarpModifierData *wmd = (WarpModifierData *) md;
curvemapping_free(wmd->curfalloff);
}
Modifiers: Use bool for boolean flag in isDisabled
2018-07-10 12:14:08 +02:00
static bool isDisabled(const struct Scene *UNUSED(scene), ModifierData *md, bool UNUSED(userRenderParams))
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
{
style cleanup: modifiers
2012-05-06 13:38:33 +00:00
WarpModifierData *wmd = (WarpModifierData *) md;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
return !(wmd->object_from && wmd->object_to);
}
static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, void *userData)
{
style cleanup: modifiers
2012-05-06 13:38:33 +00:00
WarpModifierData *wmd = (WarpModifierData *) md;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
Cleanup: Rename callback flags from library_query to `IDWALK_CB_...` Better to have clear way to tell whether flag is parameter for BKE_library_foreach_ID_link(), parameter for its callback function, or return value from this callback function.
2017-01-31 09:47:59 +01:00
walk(userData, ob, &wmd->object_from, IDWALK_CB_NOP);
walk(userData, ob, &wmd->object_to, IDWALK_CB_NOP);
walk(userData, ob, &wmd->map_object, IDWALK_CB_NOP);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
{
style cleanup: modifiers
2012-05-06 13:38:33 +00:00
WarpModifierData *wmd = (WarpModifierData *) md;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
Cleanup: Rename callback flags from library_query to `IDWALK_CB_...` Better to have clear way to tell whether flag is parameter for BKE_library_foreach_ID_link(), parameter for its callback function, or return value from this callback function.
2017-01-31 09:47:59 +01:00
walk(userData, ob, (ID **)&wmd->texture, IDWALK_CB_USER);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
Cleanup: use proper `ObjectWalkFunc` typedef in modifiers' object callback func. Also, fix own stupidity, no need to define ID callback in case we only have objects, calling code knows to fallback to `foreachObjectLink()` when `foreachIDLink()` is missing...
2015-10-05 15:57:10 +02:00
foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
Modifiers: add callback to loop over each texture assigned to a modifier.
2011-08-12 18:11:22 +00:00
static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void *userData)
{
walk(userData, ob, md, "texture");
}
Depsgraph: Wrap all arguments foe modifiers relations update into a struct Makes it easier to add or remove fields needed to update relations.
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
{
WarpModifierData *wmd = (WarpModifierData *) md;
if (wmd->object_from != NULL && wmd->object_to != NULL) {
Depsgraph: Add utility function for transform dependency This is what modifiers are to use to indicate that they depend on a transformation of the object itself. Currently should be no functional changes, but in the future this will allow to easily change transform operation depending on whether there is a simulation associated with the object.
2019-02-12 12:01:17 +01:00
DEG_add_modifier_to_transform_relation(ctx->node, "Warplace Modifier");
Depsgraph: Wrap all arguments foe modifiers relations update into a struct Makes it easier to add or remove fields needed to update relations.
2018-02-22 12:54:06 +01:00
DEG_add_object_relation(ctx->node, wmd->object_from, DEG_OB_COMP_TRANSFORM, "Warp Modifier from");
DEG_add_object_relation(ctx->node, wmd->object_to, DEG_OB_COMP_TRANSFORM, "Warp Modifier to");
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
}
if ((wmd->texmapping == MOD_DISP_MAP_OBJECT) && wmd->map_object != NULL) {
Depsgraph: Wrap all arguments foe modifiers relations update into a struct Makes it easier to add or remove fields needed to update relations.
2018-02-22 12:54:06 +01:00
DEG_add_object_relation(ctx->node, wmd->map_object, DEG_OB_COMP_TRANSFORM, "Warp Modifier map");
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
}
Fix T58679: Missing modifiers update on changes to texture
2018-12-05 17:35:13 +01:00
if (wmd->texture != NULL) {
DEG_add_generic_id_relation(ctx->node, &wmd->texture->id, "Warp 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
}
Cleanup: modifier arg wrapping
2018-05-12 08:04:56 +02:00
static void warpModifier_do(
Fix modifiers not using depsgraph time for texture evaluation. Texture animation seems to be broken anyway currently, but at leat modifier side it should now be OK.
2018-05-23 15:52:35 +02:00
WarpModifierData *wmd, const ModifierEvalContext *ctx,
Merge branch 'master' into blender2.8
2018-05-12 08:21:07 +02:00
Mesh *mesh, float (*vertexCos)[3], int numVerts)
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
{
Fix modifiers not using depsgraph time for texture evaluation. Texture animation seems to be broken anyway currently, but at leat modifier side it should now be OK.
2018-05-23 15:52:35 +02:00
Object *ob = ctx->object;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
float obinv[4][4];
float mat_from[4][4];
float mat_from_inv[4][4];
float mat_to[4][4];
float mat_unit[4][4];
float mat_final[4][4];
float tmat[4][4];
Warp modifier: avoid sqrt checking radius
2015-02-03 04:35:02 +11:00
const float falloff_radius_sq = SQUARE(wmd->falloff_radius);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
float strength = wmd->strength;
float fac = 1.0f, weight;
int i;
Fix #27930: many modifiers crashed when used on a lattice with a vertex group.
2011-07-11 09:15:20 +00:00
int defgrp_index;
style cleanup: modifiers
2012-05-06 13:38:33 +00:00
MDeformVert *dvert, *dv = NULL;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
style cleanup: modifiers
2012-05-06 13:38:33 +00:00
float (*tex_co)[3] = NULL;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:24:53 +00:00
if (!(wmd->object_from && wmd->object_to))
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
return;
Cleanup: naming in MOD_utils.
2018-06-29 19:02:19 +02:00
MOD_get_vgroup(ob, mesh, wmd->defgrp_name, &dvert, &defgrp_index);
Warp modifier: remove redundant NULL check
2015-02-03 04:38:59 +11:00
if (dvert == NULL) {
defgrp_index = -1;
}
Fix #27930: many modifiers crashed when used on a lattice with a vertex group.
2011-07-11 09:15:20 +00:00
code cleanup: double promotion & some style cleanup
2012-05-03 21:35:04 +00:00
if (wmd->curfalloff == NULL) /* should never happen, but bad lib linking could cause it */
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
wmd->curfalloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
change curve evaluation functions never to modify curve data (ensures thread safety), now initializations has to be done outside evaluation.
2012-08-21 14:43:51 +00:00
if (wmd->curfalloff) {
curvemapping_initialize(wmd->curfalloff);
}
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
invert_m4_m4(obinv, ob->obmat);
Fix modifiers evaluation outside of depsgraph/CoW context. Fix T58237: Exporters: Curve Modifier not applied when "apply modifiers" are selected. Fix T58856: Python: "to_mesh" broken in 2.8. ...And many other cases... ;) Thing is, we need target IDs to always be evaluated ones (at least I cannot see any case where having orig ones is desired effect here). Depsgraph/Cow system ensures us that when modifiers are evaluated by it, but they can also be called outside of this context, e.g. when doing binding, or object conversion... So we need to ensure in modifiers code that we actually are always working with eval data for those targets. Note that I did not touch to physics modifiers, those are a bit touchy and rather not 'fix' something there until proven broken!
2018-12-07 15:45:53 +01:00
mul_m4_m4m4(mat_from, obinv, DEG_get_evaluated_object(ctx->depsgraph, wmd->object_from)->obmat);
mul_m4_m4m4(mat_to, obinv, DEG_get_evaluated_object(ctx->depsgraph, wmd->object_to)->obmat);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
invert_m4_m4(tmat, mat_from); // swap?
BLI_math rename functions: - mult_m4_m4m4 -> mul_m4_m4m4 - mult_m3_m3m4 -> mul_m3_m3m4 these temporary names were used to avoid problems when argument order was switched.
2013-05-26 18:36:25 +00:00
mul_m4_m4m4(mat_final, tmat, mat_to);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
invert_m4_m4(mat_from_inv, mat_from);
unit_m4(mat_unit);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:24:53 +00:00
if (strength < 0.0f) {
warp modifier, using negative strength inverts the transformation matrix but the location it gave wasnt useful when rotation was used too, just negate the translation.
2011-05-01 16:07:18 +00:00
float loc[3];
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
strength = -strength;
warp modifier, using negative strength inverts the transformation matrix but the location it gave wasnt useful when rotation was used too, just negate the translation.
2011-05-01 16:07:18 +00:00
/* inverted location is not useful, just use the negative */
copy_v3_v3(loc, mat_final[3]);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
invert_m4(mat_final);
warp modifier, using negative strength inverts the transformation matrix but the location it gave wasnt useful when rotation was used too, just negate the translation.
2011-05-01 16:07:18 +00:00
negate_v3_v3(mat_final[3], loc);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
style cleanup: modifiers
2012-05-06 13:38:33 +00:00
weight = strength;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
Fix modifiers evaluation outside of depsgraph/CoW context. Fix T58237: Exporters: Curve Modifier not applied when "apply modifiers" are selected. Fix T58856: Python: "to_mesh" broken in 2.8. ...And many other cases... ;) Thing is, we need target IDs to always be evaluated ones (at least I cannot see any case where having orig ones is desired effect here). Depsgraph/Cow system ensures us that when modifiers are evaluated by it, but they can also be called outside of this context, e.g. when doing binding, or object conversion... So we need to ensure in modifiers code that we actually are always working with eval data for those targets. Note that I did not touch to physics modifiers, those are a bit touchy and rather not 'fix' something there until proven broken!
2018-12-07 15:45:53 +01:00
Tex *tex_target = (Tex *)DEG_get_evaluated_id(ctx->depsgraph, &wmd->texture->id);
if (mesh != NULL && tex_target != NULL) {
Fix buffer overflow vulnerabilities in mesh code. Solves these security issues from T52924: CVE-2017-12081 CVE-2017-12082 CVE-2017-12086 CVE-2017-12099 CVE-2017-12100 CVE-2017-12101 CVE-2017-12105 While the specific overflow issue may be fixed, loading the repro .blend files may still crash because they are incomplete and corrupt. The way they crash may be impossible to exploit, but this is difficult to prove. Differential Revision: https://developer.blender.org/D3002
2018-01-14 22:14:20 +01:00
tex_co = MEM_malloc_arrayN(numVerts, sizeof(*tex_co), "warpModifier_do tex_co");
Fix modifiers evaluation outside of depsgraph/CoW context. Fix T58237: Exporters: Curve Modifier not applied when "apply modifiers" are selected. Fix T58856: Python: "to_mesh" broken in 2.8. ...And many other cases... ;) Thing is, we need target IDs to always be evaluated ones (at least I cannot see any case where having orig ones is desired effect here). Depsgraph/Cow system ensures us that when modifiers are evaluated by it, but they can also be called outside of this context, e.g. when doing binding, or object conversion... So we need to ensure in modifiers code that we actually are always working with eval data for those targets. Note that I did not touch to physics modifiers, those are a bit touchy and rather not 'fix' something there until proven broken!
2018-12-07 15:45:53 +01:00
MOD_get_texture_coords((MappingInfoModifierData *)wmd, ctx, ob, mesh, vertexCos, tex_co);
Fix #30882: using an image sequence in the displace modifier did not update properly in animation rendering.
2012-04-10 14:11:45 +00:00
Fix modifiers evaluation outside of depsgraph/CoW context. Fix T58237: Exporters: Curve Modifier not applied when "apply modifiers" are selected. Fix T58856: Python: "to_mesh" broken in 2.8. ...And many other cases... ;) Thing is, we need target IDs to always be evaluated ones (at least I cannot see any case where having orig ones is desired effect here). Depsgraph/Cow system ensures us that when modifiers are evaluated by it, but they can also be called outside of this context, e.g. when doing binding, or object conversion... So we need to ensure in modifiers code that we actually are always working with eval data for those targets. Note that I did not touch to physics modifiers, those are a bit touchy and rather not 'fix' something there until proven broken!
2018-12-07 15:45:53 +01:00
MOD_init_texture((MappingInfoModifierData *)wmd, ctx);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:24:53 +00:00
for (i = 0; i < numVerts; i++) {
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
float *co = vertexCos[i];
code cleanup: double promotion & some style cleanup
2012-05-03 21:35:04 +00:00
if (wmd->falloff_type == eWarp_Falloff_None ||
Warp modifier: avoid sqrt checking radius
2015-02-03 04:35:02 +11:00
((fac = len_squared_v3v3(co, mat_from[3])) < falloff_radius_sq &&
(fac = (wmd->falloff_radius - sqrtf(fac)) / wmd->falloff_radius)))
code cleanup: double promotion & some style cleanup
2012-05-03 21:35:04 +00:00
{
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
/* skip if no vert group found */
Warp modifier: remove redundant NULL check
2015-02-03 04:38:59 +11:00
if (defgrp_index != -1) {
Fix #27930: many modifiers crashed when used on a lattice with a vertex group.
2011-07-11 09:15:20 +00:00
dv = &dvert[i];
Warp modifier: remove redundant NULL check
2015-02-03 04:38:59 +11:00
weight = defvert_find_weight(dv, defgrp_index) * strength;
if (weight <= 0.0f) {
continue;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
}
/* closely match PROP_SMOOTH and similar */
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
switch (wmd->falloff_type) {
style cleanup: modifiers
2012-05-06 13:38:33 +00:00
case eWarp_Falloff_None:
fac = 1.0f;
break;
case eWarp_Falloff_Curve:
fac = curvemapping_evaluateF(wmd->curfalloff, 0, fac);
break;
case eWarp_Falloff_Sharp:
fac = fac * fac;
break;
case eWarp_Falloff_Smooth:
fac = 3.0f * fac * fac - 2.0f * fac * fac * fac;
break;
case eWarp_Falloff_Root:
Code cleanup: use sqrtf when input and output are float
2014-03-28 14:53:37 +11:00
fac = sqrtf(fac);
style cleanup: modifiers
2012-05-06 13:38:33 +00:00
break;
case eWarp_Falloff_Linear:
/* pass */
break;
case eWarp_Falloff_Const:
fac = 1.0f;
break;
case eWarp_Falloff_Sphere:
Code cleanup: use sqrtf when input and output are float
2014-03-28 14:53:37 +11:00
fac = sqrtf(2 * fac - fac * fac);
style cleanup: modifiers
2012-05-06 13:38:33 +00:00
break;
Add inverse-square blending for PET and warp Similar to 'Root' but without noticeable spike/pinch in the center.
2015-02-04 05:35:09 +11:00
case eWarp_Falloff_InvSquare:
fac = fac * (2.0f - fac);
break;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
fac *= weight;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:24:53 +00:00
if (tex_co) {
Modifiers: Remove lots of usages of md->scene
2018-06-22 15:03:42 +02:00
struct Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
TexResult texres;
texres.nor = NULL;
Fix modifiers evaluation outside of depsgraph/CoW context. Fix T58237: Exporters: Curve Modifier not applied when "apply modifiers" are selected. Fix T58856: Python: "to_mesh" broken in 2.8. ...And many other cases... ;) Thing is, we need target IDs to always be evaluated ones (at least I cannot see any case where having orig ones is desired effect here). Depsgraph/Cow system ensures us that when modifiers are evaluated by it, but they can also be called outside of this context, e.g. when doing binding, or object conversion... So we need to ensure in modifiers code that we actually are always working with eval data for those targets. Note that I did not touch to physics modifiers, those are a bit touchy and rather not 'fix' something there until proven broken!
2018-12-07 15:45:53 +01:00
BKE_texture_get_value(scene, tex_target, tex_co[i], &texres, false);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
fac *= texres.tin;
}
Fix T43524: Warp modifier curve clamped to 0-1
2015-02-03 04:26:31 +11:00
if (fac != 0.0f) {
/* into the 'from' objects space */
mul_m4_v3(mat_from_inv, co);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
Fix T43524: Warp modifier curve clamped to 0-1
2015-02-03 04:26:31 +11:00
if (fac == 1.0f) {
mul_m4_v3(mat_final, co);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
else {
Fix T43524: Warp modifier curve clamped to 0-1
2015-02-03 04:26:31 +11:00
if (wmd->flag & MOD_WARP_VOLUME_PRESERVE) {
/* interpolate the matrix for nicer locations */
blend_m4_m4m4(tmat, mat_unit, mat_final, fac);
mul_m4_v3(tmat, co);
}
else {
float tvec[3];
mul_v3_m4v3(tvec, mat_final, co);
interp_v3_v3v3(co, co, tvec, fac);
}
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
Fix T43524: Warp modifier curve clamped to 0-1
2015-02-03 04:26:31 +11:00
/* out of the 'from' objects space */
mul_m4_v3(mat_from, co);
}
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
}
Modifier stack: Port Warp to new Mesh-based system.
2018-05-08 18:41:43 +02:00
if (tex_co) {
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
MEM_freeN(tex_co);
Modifier stack: Port Warp to new Mesh-based system.
2018-05-08 18:41:43 +02:00
}
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
Cleanup: modifier arg wrapping
2018-05-12 08:04:56 +02:00
static void deformVerts(
Merge branch 'master' into blender2.8
2018-05-12 08:21:07 +02:00
ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh,
float (*vertexCos)[3], int numVerts)
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
{
MOD_smooth: do not compute mesh when not needed. Related to T57972.
2018-11-27 15:11:13 +01:00
WarpModifierData *wmd = (WarpModifierData *)md;
Mesh *mesh_src = NULL;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
Modifiers: cleanup/harmonize deform modifiers code re. mesh source. Also fixes a few issues (like meshdeform's EM variant not using editmesh data), and adds a few optimizations (like only generating that source mesh when we do have a vgroup defined in parameters, for modifiers only using it to access vgroup)...
2018-11-27 20:10:41 +01:00
if (wmd->defgrp_name[0] != '\0' || wmd->texture != NULL) {
/* mesh_src is only needed for vgroups and textures. */
Modifiers: Refactor `MOD_deform_mesh_eval_get()` helper a bit. Now that function also takes expected number of vertices, and do the checks against generated mesh internally.
2018-11-27 17:21:16 +01:00
mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, numVerts, false, false);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
MOD_smooth: do not compute mesh when not needed. Related to T57972.
2018-11-27 15:11:13 +01:00
warpModifier_do(wmd, ctx, mesh_src, vertexCos, numVerts);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
MOD_smooth: do not compute mesh when not needed. Related to T57972.
2018-11-27 15:11:13 +01:00
if (!ELEM(mesh_src, NULL, mesh)) {
BKE_id_free(NULL, mesh_src);
}
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
Cleanup: modifier arg wrapping
2018-05-12 08:04:56 +02:00
static void deformVertsEM(
Merge branch 'master' into blender2.8
2018-05-12 08:21:07 +02:00
ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *em,
Mesh *mesh, float (*vertexCos)[3], int numVerts)
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
{
MOD_smooth: do not compute mesh when not needed. Related to T57972.
2018-11-27 15:11:13 +01:00
WarpModifierData *wmd = (WarpModifierData *)md;
Modifiers: cleanup/harmonize deform modifiers code re. mesh source. Also fixes a few issues (like meshdeform's EM variant not using editmesh data), and adds a few optimizations (like only generating that source mesh when we do have a vgroup defined in parameters, for modifiers only using it to access vgroup)...
2018-11-27 20:10:41 +01:00
Mesh *mesh_src = NULL;
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
Modifiers: cleanup/harmonize deform modifiers code re. mesh source. Also fixes a few issues (like meshdeform's EM variant not using editmesh data), and adds a few optimizations (like only generating that source mesh when we do have a vgroup defined in parameters, for modifiers only using it to access vgroup)...
2018-11-27 20:10:41 +01:00
if (wmd->defgrp_name[0] != '\0' || wmd->texture != NULL) {
/* mesh_src is only needed for vgroups and textures. */
mesh_src = MOD_deform_mesh_eval_get(ctx->object, em, mesh, NULL, numVerts, false, false);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
MOD_smooth: do not compute mesh when not needed. Related to T57972.
2018-11-27 15:11:13 +01:00
warpModifier_do(wmd, ctx, mesh_src, vertexCos, numVerts);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
MOD_smooth: do not compute mesh when not needed. Related to T57972.
2018-11-27 15:11:13 +01:00
if (!ELEM(mesh_src, NULL, mesh)) {
Modifier stack: Port Warp to new Mesh-based system.
2018-05-08 18:41:43 +02:00
BKE_id_free(NULL, mesh_src);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
}
ModifierTypeInfo modifierType_Warp = {
style cleanup: modifier structs
2012-10-24 05:45:54 +00:00
/* name */ "Warp",
/* structName */ "WarpModifierData",
/* structSize */ sizeof(WarpModifierData),
/* type */ eModifierTypeType_OnlyDeform,
/* flags */ eModifierTypeFlag_AcceptsCVs |
Fix T47737: Lattice crashes w/ smooth modifier Add flag for modifiers that support lattice
2016-05-18 22:21:46 +10:00
eModifierTypeFlag_AcceptsLattice |
style cleanup: modifier structs
2012-10-24 05:45:54 +00:00
eModifierTypeFlag_SupportsEditmode,
/* copyData */ copyData,
Modifiers: Add wrapper functions with Mesh / DerivedMesh conversion Makes the follow changes: - Add new `deform*` and `apply*` function pointers to `ModifierTypeInfo` that take `Mesh`, and rename the old functions to indicate that they take `DerivedMesh`. These new functions are currently set to `NULL` for all modifiers. - Add wrapper `modifier_deform*` and `modifier_apply*` functions in two variants: one that works with `Mesh` and the other which works with `DerivedMesh` that is named with `*_DM_depercated`. These functions check which type of data the modifier supports and converts if necessary - Update the rest of Blender to be aware and make use of these new functions The goal of these changes is to make it possible to port to using `Mesh` incrementally without ever needing to enter into a state where modifiers don't work. After everything has been ported over the old functions and wrappers could be removed. Reviewers: campbellbarton, sergey, mont29 Subscribers: sybren Tags: #bf_blender_2.8 Differential Revision: https://developer.blender.org/D3155
2018-04-18 15:45:54 +02:00
Modifier stack: Port Warp to new Mesh-based system.
2018-05-08 18:41:43 +02:00
/* deformVerts_DM */ NULL,
Modifiers: Add wrapper functions with Mesh / DerivedMesh conversion Makes the follow changes: - Add new `deform*` and `apply*` function pointers to `ModifierTypeInfo` that take `Mesh`, and rename the old functions to indicate that they take `DerivedMesh`. These new functions are currently set to `NULL` for all modifiers. - Add wrapper `modifier_deform*` and `modifier_apply*` functions in two variants: one that works with `Mesh` and the other which works with `DerivedMesh` that is named with `*_DM_depercated`. These functions check which type of data the modifier supports and converts if necessary - Update the rest of Blender to be aware and make use of these new functions The goal of these changes is to make it possible to port to using `Mesh` incrementally without ever needing to enter into a state where modifiers don't work. After everything has been ported over the old functions and wrappers could be removed. Reviewers: campbellbarton, sergey, mont29 Subscribers: sybren Tags: #bf_blender_2.8 Differential Revision: https://developer.blender.org/D3155
2018-04-18 15:45:54 +02:00
/* deformMatrices_DM */ NULL,
Modifier stack: Port Warp to new Mesh-based system.
2018-05-08 18:41:43 +02:00
/* deformVertsEM_DM */ NULL,
Modifiers: Add wrapper functions with Mesh / DerivedMesh conversion Makes the follow changes: - Add new `deform*` and `apply*` function pointers to `ModifierTypeInfo` that take `Mesh`, and rename the old functions to indicate that they take `DerivedMesh`. These new functions are currently set to `NULL` for all modifiers. - Add wrapper `modifier_deform*` and `modifier_apply*` functions in two variants: one that works with `Mesh` and the other which works with `DerivedMesh` that is named with `*_DM_depercated`. These functions check which type of data the modifier supports and converts if necessary - Update the rest of Blender to be aware and make use of these new functions The goal of these changes is to make it possible to port to using `Mesh` incrementally without ever needing to enter into a state where modifiers don't work. After everything has been ported over the old functions and wrappers could be removed. Reviewers: campbellbarton, sergey, mont29 Subscribers: sybren Tags: #bf_blender_2.8 Differential Revision: https://developer.blender.org/D3155
2018-04-18 15:45:54 +02:00
/* deformMatricesEM_DM*/NULL,
/* applyModifier_DM */ NULL,
Modifier stack: Port Warp to new Mesh-based system.
2018-05-08 18:41:43 +02:00
/* deformVerts */ deformVerts,
style cleanup: modifier structs
2012-10-24 05:45:54 +00:00
/* deformMatrices */ NULL,
Modifier stack: Port Warp to new Mesh-based system.
2018-05-08 18:41:43 +02:00
/* deformVertsEM */ deformVertsEM,
style cleanup: modifier structs
2012-10-24 05:45:54 +00:00
/* deformMatricesEM */ NULL,
code cleanup: more zero as NULL pointers.
2013-08-07 03:36:05 +00:00
/* applyModifier */ NULL,
Modifiers: Add wrapper functions with Mesh / DerivedMesh conversion Makes the follow changes: - Add new `deform*` and `apply*` function pointers to `ModifierTypeInfo` that take `Mesh`, and rename the old functions to indicate that they take `DerivedMesh`. These new functions are currently set to `NULL` for all modifiers. - Add wrapper `modifier_deform*` and `modifier_apply*` functions in two variants: one that works with `Mesh` and the other which works with `DerivedMesh` that is named with `*_DM_depercated`. These functions check which type of data the modifier supports and converts if necessary - Update the rest of Blender to be aware and make use of these new functions The goal of these changes is to make it possible to port to using `Mesh` incrementally without ever needing to enter into a state where modifiers don't work. After everything has been ported over the old functions and wrappers could be removed. Reviewers: campbellbarton, sergey, mont29 Subscribers: sybren Tags: #bf_blender_2.8 Differential Revision: https://developer.blender.org/D3155
2018-04-18 15:45:54 +02:00
style cleanup: modifier structs
2012-10-24 05:45:54 +00:00
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ freeData,
/* isDisabled */ isDisabled,
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,
style cleanup: modifier structs
2012-10-24 05:45:54 +00:00
/* dependsOnTime */ dependsOnTime,
/* dependsOnNormals */ NULL,
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
/* foreachObjectLink */ foreachObjectLink,
style cleanup: modifier structs
2012-10-24 05:45:54 +00:00
/* foreachIDLink */ foreachIDLink,
/* foreachTexLink */ foreachTexLink,
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
};
Copy Permalink