[Bf-blender-cvs] [5a4dd8f7b93] soc-2019-npr: LANPR: make format
YimingWu
noreply at git.blender.org
Tue Jun 25 10:23:53 CEST 2019
Commit: 5a4dd8f7b936bad87101e67082636de1e2bc858e
Author: YimingWu
Date: Tue Jun 25 16:21:03 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB5a4dd8f7b936bad87101e67082636de1e2bc858e
LANPR: make format
===================================================================
M source/blender/blenkernel/intern/gpencil.c
M source/blender/draw/engines/lanpr/lanpr_access.c
M source/blender/draw/engines/lanpr/lanpr_access.h
M source/blender/draw/engines/lanpr/lanpr_all.h
M source/blender/draw/engines/lanpr/lanpr_chain.c
M source/blender/draw/engines/lanpr/lanpr_data_types.h
M source/blender/draw/engines/lanpr/lanpr_dpix.c
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/draw/engines/lanpr/lanpr_ops.c
M source/blender/draw/engines/lanpr/lanpr_util.h
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/makesrna/intern/rna_lanpr.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_featureline.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index afef9a8424f..8e544703f84 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1555,8 +1555,7 @@ bool BKE_gpencil_sample_stroke(bGPDstroke *gps, float dist)
i = 0;
float pressure, strength, *weights = NULL;
if (new_dv)
- weights = MEM_callocN(sizeof(float) * count,
- "gp_stroke_point_weights_sampled");
+ weights = MEM_callocN(sizeof(float) * count, "gp_stroke_point_weights_sampled");
// 1st point is always at the start
pt1 = &gps->points[0];
@@ -1592,12 +1591,12 @@ bool BKE_gpencil_sample_stroke(bGPDstroke *gps, float dist)
*/
i++;
if (next_point_index == 0)
- break; /* last point finished */
+ break; /* last point finished */
}
gps->points = new_pt;
gps->totpoints = i;
- MEM_freeN(pt); /* original */
+ MEM_freeN(pt); /* original */
if (new_dv) {
BKE_gpencil_free_stroke_weights(gps);
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.c b/source/blender/draw/engines/lanpr/lanpr_access.c
index e324d151172..28e8270ccf8 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.c
+++ b/source/blender/draw/engines/lanpr/lanpr_access.c
@@ -39,8 +39,13 @@ static BMVert *split_edge_and_move(BMesh *bm, BMEdge *edge, const float new_pos[
return vert;
}
-void lanpr_generate_gpencil_from_chain(
- Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDframe *gpf, int qi_begin, int qi_end, int material_nr)
+void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
+ Object *ob,
+ bGPDlayer *gpl,
+ bGPDframe *gpf,
+ int qi_begin,
+ int qi_end,
+ int material_nr)
{
Scene *scene = DEG_get_evaluated_scene(depsgraph);
LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared;
@@ -69,9 +74,9 @@ void lanpr_generate_gpencil_from_chain(
for (rlc = rb->chains.first; rlc; rlc = (LANPR_RenderLineChain *)rlc->item.next) {
if (!rlc->object_ref)
- continue; /* XXX: intersection lines are lost */
+ continue; /* XXX: intersection lines are lost */
- if (rlc->level>qi_end || rlc->level<qi_begin)
+ if (rlc->level > qi_end || rlc->level < qi_begin)
continue;
if (ob && &ob->id != rlc->object_ref->id.orig_id)
@@ -88,8 +93,8 @@ void lanpr_generate_gpencil_from_chain(
stroke_data[array_idx] = rlci->gpos[0];
stroke_data[array_idx + 1] = rlci->gpos[1];
stroke_data[array_idx + 2] = rlci->gpos[2];
- stroke_data[array_idx + 3] = 1; /* thickness */
- stroke_data[array_idx + 4] = opatity; /* hardness? */
+ stroke_data[array_idx + 3] = 1; /* thickness */
+ stroke_data[array_idx + 4] = opatity; /* hardness? */
array_idx += 5;
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.h b/source/blender/draw/engines/lanpr/lanpr_access.h
index d4ec4cc3075..ac99975ad06 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -10,8 +10,13 @@
typedef struct LANPR_RenderLineChain LANPR_RenderLineChain;
-void lanpr_generate_gpencil_from_chain(
- Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDframe *gpf, int qi_begin, int qi_end, int material_nr);
+void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
+ Object *ob,
+ bGPDlayer *gpl,
+ bGPDframe *gpf,
+ int qi_begin,
+ int qi_end,
+ int material_nr);
void lanpr_update_data_for_external(Depsgraph *depsgraph);
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h b/source/blender/draw/engines/lanpr/lanpr_all.h
index f772f310ced..e04ef61c93c 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -104,9 +104,9 @@ typedef struct LANPR_SharedResource {
int init_complete;
SpinLock render_flag_lock;
- int during_render; /* get/set using access funcion which uses render_flag_lock to lock. */
- /* this prevents duplicate too much resource. (no render preview in viewport */
- /* while rendering) */
+ int during_render; /* get/set using access funcion which uses render_flag_lock to lock. */
+ /* this prevents duplicate too much resource. (no render preview in viewport */
+ /* while rendering) */
} LANPR_SharedResource;
@@ -191,11 +191,11 @@ typedef struct LANPR_PrivateData {
float zfar;
float znear;
- int stage; /* thinning */
+ int stage; /* thinning */
float *line_result;
unsigned char *line_result_8bit;
- int width, height; /* if not match recreate buffer. */
+ int width, height; /* if not match recreate buffer. */
void **sample_table;
ListBase pending_samples;
@@ -289,7 +289,7 @@ typedef struct LANPR_RenderTaskInfo {
typedef struct LANPR_RenderBuffer {
struct LANPR_RenderBuffer *prev, *next;
- int is_copied; /* for render. */
+ int is_copied; /* for render. */
int w, h;
int tile_size_w, tile_size_h;
@@ -394,7 +394,7 @@ typedef struct LANPR_BoundingArea {
real l, r, u, b;
real cx, cy;
- struct LANPR_BoundingArea *child; /* 1,2,3,4 quadrant */
+ struct LANPR_BoundingArea *child; /* 1,2,3,4 quadrant */
ListBase lp;
ListBase rp;
@@ -405,7 +405,7 @@ typedef struct LANPR_BoundingArea {
ListBase linked_triangles;
ListBase linked_lines;
- ListBase linked_chains; /* reserved for image space reduction && multithread chainning */
+ ListBase linked_chains; /* reserved for image space reduction && multithread chainning */
} LANPR_BoundingArea;
#define TNS_COMMAND_LINE 0
@@ -503,7 +503,7 @@ BLI_INLINE int lanpr_LineIntersectTest2d(
double x;
double y;
double Ratio;
- double xDiff = (a2[0] - a1[0]); /* +DBL_EPSILON; */
+ double xDiff = (a2[0] - a1[0]); /* +DBL_EPSILON; */
double xDiff2 = (b2[0] - b1[0]);
if (xDiff == 0) {
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c b/source/blender/draw/engines/lanpr/lanpr_chain.c
index 3ca10a4931d..9b414794ead 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -214,7 +214,7 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
rlc = lanpr_create_render_line_chain(rb);
- rlc->object_ref = rl->object_ref; /* can only be the same object in a chain. */
+ rlc->object_ref = rl->object_ref; /* can only be the same object in a chain. */
int r1, r2, c1, c2, row, col;
LANPR_RenderLine *new_rl = rl;
@@ -346,7 +346,8 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
ba = lanpr_get_point_bounding_area(rb, rl->r->fbcoord[0], rl->r->fbcoord[1]);
new_rv = rl->r;
/* below already done in step 2 */
- /* lanpr_push_render_line_chain_point(rb,rlc,new_rv->fbcoord[0],new_rv->fbcoord[1],rl->flags,0); */
+ /* lanpr_push_render_line_chain_point(rb,rlc,new_rv->fbcoord[0],new_rv->fbcoord[1],rl->flags,0);
+ */
while (ba && (new_rl = lanpr_get_connected_render_line(ba, new_rv, &new_rv))) {
new_rl->flags |= LANPR_EDGE_FLAG_CHAIN_PICKED;
@@ -429,10 +430,14 @@ LANPR_BoundingArea *lanpr_get_point_bounding_area_recursive(LANPR_RenderBuffer *
/* LANPR_BoundingArea* ch = root->child; */
/* #define IN_BOUND(ba,rlci)\ */
/* ba.l<=rlci->pos[0] && ba.r>=rlci->pos[0] && ba.b<=rlci->pos[1] && ba.u>=rlci->pos[1] */
- /* if (IN_BOUND(ch[0],rlci)) return lanpr_get_point_bounding_area_recursive(rb,&ch[0],rlci); */
- /* else if(IN_BOUND(ch[1],rlci)) return lanpr_get_point_bounding_area_recursive(rb,&ch[1],rlci); */
- /* else if(IN_BOUND(ch[2],rlci)) return lanpr_get_point_bounding_area_recursive(rb,&ch[2],rlci); */
- /* else if(IN_BOUND(ch[3],rlci)) return lanpr_get_point_bounding_area_recursive(rb,&ch[3],rlci); */
+ /* if (IN_BOUND(ch[0],rlci)) return
+ * lanpr_get_point_bounding_area_recursive(rb,&ch[0],rlci); */
+ /* else if(IN_BOUND(ch[1],rlci)) return
+ * lanpr_get_point_bounding_area_recursive(rb,&ch[1],rlci); */
+ /* else if(IN_BOUND(ch[2],rlci)) return
+ * lanpr_get_point_bounding_area_recursive(rb,&ch[2],rlci); */
+ /* else if(IN_BOUND(ch[3],rlci)) return
+ * lanpr_get_point_bounding_area_recursive(rb,&ch[3],rlci); */
/* #undef IN_BOUND */
/* } */
/* return NULL; */
@@ -447,7 +452,8 @@ LANPR_BoundingArea *lanpr_get_end_point_bounding_area(LANPR_RenderBuffer *rb,
}
/* if reduction threshold is even larger than a small bounding area, */
/* then 1) geometry is simply too dense. */
-/* 2) probably need to add it to root bounding area which has larger surface area then it will */
+/* 2) probably need to add it to root bounding area which has larger surface area then it
+ * will */
/* cover typical threshold values. */
void lanpr_link_point_with_bounding_area_recursive(LANPR_RenderBuffer *rb,
LANPR_BoundingArea *root,
@@ -467,10 +473,12 @@ void lanpr_link_point_with_bounding_area_recursive(LANPR_RenderBuffer *rb,
/* ba.l<=rlci->pos[0] && ba.r>=rlci->pos[0] && ba.b<=rlci->pos[1] && ba.u>=rlci->pos[1] */
/* if (IN_BOUND(ch[0],rlci)) */
/* lanpr_link_point_with_bounding_area_recursive(rb,&ch[0],rlc,rlci); else */
- /* if(IN_BOUND(ch[1],rlci)) lanpr_link_point_with_bounding_area_recursive(rb,&ch[1],rlc,rlci); */
+ /* if(IN_BOUND(ch[1],rlci)) lanpr_link_point_with_bounding_area_recursive(rb,&ch[1],rlc,rlci);
+ */
/* else if(IN_BOUND(ch[2],rlci)) */
/* lanpr_link_point_with_bounding_area_recursive(rb,&ch[2],rlc,rlci); else */
- /* if(IN_BOUND(ch[3],rlci)) lanpr_link_point_with_bounding_area_recursive(rb,&ch[3],rlc,rlci); */
+ /* if(IN_BOUND(ch[
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list