[Bf-blender-cvs] [e22c86cbc32] lanpr-under-gp: LineArt: Cleanup function names into _lineart_category_operation() format.
YimingWu
noreply at git.blender.org
Tue Jul 21 11:11:08 CEST 2020
Commit: e22c86cbc3228c5f23ce6c8d977045fbe96f5d4a
Author: YimingWu
Date: Tue Jul 21 17:10:47 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBe22c86cbc3228c5f23ce6c8d977045fbe96f5d4a
LineArt: Cleanup function names into _lineart_category_operation() format.
===================================================================
M source/blender/blenkernel/intern/constraint.c
M source/blender/editors/include/ED_lineart.h
M source/blender/editors/lineart/lineart_chain.c
M source/blender/editors/lineart/lineart_cpu.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 2ef32895db9..ce38a509a4d 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -781,7 +781,7 @@ static void default_get_tarmat_full_bbone(struct Depsgraph *UNUSED(depsgraph),
* really just to help this code easier to read)
*/
// TODO: cope with getting rotation order...
-#define SINGLETARGETNS_GET_TARS(con, datatar, ct, list) \
+#define SINGLETARGELRT_GET_TARS(con, datatar, ct, list) \
{ \
ct = MEM_callocN(sizeof(bConstraintTarget), "tempConstraintTarget"); \
\
@@ -824,7 +824,7 @@ static void default_get_tarmat_full_bbone(struct Depsgraph *UNUSED(depsgraph),
* (Hopefully all compilers will be happy with the lines with just a space on them. Those are
* really just to help this code easier to read)
*/
-#define SINGLETARGETNS_FLUSH_TARS(con, datatar, ct, list, no_copy) \
+#define SINGLETARGELRT_FLUSH_TARS(con, datatar, ct, list, no_copy) \
{ \
if (ct) { \
bConstraintTarget *ctn = ct->next; \
@@ -1325,7 +1325,7 @@ static int followpath_get_tars(bConstraint *con, ListBase *list)
bConstraintTarget *ct;
/* standard target-getting macro for single-target constraints without subtargets */
- SINGLETARGETNS_GET_TARS(con, data->tar, ct, list);
+ SINGLETARGELRT_GET_TARS(con, data->tar, ct, list);
return 1;
}
@@ -1340,7 +1340,7 @@ static void followpath_flush_tars(bConstraint *con, ListBase *list, bool no_copy
bConstraintTarget *ct = list->first;
/* the following macro is used for all standard single-target constraints */
- SINGLETARGETNS_FLUSH_TARS(con, data->tar, ct, list, no_copy);
+ SINGLETARGELRT_FLUSH_TARS(con, data->tar, ct, list, no_copy);
}
}
@@ -3584,7 +3584,7 @@ static int clampto_get_tars(bConstraint *con, ListBase *list)
bConstraintTarget *ct;
/* standard target-getting macro for single-target constraints without subtargets */
- SINGLETARGETNS_GET_TARS(con, data->tar, ct, list);
+ SINGLETARGELRT_GET_TARS(con, data->tar, ct, list);
return 1;
}
@@ -3599,7 +3599,7 @@ static void clampto_flush_tars(bConstraint *con, ListBase *list, bool no_copy)
bConstraintTarget *ct = list->first;
/* the following macro is used for all standard single-target constraints */
- SINGLETARGETNS_FLUSH_TARS(con, data->tar, ct, list, no_copy);
+ SINGLETARGELRT_FLUSH_TARS(con, data->tar, ct, list, no_copy);
}
}
@@ -3984,7 +3984,7 @@ static int shrinkwrap_get_tars(bConstraint *con, ListBase *list)
bShrinkwrapConstraint *data = con->data;
bConstraintTarget *ct;
- SINGLETARGETNS_GET_TARS(con, data->target, ct, list);
+ SINGLETARGELRT_GET_TARS(con, data->target, ct, list);
return 1;
}
@@ -3998,7 +3998,7 @@ static void shrinkwrap_flush_tars(bConstraint *con, ListBase *list, bool no_copy
bShrinkwrapConstraint *data = con->data;
bConstraintTarget *ct = list->first;
- SINGLETARGETNS_FLUSH_TARS(con, data->target, ct, list, no_copy);
+ SINGLETARGELRT_FLUSH_TARS(con, data->target, ct, list, no_copy);
}
}
@@ -4405,7 +4405,7 @@ static int splineik_get_tars(bConstraint *con, ListBase *list)
bConstraintTarget *ct;
/* standard target-getting macro for single-target constraints without subtargets */
- SINGLETARGETNS_GET_TARS(con, data->tar, ct, list);
+ SINGLETARGELRT_GET_TARS(con, data->tar, ct, list);
return 1;
}
@@ -4420,7 +4420,7 @@ static void splineik_flush_tars(bConstraint *con, ListBase *list, bool no_copy)
bConstraintTarget *ct = list->first;
/* the following macro is used for all standard single-target constraints */
- SINGLETARGETNS_FLUSH_TARS(con, data->tar, ct, list, no_copy);
+ SINGLETARGELRT_FLUSH_TARS(con, data->tar, ct, list, no_copy);
}
}
diff --git a/source/blender/editors/include/ED_lineart.h b/source/blender/editors/include/ED_lineart.h
index fe5a6f8b1dd..242c33fcbd4 100644
--- a/source/blender/editors/include/ED_lineart.h
+++ b/source/blender/editors/include/ED_lineart.h
@@ -392,21 +392,21 @@ typedef struct LineartBoundingArea {
ListBase linked_chains;
} LineartBoundingArea;
-#define TNS_TILE(tile, r, c, CCount) tile[r * CCount + c]
+#define LRT_TILE(tile, r, c, CCount) tile[r * CCount + c]
-#define TNS_CLAMP(a, Min, Max) a = a < Min ? Min : (a > Max ? Max : a)
+#define LRT_CLAMP(a, Min, Max) a = a < Min ? Min : (a > Max ? Max : a)
-#define TNS_MAX3_INDEX(a, b, c) (a > b ? (a > c ? 0 : (b > c ? 1 : 2)) : (b > c ? 1 : 2))
+#define LRT_MAX3_INDEX(a, b, c) (a > b ? (a > c ? 0 : (b > c ? 1 : 2)) : (b > c ? 1 : 2))
-#define TNS_MIN3_INDEX(a, b, c) (a < b ? (a < c ? 0 : (b < c ? 1 : 2)) : (b < c ? 1 : 2))
+#define LRT_MIN3_INDEX(a, b, c) (a < b ? (a < c ? 0 : (b < c ? 1 : 2)) : (b < c ? 1 : 2))
-#define TNS_MAX3_INDEX_ABC(x, y, z) (x > y ? (x > z ? a : (y > z ? b : c)) : (y > z ? b : c))
+#define LRT_MAX3_INDEX_ABC(x, y, z) (x > y ? (x > z ? a : (y > z ? b : c)) : (y > z ? b : c))
-#define TNS_MIN3_INDEX_ABC(x, y, z) (x < y ? (x < z ? a : (y < z ? b : c)) : (y < z ? b : c))
+#define LRT_MIN3_INDEX_ABC(x, y, z) (x < y ? (x < z ? a : (y < z ? b : c)) : (y < z ? b : c))
-#define TNS_ABC(index) (index == 0 ? a : (index == 1 ? b : c))
+#define LRT_ABC(index) (index == 0 ? a : (index == 1 ? b : c))
-#define TNS_DOUBLE_CLOSE_ENOUGH(a, b) (((a) + DBL_EDGE_LIM) >= (b) && ((a)-DBL_EDGE_LIM) <= (b))
+#define LRT_DOUBLE_CLOSE_ENOUGH(a, b) (((a) + DBL_EDGE_LIM) >= (b) && ((a)-DBL_EDGE_LIM) <= (b))
BLI_INLINE double tmat_get_linear_ratio(double l, double r, double from_l);
BLI_INLINE int lineart_LineIntersectTest2d(
@@ -483,27 +483,17 @@ void ED_lineart_destroy_render_data_external(void);
int ED_lineart_object_collection_usage_check(struct Collection *c, struct Object *o);
-void ED_lineart_NO_THREAD_chain_feature_lines(LineartRenderBuffer *rb);
-void ED_lineart_split_chains_for_fixed_occlusion(LineartRenderBuffer *rb);
-void ED_lineart_connect_chains(LineartRenderBuffer *rb, const int do_geometry_space);
-void ED_lineart_discard_short_chains(LineartRenderBuffer *rb, const float threshold);
-int ED_lineart_count_chain(const LineartRenderLineChain *rlc);
+void ED_lineart_chain_feature_lines(LineartRenderBuffer *rb);
+void ED_lineart_chain_split_for_fixed_occlusion(LineartRenderBuffer *rb);
+void ED_lineart_chain_connect(LineartRenderBuffer *rb, const int do_geometry_space);
+void ED_lineart_chain_discard_short(LineartRenderBuffer *rb, const float threshold);
+int ED_lineart_chain_count(const LineartRenderLineChain *rlc);
void ED_lineart_chain_clear_picked_flag(struct LineartRenderBuffer *rb);
-int ED_lineart_count_leveled_edge_segment_count(const ListBase *line_list,
- const struct LineartLineLayer *ll);
-void *ED_lineart_make_leveled_edge_vertex_array(struct LineartRenderBuffer *rb,
- const ListBase *line_list,
- float *vertex_array,
- float *normal_array,
- float **next_normal,
- const LineartLineLayer *ll,
- const float componet_id);
-
-void ED_lineart_calculation_set_flag(eLineartRenderStatus flag);
+void ED_lineart_calculation_flag_set(eLineartRenderStatus flag);
bool ED_lineart_calculation_flag_check(eLineartRenderStatus flag);
-void ED_lineart_modifier_sync_set_flag(eLineartModifierSyncStatus flag, bool is_from_modifier);
+void ED_lineart_modifier_sync_flag_set(eLineartModifierSyncStatus flag, bool is_from_modifier);
bool ED_lineart_modifier_sync_flag_check(eLineartModifierSyncStatus flag);
int ED_lineart_compute_feature_lines_internal(struct Depsgraph *depsgraph,
@@ -528,7 +518,7 @@ struct bGPDlayer;
struct bGPDframe;
struct GpencilModifierData;
-void ED_lineart_generate_gpencil_from_chain(struct Depsgraph *depsgraph,
+void ED_lineart_gpencil_generate_from_chain(struct Depsgraph *depsgraph,
struct Object *ob,
struct bGPDlayer *UNUSED(gpl),
struct bGPDframe *gpf,
@@ -539,18 +529,18 @@ void ED_lineart_generate_gpencil_from_chain(struct Depsgraph *depsgraph,
int types,
short thickness,
float opacity);
-void ED_generate_strokes_direct(struct Depsgraph *depsgraph,
- struct Object *ob,
- struct bGPDlayer *gpl,
- struct bGPDframe *gpf,
- char source_type,
- void *source_reference,
- int level_start,
- int level_end,
- int mat_nr,
- short line_types,
- short thickness,
- float opacity);
+void ED_lineart_gpencil_generate_strokes_direct(struct Depsgraph *depsgraph,
+ struct Object *ob,
+ struct bGPDlayer *gpl,
+ struct bGPDframe *gpf,
+ char source_type,
+ void *source_reference,
+ int level_start,
+ int level_end,
+ int mat_nr,
+ short line_types,
+ short thickness,
+ float opacity);
struct bContext;
@@ -565,7 +555,7 @@ void ED_lineart_update_render_progress(int nr, const char *info);
void ED_lineart_calc
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list