Differential D7681 Diff 24603 source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c

Changeset View

Standalone View

source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c

Show All 29 Lines
#include "DNA_gpencil_types.h"		#include "DNA_gpencil_types.h"
#include "DNA_meshdata_types.h"		#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"		#include "DNA_object_types.h"

#include "BKE_colortools.h"		#include "BKE_colortools.h"
#include "BKE_deform.h"		#include "BKE_deform.h"
#include "BKE_gpencil_geom.h"		#include "BKE_gpencil_geom.h"
#include "BKE_gpencil_modifier.h"		#include "BKE_gpencil_modifier.h"
		#include "BKE_lib_query.h"
		#include "BKE_modifier.h"

#include "DEG_depsgraph.h"		#include "DEG_depsgraph.h"

#include "MOD_gpencil_modifiertypes.h"		#include "MOD_gpencil_modifiertypes.h"
#include "MOD_gpencil_util.h"		#include "MOD_gpencil_util.h"

static void initData(GpencilModifierData *md)		static void initData(GpencilModifierData *md)
{		{
SmoothGpencilModifierData gpmd = (SmoothGpencilModifierData )md;		SmoothGpencilModifierData gpmd = (SmoothGpencilModifierData )md;
gpmd->pass_index = 0;		gpmd->pass_index = 0;
gpmd->flag \|= GP_SMOOTH_MOD_LOCATION;		gpmd->flag \|= GP_SMOOTH_MOD_LOCATION;
gpmd->factor = 0.5f;		gpmd->factor = 0.5f;
gpmd->layername[0] = '\0';		gpmd->layername[0] = '\0';
gpmd->materialname[0] = '\0';		gpmd->material = NULL;
gpmd->vgname[0] = '\0';		gpmd->vgname[0] = '\0';
gpmd->step = 1;		gpmd->step = 1;

gpmd->curve_intensity = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);		gpmd->curve_intensity = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
if (gpmd->curve_intensity) {		if (gpmd->curve_intensity) {
CurveMapping *curve = gpmd->curve_intensity;		CurveMapping *curve = gpmd->curve_intensity;
BKE_curvemapping_initialize(curve);		BKE_curvemapping_initialize(curve);
}		}
Show All 23 Lines	static void deformStroke(GpencilModifierData *md,
bGPDstroke *gps)		bGPDstroke *gps)
{		{
SmoothGpencilModifierData mmd = (SmoothGpencilModifierData )md;		SmoothGpencilModifierData mmd = (SmoothGpencilModifierData )md;
const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname);		const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname);
const bool use_curve = (mmd->flag & GP_SMOOTH_CUSTOM_CURVE) != 0 && mmd->curve_intensity;		const bool use_curve = (mmd->flag & GP_SMOOTH_CUSTOM_CURVE) != 0 && mmd->curve_intensity;

if (!is_stroke_affected_by_modifier(ob,		if (!is_stroke_affected_by_modifier(ob,
mmd->layername,		mmd->layername,
mmd->materialname,		mmd->material,
mmd->pass_index,		mmd->pass_index,
mmd->layer_pass,		mmd->layer_pass,
3,		3,
gpl,		gpl,
gps,		gps,
mmd->flag & GP_SMOOTH_INVERT_LAYER,		mmd->flag & GP_SMOOTH_INVERT_LAYER,
mmd->flag & GP_SMOOTH_INVERT_PASS,		mmd->flag & GP_SMOOTH_INVERT_PASS,
mmd->flag & GP_SMOOTH_INVERT_LAYERPASS,		mmd->flag & GP_SMOOTH_INVERT_LAYERPASS,
▲ Show 20 Lines • Show All 62 Lines • ▼ Show 20 Lines
{		{
SmoothGpencilModifierData gpmd = (SmoothGpencilModifierData )md;		SmoothGpencilModifierData gpmd = (SmoothGpencilModifierData )md;

if (gpmd->curve_intensity) {		if (gpmd->curve_intensity) {
BKE_curvemapping_free(gpmd->curve_intensity);		BKE_curvemapping_free(gpmd->curve_intensity);
}		}
}		}

		static void foreachIDLink(GpencilModifierData md, Object ob, IDWalkFunc walk, void *userData)
		{
		SmoothGpencilModifierData mmd = (SmoothGpencilModifierData )md;

		walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_NOP);
		}

GpencilModifierTypeInfo modifierType_Gpencil_Smooth = {		GpencilModifierTypeInfo modifierType_Gpencil_Smooth = {
/* name */ "Smooth",		/* name */ "Smooth",
/* structName */ "SmoothGpencilModifierData",		/* structName */ "SmoothGpencilModifierData",
/* structSize */ sizeof(SmoothGpencilModifierData),		/* structSize */ sizeof(SmoothGpencilModifierData),
/* type */ eGpencilModifierTypeType_Gpencil,		/* type */ eGpencilModifierTypeType_Gpencil,
/* flags */ eGpencilModifierTypeFlag_SupportsEditmode,		/* flags */ eGpencilModifierTypeFlag_SupportsEditmode,

/* copyData */ copyData,		/* copyData */ copyData,

/* deformStroke */ deformStroke,		/* deformStroke */ deformStroke,
/* generateStrokes */ NULL,		/* generateStrokes */ NULL,
/* bakeModifier */ bakeModifier,		/* bakeModifier */ bakeModifier,
/* remapTime */ NULL,		/* remapTime */ NULL,

/* initData */ initData,		/* initData */ initData,
/* freeData */ freeData,		/* freeData */ freeData,
/* isDisabled */ NULL,		/* isDisabled */ NULL,
/* updateDepsgraph */ NULL,		/* updateDepsgraph */ NULL,
/* dependsOnTime */ NULL,		/* dependsOnTime */ NULL,
/* foreachObjectLink */ NULL,		/* foreachObjectLink */ NULL,
/* foreachIDLink */ NULL,		/* foreachIDLink */ foreachIDLink,
/* foreachTexLink */ NULL,		/* foreachTexLink */ NULL,
};		};