Commit: 19d3c5f9a6bf765c255e4e9513a8e0d86b6674cf
Author: YimingWu
Date: Tue May 28 21:09:32 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB19d3c5f9a6bf765c255e4e9513a8e0d86b6674cf
Continue renaming structure variables.
===================================================================
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_ops.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h
b/source/blender/draw/engines/lanpr/lanpr_all.h
index c0ffa67e3c1..e5533cce986 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -267,32 +267,32 @@ typedef struct LANPR_RenderTaskInfo {
struct LANPR_RenderBuffer *render_buffer;
int thread_id;
- struct nListItemPointer *contour;
- ListBase contour_pointers;
+ LinkData *contour;
+ ListBase contour_pointers;
- struct nListItemPointer *intersection;
- ListBase intersection_pointers;
+ LinkData *intersection;
+ ListBase intersection_pointers;
- struct nListItemPointer *crease;
- ListBase crease_pointers;
+ LinkData *crease;
+ ListBase crease_pointers;
- struct nListItemPointer *material;
- ListBase material_pointers;
+ LinkData *material;
+ ListBase material_pointers;
- struct nListItemPointer *edge_mark;
- ListBase edge_mark_pointers;
+ LinkData *edge_mark;
+ ListBase edge_mark_pointers;
} LANPR_RenderTaskInfo;
typedef struct LANPR_RenderBuffer {
struct LANPR_RenderBuffer *prev, *next;
- int w, h;
- int tile_size_w, tile_size_h;
- int tile_count_x, tile_count_y;
- real width_per_tile, height_per_tile;
- tnsMatrix44d view_projection;
- tnsMatrix44d vp_inverse;
+ int w, h;
+ int tile_size_w, tile_size_h;
+ int tile_count_x, tile_count_y;
+ real width_per_tile, height_per_tile;
+ tnsMatrix44d view_projection;
+ tnsMatrix44d vp_inverse;
int output_mode;
int output_aa_level;
@@ -300,52 +300,52 @@ typedef struct LANPR_RenderBuffer {
struct LANPR_BoundingArea *initial_bounding_areas;
u32bit bounding_area_count;
- ListBase vertex_buffer_pointers;
- ListBase line_buffer_pointers;
- ListBase triangle_buffer_pointers;
- ListBase all_render_lines;
+ ListBase vertex_buffer_pointers;
+ ListBase line_buffer_pointers;
+ ListBase triangle_buffer_pointers;
+ ListBase all_render_lines;
- ListBase intersecting_vertex_buffer;
+ ListBase intersecting_vertex_buffer;
- struct GPUBatch *DPIXIntersectionTransformBatch;
- struct GPUBatch *DPIXIntersectionBatch;
+ struct GPUBatch *DPIXIntersectionTransformBatch;
+ struct GPUBatch *DPIXIntersectionBatch;
/* use own-implemented one */
nStaticMemoryPool render_data_pool;
- Material *material_pointers[2048];
+ Material *material_pointers[2048];
//render status
- int cached_for_frame;
+ int cached_for_frame;
- real view_vector[3];
+ real view_vector[3];
- int triangle_size;
+ int triangle_size;
u32bit contour_count;
u32bit contour_processed;
- nListItemPointer *contour_managed;
+ LinkData *contour_managed;
ListBase contours;
u32bit intersection_count;
u32bit intersection_processed;
- nListItemPointer *intersection_managed;
+ LinkData *intersection_managed;
ListBase intersection_lines;
u32bit crease_count;
u32bit crease_processed;
- nListItemPointer *crease_managed;
+ LinkData *crease_managed;
ListBase crease_lines;
u32bit material_line_count;
u32bit material_processed;
- nListItemPointer *material_managed;
+ LinkData *material_managed;
ListBase material_lines;
u32bit edge_mark_count;
u32bit edge_mark_processed;
- nListItemPointer *edge_mark_managed;
+ LinkData *edge_mark_managed;
ListBase edge_marks;
ListBase chains;
@@ -388,25 +388,25 @@ typedef struct LANPR_RenderBuffer {
#define TNS_CULL_USED 1
typedef struct LANPR_RenderTriangle {
- nListItem Item;
+ Link Item;
struct LANPR_RenderVert *V[3];
struct LANPR_RenderLine *RL[3];
- real GN[3];
- real GC[3];
+ real gn[3];
+ real gc[3];
//struct BMFace *F;
- short MaterialID;
- ListBase IntersectingVerts;
- char CullStatus;
- struct LANPR_RenderTriangle *Testing; //Should Be tRT**
Testing[NumOfThreads]
+ short material_id;
+ ListBase intersecting_verts;
+ char cull_status;
+ struct LANPR_RenderTriangle *testing; //Should Be tRT**
testing[NumOfThreads]
}LANPR_RenderTriangle;
typedef struct LANPR_RenderTriangleThread {
struct LANPR_RenderTriangle Base;
- struct LANPR_RenderLine *Testing[127]; //max thread support;
+ struct LANPR_RenderLine *testing[127]; //max thread support;
}LANPR_RenderTriangleThread;
typedef struct LANPR_RenderElementLinkNode {
- nListItem Item;
+ Link Item;
void *Pointer;
int ElementCount;
void *ObjectRef;
@@ -414,14 +414,14 @@ typedef struct LANPR_RenderElementLinkNode {
}LANPR_RenderElementLinkNode;
typedef struct LANPR_RenderLineSegment {
- nListItem Item;
+ Link Item;
real at; // at==0: left at==1: right
u8bit OcclusionLevel; // after "at" point
short MaterialMaskMark; // e.g. to determine lines beind a glass
window material.
}LANPR_RenderLineSegment;
typedef struct LANPR_RenderVert {
- nListItem Item;
+ Link Item;
real GLocation[4];
real FrameBufferCoord[4];
int FrameBufferCoordi[2];
@@ -445,26 +445,26 @@ typedef struct LANPR_RenderVert {
#define LANPR_EDGE_FLAG_ALL_TYPE 0x3f
typedef struct LANPR_RenderLine {
- nListItem Item;
+ Link Item;
struct LANPR_RenderVert *L, *R;
struct LANPR_RenderTriangle *TL, *TR;
ListBase Segments;
//tnsEdge* Edge;//should be edge material
- //tnsRenderTriangle* Testing;//Should Be tRT** Testing[NumOfThreads]
struct Materil *MaterialRef;
+ //tnsRenderTriangle* testing;//Should Be tRT** testing[NumOfThreads]
struct Materil *MaterialRef;
char MinOcclude;
char Flags; // also for line type determination on chainning
struct Object *ObjectRef;
}LANPR_RenderLine;
typedef struct LANPR_RenderLineChain {
- nListItem Item;
+ Link Item;
ListBase Chain;
//int SegmentCount; // we count before draw cmd.
float Length; // calculated before draw cmd.
}LANPR_RenderLineChain;
typedef struct LANPR_RenderLineChainItem {
- nListItem Item;
+ Link Item;
float pos[3]; // need z value for fading
float normal[3];
char LineType; // style of [1] style of [2]
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c
b/source/blender/draw/engines/lanpr/lanpr_chain.c
index 117fe15988a..27b9c52e4a9 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -32,12 +32,12 @@ LANPR_BoundingArea
*lanpr_get_point_bounding_area(LANPR_RenderBuffer *rb, real x
#define LANPR_OTHER_RV(rl, rv) ((rv) == (rl)->L ? (rl)->R : (rl)->L)
LANPR_RenderLine *lanpr_get_connected_render_line(LANPR_BoundingArea *ba,
LANPR_RenderVert *rv, LANPR_RenderVert **new_rv) {
- nListItemPointer *lip;
+ LinkData *lip;
LANPR_RenderLine *nrl;
real cosine;
- for (lip = ba->LinkedLines.first; lip; lip = lip->pNext) {
- nrl = lip->p;
+ for (lip = ba->LinkedLines.first; lip; lip = lip->next) {
+ nrl = lip->data;
if ((!(nrl->Flags & LANPR_EDGE_FLAG_ALL_TYPE)) || (nrl->Flags &
LANPR_EDGE_FLAG_CHAIN_PICKED)) continue;
@@ -107,7 +107,7 @@ LANPR_RenderLineChainItem
*lanpr_push_render_line_chain_point(LANPR_RenderBuffer
rlci->OcclusionLevel = level;
BLI_addhead(&rlc->Chain, rlci);
- //printf("p %f,%f %d\n", x, y, level);
+ //printf("data %f,%f %d\n", x, y, level);
return rlci;
}
@@ -120,8 +120,8 @@ void
lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain *rlc, LANPR_
LANPR_RenderLineChainItem *max_rlci = 0;
// find the max distance item
- for (rlci = from->Item.pNext; rlci != to; rlci = next_rlci) {
- next_rlci = rlci->Item.pNext;
+ for (rlci = from->Item.next; rlci != to; rlci = next_rlci) {
+ next_rlci = rlci->Item.next;
if (next_rlci && (next_rlci->OcclusionLevel !=
rlci->OcclusionLevel || next_rlci->LineType != rlci->LineType)) continue;
@@ -131,16 +131,16 @@ void
lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain *rlc, LANPR_
}
if (!max_rlci) {
- if (from->Item.pNext == to) return;
- for (rlci = from->Item.pNext; rlci != to; rlci = next_rlci) {
- next_rlci = rlci->Item.pNext;
+ if (from->Item.next == to) return;
+ for (rlci = from->Item.next; rlci != to; rlci = next_rlci) {
+ next_rlci = rlci->Item.next;
if (next_rlci && (next_rlci->OcclusionLevel !=
rlci->OcclusionLevel || next_rlci->LineType != rlci->LineType)) continue;
BLI_remlink(&rlc->Chain, (void *)rlci);
}
}
else {
- if (from->Item.pNext != max_rlci)
lanpr_reduce_render_line_chain_recursive(rlc, from, max_rlci, dist_threshold);
- if (to->Item.pPrev != max_rlci)
lanpr_reduce_render_line_chain_recursive(rlc, max_rlci, to, dist_threshold);
+ if (from->Item.next != max_rlci)
lanpr_reduce_render_line_chain_recursive(rlc, from, max_rlci, dist_threshold);
+ if (to->Item.prev != max_rlci)
lanpr_reduce_render_line_chain_recursive(rlc, max_rlci, to, dist_threshold);
}
}
@@ -152,7 +152,7 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer
*rb, float dist_thre
LANPR_BoundingArea *ba;
LANPR_RenderLineSegment *rls;
- for (rl = rb->all_render_lines.first; rl; rl = rl->Item.pNext) {
+ for (rl = rb->all_render_lines.first; rl; rl = rl->Item.next) {
if ((!(rl->Flags & LANPR_EDGE_FLAG_ALL_TYPE)) || (rl->Flags &
LANPR_EDGE_FLAG_CHAIN_PICKED)) continue;
@@ -166,14 +166,14 @@ void
lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb, float dist_thre
float N[3] = { 0 };
if (rl->TL) {
- N[0] += rl->TL->GN[0];
- N[1] += rl->TL->GN[1];
- N[2] += rl->TL->GN[2];
+ N[0] += rl->TL->gn[0];
+ N[1] += rl->TL->gn[1];
+ N[2] += rl->TL->gn[2];
}
if (rl->TR) {
- N[0] += rl->TR->GN[0];
- N[1] += rl->TR->GN[1];
- N[2] += rl->TR->GN[2];
+ N[0] += rl->TR->gn[0];
+ N[1] += rl->TR->gn[1];
+ N[2] += rl->TR->gn[2];
}
if (rl->TL || rl->TR) {
normalize_v3(N);
@@ -191,21 +191,21 @@ void
lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb, float dist_thre
N[0] = N[1] = N[2] = 0;
if (new_rl->TL) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
