[Bf-blender-cvs] [22b9b8167ed] temp-gpencil-io: GPencil: Remove unused code

Antonio Vazquez noreply at git.blender.org
Tue Jan 19 17:37:23 CET 2021


Commit: 22b9b8167edd8d9e22554caf5b813c25c5d16759
Author: Antonio Vazquez
Date:   Mon Jan 18 16:25:54 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rB22b9b8167edd8d9e22554caf5b813c25c5d16759

GPencil: Remove unused code

===================================================================

M	source/blender/blenkernel/BKE_gpencil_geom.h
M	source/blender/blenkernel/intern/gpencil_geom.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_gpencil_geom.h b/source/blender/blenkernel/BKE_gpencil_geom.h
index 2eb5315ba47..33c1e7dd9dd 100644
--- a/source/blender/blenkernel/BKE_gpencil_geom.h
+++ b/source/blender/blenkernel/BKE_gpencil_geom.h
@@ -183,12 +183,6 @@ struct bGPDstroke *BKE_gpencil_stroke_perimeter_from_view(struct RegionView3D *r
                                                           struct bGPDstroke *gps,
                                                           int subdivisions,
                                                           float diff_mat[4][4]);
-struct bGPDstroke *BKE_gpencil_stroke_perimeter_from_view_2d(struct ARegion *region,
-                                                             const struct bGPdata *gpd,
-                                                             const struct bGPDlayer *gpl,
-                                                             struct bGPDstroke *gps,
-                                                             int subdivisions,
-                                                             float diff_mat[4][4]);
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/blenkernel/intern/gpencil_geom.c b/source/blender/blenkernel/intern/gpencil_geom.c
index 77a205e622c..0b189fd6ce4 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@ -3936,87 +3936,4 @@ bGPDstroke *BKE_gpencil_stroke_perimeter_from_view(struct RegionView3D *rv3d,
 
   return perimeter_stroke;
 }
-
-#if 0
-/**
- * Calculates the perimeter of a stroke projected from the view and
- * returns it as a flat 2D stroke.
- * \param subdivisions: Number of subdivions for the start and end caps
- * \return: bGPDstroke pointer to stroke perimeter
- */
-bGPDstroke *BKE_gpencil_stroke_perimeter_from_view_2d(struct ARegion *region,
-                                                      const bGPdata *gpd,
-                                                      const bGPDlayer *gpl,
-                                                      bGPDstroke *gps,
-                                                      int subdivisions,
-                                                      float diff_mat[4][4])
-{
-  if (gps->totpoints == 0) {
-    return NULL;
-  }
-  RegionView3D *rv3d = (RegionView3D *)region->regiondata;
-  bGPDstroke *gps_cpy = BKE_gpencil_stroke_duplicate(gps, true);
-  BKE_gpencil_stroke_to_view_space(rv3d, gps_cpy, diff_mat);
-
-  int num_perimeter_points = 0;
-  ListBase *perimeter_points = gpencil_stroke_perimeter_ex(
-      gpd, gpl, gps_cpy, subdivisions, &num_perimeter_points);
-
-  if (num_perimeter_points == 0) {
-    return NULL;
-  }
-
-  /* create new stroke */
-  bGPDstroke *perimeter_stroke = BKE_gpencil_stroke_new(gps->mat_nr, num_perimeter_points, 1);
-
-  tPerimeterPoint *curr = perimeter_points->first;
-  for (int i = 0; i < num_perimeter_points; i++) {
-    bGPDspoint *pt = &perimeter_stroke->points[i];
-
-    // float vec4[3];
-    // copy_v4_v4();
-    // const float scalar = (vec4[3] != 0.0f) ? (1.0f / vec4[3]) : 0.0f;
-    // const float fx = ((float)region->winx / 2.0f) * (1.0f + (vec4[0] * scalar));
-    // const float fy = ((float)region->winy / 2.0f) * (1.0f + (vec4[1] * scalar));
-
-    copy_v3_v3(&pt->x, &curr->x);
-
-    /* Set pressure to zero and strength to one */
-    pt->pressure = 0.0f;
-    pt->strength = 1.0f;
-
-    pt->flag |= GP_SPOINT_SELECT;
-
-    curr = curr->next;
-  }
-
-  BKE_gpencil_stroke_from_view_space(rv3d, perimeter_stroke, diff_mat);
-  for (int i = 0; i < num_perimeter_points; i++) {
-    bGPDspoint *pt = &perimeter_stroke->points[i];
-    float parent_co[3];
-    mul_v3_m4v3(parent_co, diff_mat, &pt->x);
-    float screen_co[2];
-    //  eV3DProjTest test = (eV3DProjTest)(V3D_PROJ_RET_CLIP_BB | V3D_PROJ_RET_CLIP_WIN);
-    eV3DProjTest test = (eV3DProjTest)(V3D_PROJ_RET_OK);
-    if (ED_view3d_project_float_global(region, parent_co, screen_co, test) == V3D_PROJ_RET_OK) {
-      if (!ELEM(V2D_IS_CLIPPED, screen_co[0], screen_co[1])) {
-        copy_v2_v2(&pt->x, screen_co);
-        pt->z = 0.0f;
-      }
-    }
-  }
-
-  /* free temp data */
-  BLI_freelistN(perimeter_points);
-  MEM_freeN(perimeter_points);
-  BKE_gpencil_free_stroke(gps_cpy);
-
-  /* triangles cache needs to be recalculated */
-  BKE_gpencil_stroke_geometry_update(perimeter_stroke);
-
-  perimeter_stroke->flag |= GP_STROKE_SELECT | GP_STROKE_CYCLIC | GP_STROKE_2DSPACE;
-
-  return perimeter_stroke;
-}
-#endif
 /** \} */



More information about the Bf-blender-cvs mailing list