GPencil: New Shrinkwrap modifier

his new modifier is equals to the existing mesh modifier but adapted to grease pencil.

The underlying functions used to calculate the shrink are the same used in meshes.

{F11794101}

Reviewed By: pepeland, HooglyBoogly

Differential Revision: https://developer.blender.org/D13192

1 files changed, 57 insertions, 1 deletions

diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index 339714da255..f7964e1f2fa 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -28,6 +28,7 @@ extern "C" {
 #endif
 
 struct LatticeDeformData;
+struct ShrinkwrapTreeData;
 
 /* WARNING ALERT! TYPEDEF VALUES ARE WRITTEN IN FILES! SO DO NOT CHANGE!
  * (ONLY ADD NEW ITEMS AT THE END)
@@ -58,6 +59,7 @@ typedef enum GpencilModifierType {
   eGpencilModifierType_WeightProximity = 21,
   eGpencilModifierType_Dash = 22,
   eGpencilModifierType_WeightAngle = 23,
+  eGpencilModifierType_Shrinkwrap = 24,
   /* Keep last. */
   NUM_GREASEPENCIL_MODIFIER_TYPES,
 } GpencilModifierType;
@@ -728,7 +730,7 @@ typedef struct SmoothGpencilModifierData {
   int pass_index;
   /** Several flags. */
   int flag;
-  /** Factor of noise. */
+  /** Factor of smooth. */
   float factor;
   /** How many times apply smooth. */
   int step;
@@ -1073,6 +1075,60 @@ typedef struct LineartGpencilModifierData {
 
 } LineartGpencilModifierData;
 
+typedef struct ShrinkwrapGpencilModifierData {
+  GpencilModifierData modifier;
+  /** Shrink target. */
+  struct Object *target;
+  /** Additional shrink target. */
+  struct Object *aux_target;
+  /** Material for filtering. */
+  struct Material *material;
+  /** Layer name. */
+  char layername[64];
+  /** Optional vertexgroup filter name, MAX_VGROUP_NAME. */
+  char vgname[64];
+  /** Custom index for passes. */
+  int pass_index;
+  /** Flags. */
+  int flag;
+  /** Custom index for passes. */
+  int layer_pass;
+  /** Distance offset to keep from mesh/projection point. */
+  float keep_dist;
+  /** Shrink type projection. */
+  short shrink_type;
+  /** Shrink options. */
+  char shrink_opts;
+  /** Shrink to surface mode. */
+  char shrink_mode;
+  /** Limit the projection ray cast. */
+  float proj_limit;
+  /** Axis to project over. */
+  char proj_axis;
+
+  /** If using projection over vertex normal this controls the level of subsurface that must be
+   * done before getting the vertex coordinates and normal
+   */
+  char subsurf_levels;
+  char _pad[6];
+  /** Factor of smooth. */
+  float smooth_factor;
+  /** How many times apply smooth. */
+  int smooth_step;
+
+  /** Runtime only. */
+  struct ShrinkwrapTreeData *cache_data;
+} ShrinkwrapGpencilModifierData;
+
+typedef enum eShrinkwrapGpencil_Flag {
+  GP_SHRINKWRAP_INVERT_LAYER = (1 << 0),
+  GP_SHRINKWRAP_INVERT_PASS = (1 << 1),
+  GP_SHRINKWRAP_INVERT_LAYERPASS = (1 << 3),
+  GP_SHRINKWRAP_INVERT_MATERIAL = (1 << 4),
+  /* Keep next bit as is to be equals to mesh modifier flag to reuse functions. */
+  GP_SHRINKWRAP_INVERT_VGROUP = (1 << 6),
+} eShrinkwrapGpencil_Flag;
+
 #ifdef __cplusplus
 }
 #endif