[Bf-blender-cvs] [37cc7063c7c] soc-2019-npr: Fixing LANPR structure naming to blender's style
YimingWu
noreply at git.blender.org
Tue May 28 15:15:53 CEST 2019
Commit: 37cc7063c7c6fa29f73b84ca7c8b012f7a90db4f
Author: YimingWu
Date: Tue May 28 20:52:17 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB37cc7063c7c6fa29f73b84ca7c8b012f7a90db4f
Fixing LANPR structure naming to blender's style
===================================================================
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_dpix.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 a1e0fe92afb..c0ffa67e3c1 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -264,142 +264,123 @@ typedef struct LANPR_Data {
typedef struct LANPR_RenderTaskInfo {
//thrd_t ThreadHandle;
- struct LANPR_RenderBuffer *RenderBuffer;
- int ThreadID;
+ struct LANPR_RenderBuffer *render_buffer;
+ int thread_id;
- struct nListItemPointer *Contour;
- ListBase ContourPointers;
+ struct nListItemPointer *contour;
+ ListBase contour_pointers;
- struct nListItemPointer *Intersection;
- ListBase IntersectionPointers;
+ struct nListItemPointer *intersection;
+ ListBase intersection_pointers;
- struct nListItemPointer *Crease;
- ListBase CreasePointers;
+ struct nListItemPointer *crease;
+ ListBase crease_pointers;
- struct nListItemPointer *Material;
- ListBase MaterialPointers;
+ struct nListItemPointer *material;
+ ListBase material_pointers;
- struct nListItemPointer *EdgeMark;
- ListBase EdgeMarkPointers;
+ struct nListItemPointer *edge_mark;
+ ListBase edge_mark_pointers;
} LANPR_RenderTaskInfo;
typedef struct LANPR_RenderBuffer {
struct LANPR_RenderBuffer *prev, *next;
- //nSafeString* Name;
+ 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;
- //tnsFrameBuffer* FrameBuffer;
- //now we move frame buffer content here
- int W, H;
- int SubPixelSample;//1,2,3,4, Use Squared Value.
- int TileSizeW, TileSizeH;
- int TileCountX, TileCountY;
- real WidthPerTile, HeightPerTile;
- tnsMatrix44d ViewProjection;
- tnsMatrix44d VPInverse;
+ int output_mode;
+ int output_aa_level;
- nSafeString *OutputFolder; //end with a slash;
- nSafeString *ImagePrefix;
- nSafeString *ImageNameConnector;
+ struct LANPR_BoundingArea *initial_bounding_areas;
+ u32bit bounding_area_count;
- int OutputMode;
- int OutputAALevel;
+ ListBase vertex_buffer_pointers;
+ ListBase line_buffer_pointers;
+ ListBase triangle_buffer_pointers;
+ ListBase all_render_lines;
- struct LANPR_BoundingArea *InitialBoundingAreas;
- u32bit BoundingAreaCount;
- //u32bit BaVBO;
- //u32bit BaFillVBO;
-
- ListBase VertexBufferPointers;
- ListBase LineBufferPointers;
- ListBase TriangleBufferPointers;
- ListBase AllRenderLines;
-
- ListBase IntersectingVertexBuffer;
+ ListBase intersecting_vertex_buffer;
struct GPUBatch *DPIXIntersectionTransformBatch;
struct GPUBatch *DPIXIntersectionBatch;
/* use own-implemented one */
- nStaticMemoryPool RenderDataPool;
+ nStaticMemoryPool render_data_pool;
- Material *MaterialPointers[2048];
+ Material *material_pointers[2048];
//render status
- int cached_for_frame;
+ int cached_for_frame;
- real ViewVector[3];
+ real view_vector[3];
- int TriangleSize;
+ int triangle_size;
- u32bit ContourCount;
- u32bit ContourProcessed;
- nListItemPointer *ContourManaged;
- ListBase Contours;
+ u32bit contour_count;
+ u32bit contour_processed;
+ nListItemPointer *contour_managed;
+ ListBase contours;
- u32bit IntersectionCount;
- u32bit IntersectionProcessed;
- nListItemPointer *IntersectionManaged;
- ListBase IntersectionLines;
+ u32bit intersection_count;
+ u32bit intersection_processed;
+ nListItemPointer *intersection_managed;
+ ListBase intersection_lines;
- u32bit CreaseCount;
- u32bit CreaseProcessed;
- nListItemPointer *CreaseManaged;
- ListBase CreaseLines;
+ u32bit crease_count;
+ u32bit crease_processed;
+ nListItemPointer *crease_managed;
+ ListBase crease_lines;
- u32bit MaterialLineCount;
- u32bit MaterialProcessed;
- nListItemPointer *MaterialManaged;
- ListBase MaterialLines;
+ u32bit material_line_count;
+ u32bit material_processed;
+ nListItemPointer *material_managed;
+ ListBase material_lines;
- u32bit EdgeMarkCount;
- u32bit EdgeMarkProcessed;
- nListItemPointer *EdgeMarkManaged;
- ListBase EdgeMarks;
+ u32bit edge_mark_count;
+ u32bit edge_mark_processed;
+ nListItemPointer *edge_mark_managed;
+ ListBase edge_marks;
- ListBase Chains;
- GPUBatch *ChainDrawBatch;
- DRWShadingGroup *ChainShgrp;
+ ListBase chains;
+ GPUBatch *chain_draw_batch;
- SpinLock csInfo;
- SpinLock csData;
- SpinLock csManagement;
-
- //settings
+ DRWShadingGroup *ChainShgrp;
- //int OutputTransparent;
- //real Backgroundcolor[4];
+ SpinLock cs_info;
+ SpinLock cs_data;
+ SpinLock cs_management;
- int MaxOccludeLevel;
- real CreaseAngle;
- real CreaseCos;
- int CreaseAllowOverride;
- int ThreadCount;
-
- real OverallProgress;
- int CalculationStatus;
-
- int DrawMaterialPreview;
- real MaterialTransparency;
+ //settings
- int ShowLine;
- int ShowFast;
- int ShowMaterial;
- int OverrideDisplay;
+ int max_occlusion_level;
+ real crease_angle;
+ real crease_cos;
+ int thread_count;
- //nListHandle DrawCommands; /* not used now */
+ real overall_progress;
+ int calculation_status;
- //tnsRenderBufferPreviewNode RenderPreview[32];
+ int draw_material_preview;
+ real material_transparency;
- struct Scene *Scene;
- struct Object *Camera;
+ int show_line;
+ int show_fast;
+ int show_material;
+ int override_display;
- int enable_intersections;
- int size;
+ struct Scene *scene;
+ struct Object *camera;
- //tnsRenderTriangles are in mesh object.
+ int enable_intersections;
+ int _pad;
+
}LANPR_RenderBuffer;
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c b/source/blender/draw/engines/lanpr/lanpr_chain.c
index f1bdaeefa74..117fe15988a 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -73,16 +73,16 @@ int lanpr_get_nearby_render_line(LANPR_BoundingArea *ba, LANPR_RenderLine *rl){
LANPR_RenderLineChain *lanpr_create_render_line_chain(LANPR_RenderBuffer *rb){
LANPR_RenderLineChain *rlc;
- rlc = mem_static_aquire(&rb->RenderDataPool, sizeof(LANPR_RenderLineChain));
+ rlc = mem_static_aquire(&rb->render_data_pool, sizeof(LANPR_RenderLineChain));
- BLI_addtail(&rb->Chains, rlc);
+ BLI_addtail(&rb->chains, rlc);
return rlc;
}
LANPR_RenderLineChainItem *lanpr_append_render_line_chain_point(LANPR_RenderBuffer *rb, LANPR_RenderLineChain *rlc, float x, float y, float* normal, char type, int level){
LANPR_RenderLineChainItem *rlci;
- rlci = mem_static_aquire(&rb->RenderDataPool, sizeof(LANPR_RenderLineChainItem));
+ rlci = mem_static_aquire(&rb->render_data_pool, sizeof(LANPR_RenderLineChainItem));
rlci->pos[0] = x;
rlci->pos[1] = y;
@@ -98,7 +98,7 @@ LANPR_RenderLineChainItem *lanpr_append_render_line_chain_point(LANPR_RenderBuff
LANPR_RenderLineChainItem *lanpr_push_render_line_chain_point(LANPR_RenderBuffer *rb, LANPR_RenderLineChain *rlc, float x, float y, float* normal, char type, int level){
LANPR_RenderLineChainItem *rlci;
- rlci = mem_static_aquire(&rb->RenderDataPool, sizeof(LANPR_RenderLineChainItem));
+ rlci = mem_static_aquire(&rb->render_data_pool, sizeof(LANPR_RenderLineChainItem));
rlci->pos[0] = x;
rlci->pos[1] = y;
@@ -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->AllRenderLines.first; rl; rl = rl->Item.pNext) {
+ for (rl = rb->all_render_lines.first; rl; rl = rl->Item.pNext) {
if ((!(rl->Flags & LANPR_EDGE_FLAG_ALL_TYPE)) || (rl->Flags & LANPR_EDGE_FLAG_CHAIN_PICKED)) continue;
@@ -355,7 +355,7 @@ void lanpr_chain_generate_draw_command(LANPR_RenderBuffer *rb){
GPUVertBuf *vbo = GPU_vertbuf_create_with_format(&format);
- for (rlc = rb->Chains.first; rlc; rlc = rlc->Item.pNext) {
+ for (rlc = rb->chains.first; rlc; rlc = rlc->Item.pNext) {
int count = lanpr_count_chain(rlc);
//printf("seg contains %d verts\n", count);
vert_count += count;
@@ -368,7 +368,7 @@ void lanpr_chain_generate_draw_command(LANPR_RenderBuffer *rb){
GPUIndexBufBuilder elb;
GPU_indexbuf_init_ex(&elb, GPU_PRIM_LINES_ADJ, vert_count * 4, vert_count, true);// elem count will not exceed vert_count
- for (rlc = rb->Chains.first; rlc; rlc = rlc->Item.pNext) {
+ for (rlc = rb->chains.first; rlc; rlc = rlc->Item.pNext) {
total_length = lanpr_compute_chain_length(rlc, lengths, i);
@@ -415,7 +415,7 @@ void lanpr_chain_generate_draw_command(LANPR_RenderBuffer *rb){
MEM_freeN(lengths);
- if (rb->ChainDrawBatch) GPU_batch_discard(rb->ChainDrawBatch);
- rb->ChainDrawBatch = GPU_batch_create_ex(GPU_PRIM_LINES_ADJ, vbo, GPU_indexbuf_build(&elb), GPU_USAGE_DYNAMIC | GPU_BATCH_OWNS_VBO);
+ if (rb->chain_draw_batch) GPU_batch_discard(rb->chain_draw_batch);
+ rb->chain_draw_batch = GPU_batch_create_ex(GPU_PRIM_LINES_ADJ, vbo, GPU_indexbuf_build(&elb), GPU_USAGE_DYNAMIC | GPU_BATCH_OWNS_VBO);
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index 782746df0ec..4583784e9ec 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -212,7 +212,7 @@ int lanpr_feed_atlas_data_intersection_cache(void *vedata,
if (!rb) return 0;
- for (lip = rb->IntersectionLines.first; lip; lip = lip->pNext) {
+ for (lip = rb->intersection_lines.first; lip; lip = lip->pNext) {
rl = lip->p;
idx = (begin_index + i) * 4;
@@ -313,7 +313,7 @@ void lanpr_create_atlas_intersection_preview(void *vedata, int begin_index) {
if (rb->DPIXIntersectionBatch) GPU_batch_discard(rb->DPIXIntersectionBatch);
rb->DPIXIntersectionBatch = 0;
- if (!rb->Inter
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list