[Bf-blender-cvs] [185d319ea36] soc-2019-npr: LANPR: Comment changed into C style.
YimingWu
noreply at git.blender.org
Tue Jun 25 06:40:09 CEST 2019
Commit: 185d319ea36ead4cd0bf75f3878feb71252a2803
Author: YimingWu
Date: Tue Jun 25 12:39:39 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB185d319ea36ead4cd0bf75f3878feb71252a2803
LANPR: Comment changed into C style.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_access.c
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.c
M source/blender/draw/engines/lanpr/lanpr_util.h
M source/blender/makesrna/intern/rna_lanpr.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/modifiers/intern/MOD_featureline.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.c b/source/blender/draw/engines/lanpr/lanpr_access.c
index d1873e77b11..74dc6e9938d 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.c
+++ b/source/blender/draw/engines/lanpr/lanpr_access.c
@@ -29,7 +29,7 @@ extern LANPR_SharedResource lanpr_share;
static BMVert *split_edge_and_move(BMesh *bm, BMEdge *edge, const float new_pos[3])
{
- // Split edge one time and move the created vert to new_pos
+ /* Split edge one time and move the created vert to new_pos */
BMVert *vert;
vert = bmesh_kernel_split_edge_make_vert(bm, edge->v1, edge, NULL);
@@ -60,7 +60,7 @@ void lanpr_generate_gpencil_from_chain(
unit_m4(mat);
- // Split countour lines at occlution points and deselect occluded segment
+ /* Split countour lines at occlution points and deselect occluded segment */
LANPR_RenderLine *rl;
LANPR_RenderLineSegment *rls, *irls;
@@ -69,7 +69,7 @@ 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)
continue;
@@ -84,12 +84,12 @@ void lanpr_generate_gpencil_from_chain(
float *stroke_data = BLI_array_alloca(stroke_data, count * GP_PRIM_DATABUF_SIZE);
for (rlci = rlc->chain.first; rlci; rlci = (LANPR_RenderLineChainItem *)rlci->item.next) {
- float opatity = 1.0f; //rlci->occlusion ? 0.0f : 1.0f;
+ float opatity = 1.0f; /* rlci->occlusion ? 0.0f : 1.0f; */
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;
}
@@ -132,7 +132,7 @@ void lanpr_copy_data(Scene *from, Scene *to)
}
}
- // render_buffer now only accessible from lanpr_share
+ /* render_buffer now only accessible from lanpr_share */
}
void lanpr_free_everything(Scene *s)
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h b/source/blender/draw/engines/lanpr/lanpr_all.h
index 271f9227391..f772f310ced 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -30,7 +30,7 @@
#include "lanpr_data_types.h"
#include "BLI_mempool.h"
#include "BLI_utildefines.h"
-//#include "GPU_framebuffer.h"
+/* #include "GPU_framebuffer.h" */
#include "GPU_batch.h"
#include "GPU_framebuffer.h"
#include "GPU_shader.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;
@@ -181,7 +181,7 @@ typedef struct LANPR_PrivateData {
DRWShadingGroup *debug_shgrp;
- // snake
+ /* snake */
float normal_clamp;
float normal_strength;
@@ -191,18 +191,18 @@ 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;
ListBase erased_samples;
ListBase line_strips;
- // dpix data
+ /* dpix data */
void *atlas_pl;
void *atlas_pr;
@@ -222,7 +222,7 @@ typedef struct LANPR_PrivateData {
float dpix_znear;
float dpix_zfar;
- // drawing
+ /* drawing */
unsigned v_buf;
unsigned i_buf;
@@ -265,7 +265,7 @@ typedef struct LANPR_Data {
#define TNS_CALCULATION_FINISHED 100
typedef struct LANPR_RenderTaskInfo {
- // thrd_t ThreadHandle;
+ /* thrd_t ThreadHandle; */
int thread_id;
@@ -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;
@@ -319,7 +319,7 @@ typedef struct LANPR_RenderBuffer {
Material *material_pointers[2048];
- // render status
+ /* render status */
int cached_for_frame;
@@ -361,7 +361,7 @@ typedef struct LANPR_RenderBuffer {
SpinLock cs_data;
SpinLock cs_management;
- // settings
+ /* settings */
int max_occlusion_level;
real crease_angle;
@@ -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
@@ -417,9 +417,9 @@ typedef struct LANPR_BoundingArea {
#define TNS_OVERRIDE_ONLY 0
#define TNS_OVERRIDE_EXCLUDE 1
-//#define TNS_OVERRIDE_ALL_OTHERS_OUTSIDE_GROUP 2
-//#define TNS_OVERRIDE_ALL_OTHERS_IN_GROUP 3
-//#define TNS_OVERRIDE_ALL_OTHERS 4
+/* #define TNS_OVERRIDE_ALL_OTHERS_OUTSIDE_GROUP 2 */
+/* #define TNS_OVERRIDE_ALL_OTHERS_IN_GROUP 3 */
+/* #define TNS_OVERRIDE_ALL_OTHERS 4 */
#define tnsLinearItp(l, r, T) ((l) * (1.0f - (T)) + (r) * (T))
@@ -443,8 +443,8 @@ typedef struct LANPR_BoundingArea {
#define TNS_DOUBLE_CLOSE_ENOUGH(a, b) (((a) + DBL_EDGE_LIM) >= (b) && ((a)-DBL_EDGE_LIM) <= (b))
-//#define TNS_DOUBLE_CLOSE_ENOUGH(a,b)\
-// //(((a)+0.00000000001)>=(b) && ((a)-0.0000000001)<=(b))
+/* #define TNS_DOUBLE_CLOSE_ENOUGH(a,b)\ */
+/* //(((a)+0.00000000001)>=(b) && ((a)-0.0000000001)<=(b)) */
#define TNS_FLOAT_CLOSE_ENOUGH_WIDER(a, b) (((a) + 0.0000001) >= (b) && ((a)-0.0000001) <= (b))
@@ -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) {
@@ -551,7 +551,7 @@ BLI_INLINE int lanpr_LineIntersectTest2d(
}
BLI_INLINE double lanpr_GetLineZ(tnsVector3d l, tnsVector3d r, real Ratio)
{
- // double z = 1 / tnsLinearItp(1 / l[2], 1 / r[2], Ratio);
+ /* double z = 1 / tnsLinearItp(1 / l[2], 1 / r[2], Ratio); */
double z = tnsLinearItp(l[2], r[2], Ratio);
return z;
}
@@ -559,7 +559,7 @@ BLI_INLINE double lanpr_GetLineZPoint(tnsVector3d l, tnsVector3d r, tnsVector3d
{
double ra = (FromL[0] - l[0]) / (r[0] - l[0]);
return tnsLinearItp(l[2], r[2], ra);
- // return 1 / tnsLinearItp(1 / l[2], 1 / r[2], r);
+ /* return 1 / tnsLinearItp(1 / l[2], 1 / r[2], r); */
}
BLI_INLINE double lanpr_GetLinearRatio(tnsVector3d l, tnsVector3d r, tnsVector3d FromL)
{
@@ -695,9 +695,9 @@ real lanpr_LinearInterpolate(real l, real r, real T);
void lanpr_LinearInterpolate2dv(real *l, real *r, real T, real *Result);
void lanpr_LinearInterpolate3dv(real *l, real *r, real T, real *Result);
-// functions
+/* functions */
-// dpix
+/* dpix */
void lanpr_init_atlas_inputs(void *ved);
void lanpr_destroy_atlas(void *ved);
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c b/source/blender/draw/engines/lanpr/lanpr_chain.c
index af636a87b96..3ca10a4931d 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -50,9 +50,9 @@ LANPR_RenderLine *lanpr_get_connected_render_line(LANPR_BoundingArea *ba,
if ((!(nrl->flags & LANPR_EDGE_FLAG_ALL_TYPE)) || (nrl->flags & LANPR_EDGE_FLAG_CHAIN_PICKED))
continue;
- // always chain connected lines for now.
- // simplification will take care of the sharp points.
- // if(cosine whatever) continue;
+ /* always chain connected lines for now. */
+ /* simplification will take care of the sharp points. */
+ /* if(cosine whatever) continue; */
if (rv != nrl->l && rv != nrl->r) {
if (nrl->flags & LANPR_EDGE_FLAG_INTERSECTION) {
@@ -77,7 +77,7 @@ LANPR_RenderLine *lanpr_get_connected_render_line(LANPR_BoundingArea *ba,
int lanpr_get_nearby_render_line(LANPR_BoundingArea *ba, LANPR_RenderLine *rl)
{
- // hold on
+ /* hold on */
return 1;
}
@@ -115,7 +115,7 @@ LANPR_RenderLineChainItem *lanpr_append_render_line_chain_point(LANPR_RenderBuff
rlci->occlusion = level;
BLI_addtail(&rlc->chain, rlci);
- // printf("a %f,%f %d\n", x, y, level);
+ /* printf("a %f,%f %d\n", x, y, level); */
return rlci;
}
@@ -144,12 +144,12 @@ LANPR_RenderLineChainItem *lanpr_push_render_line_chain_point(LANPR_RenderBuffer
rlci->occlusion = level;
BLI_addhead(&rlc->chain, rlci);
- // printf("data %f,%f %d\n", x, y, level);
+ /* printf("data %f,%f %d\n", x, y, level); */
return rlci;
}
-// refer to http://karthaus.nl/rdp/ for description
+/* refer to http://karthaus.nl/rdp/ for description */
void lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain *rlc,
LANPR_RenderLineChainItem *from,
LANPR_RenderLineChainItem *to,
@@ -160,7 +160,7 @@ void lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain *rlc,
float max_dist = 0;
LANPR_RenderLineChainItem *max_rlc
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list