Antonio Vazquez
03bf290eae
Before, the modifiers were evaluated in Draw Engine and this required to calculate a factor to increase the VBO size. Now, the modifiers are evaluated in Depsgraph and the Draw Engine receives the evaluated stroke with the final number of vertices. As the number of vertices is the final value already, if Draw Manager increases the number with the modifiers only increases the memory with empty space because never would be used. This commit removes this double calculation, reducing the memory usage and removes a loop to calculate the size by modifier too. Also, the function getDuplicationFactor() has been removed because is not required anymore.
148 lines
4.5 KiB
C
148 lines
4.5 KiB
C
/*
|
|
* 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) 2017, Blender Foundation
|
|
* This is a new part of Blender
|
|
*/
|
|
|
|
/** \file
|
|
* \ingroup modifiers
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "DNA_scene_types.h"
|
|
#include "DNA_object_types.h"
|
|
#include "DNA_gpencil_types.h"
|
|
#include "DNA_gpencil_modifier_types.h"
|
|
#include "DNA_vec_types.h"
|
|
|
|
#include "BKE_gpencil.h"
|
|
#include "BKE_gpencil_modifier.h"
|
|
|
|
#include "DEG_depsgraph.h"
|
|
|
|
#include "MOD_gpencil_util.h"
|
|
#include "MOD_gpencil_modifiertypes.h"
|
|
|
|
static void initData(GpencilModifierData *md)
|
|
{
|
|
SimplifyGpencilModifierData *gpmd = (SimplifyGpencilModifierData *)md;
|
|
gpmd->pass_index = 0;
|
|
gpmd->step = 1;
|
|
gpmd->factor = 0.0f;
|
|
gpmd->length = 0.1f;
|
|
gpmd->distance = 0.1f;
|
|
gpmd->layername[0] = '\0';
|
|
gpmd->materialname[0] = '\0';
|
|
}
|
|
|
|
static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
|
|
{
|
|
BKE_gpencil_modifier_copyData_generic(md, target);
|
|
}
|
|
|
|
static void deformStroke(GpencilModifierData *md,
|
|
Depsgraph *UNUSED(depsgraph),
|
|
Object *ob,
|
|
bGPDlayer *gpl,
|
|
bGPDframe *gpf,
|
|
bGPDstroke *gps)
|
|
{
|
|
SimplifyGpencilModifierData *mmd = (SimplifyGpencilModifierData *)md;
|
|
|
|
if (!is_stroke_affected_by_modifier(ob,
|
|
mmd->layername,
|
|
mmd->materialname,
|
|
mmd->pass_index,
|
|
mmd->layer_pass,
|
|
mmd->mode == GP_SIMPLIFY_SAMPLE ? 3 : 4,
|
|
gpl,
|
|
gps,
|
|
mmd->flag & GP_SIMPLIFY_INVERT_LAYER,
|
|
mmd->flag & GP_SIMPLIFY_INVERT_PASS,
|
|
mmd->flag & GP_SIMPLIFY_INVERT_LAYERPASS,
|
|
mmd->flag & GP_SIMPLIFY_INVERT_MATERIAL)) {
|
|
return;
|
|
}
|
|
|
|
/* Select simplification mode. */
|
|
switch (mmd->mode) {
|
|
case GP_SIMPLIFY_FIXED: {
|
|
for (int i = 0; i < mmd->step; i++) {
|
|
BKE_gpencil_simplify_fixed(gps);
|
|
}
|
|
break;
|
|
}
|
|
case GP_SIMPLIFY_ADAPTIVE: {
|
|
/* simplify stroke using Ramer-Douglas-Peucker algorithm */
|
|
BKE_gpencil_simplify_stroke(gps, mmd->factor);
|
|
break;
|
|
}
|
|
case GP_SIMPLIFY_SAMPLE: {
|
|
BKE_gpencil_sample_stroke(gps, mmd->length, false);
|
|
break;
|
|
}
|
|
case GP_SIMPLIFY_MERGE: {
|
|
BKE_gpencil_merge_distance_stroke(gpf, gps, mmd->distance, true);
|
|
break;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void bakeModifier(struct Main *UNUSED(bmain),
|
|
Depsgraph *depsgraph,
|
|
GpencilModifierData *md,
|
|
Object *ob)
|
|
{
|
|
bGPdata *gpd = ob->data;
|
|
|
|
for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
|
|
for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) {
|
|
for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
|
|
deformStroke(md, depsgraph, ob, gpl, gpf, gps);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
GpencilModifierTypeInfo modifierType_Gpencil_Simplify = {
|
|
/* name */ "Simplify",
|
|
/* structName */ "SimplifyGpencilModifierData",
|
|
/* structSize */ sizeof(SimplifyGpencilModifierData),
|
|
/* type */ eGpencilModifierTypeType_Gpencil,
|
|
/* flags */ eGpencilModifierTypeFlag_SupportsEditmode,
|
|
|
|
/* copyData */ copyData,
|
|
|
|
/* deformStroke */ deformStroke,
|
|
/* generateStrokes */ NULL,
|
|
/* bakeModifier */ bakeModifier,
|
|
/* remapTime */ NULL,
|
|
|
|
/* initData */ initData,
|
|
/* freeData */ NULL,
|
|
/* isDisabled */ NULL,
|
|
/* updateDepsgraph */ NULL,
|
|
/* dependsOnTime */ NULL,
|
|
/* foreachObjectLink */ NULL,
|
|
/* foreachIDLink */ NULL,
|
|
/* foreachTexLink */ NULL,
|
|
};
|