Commit: 84c0f57d35c7985c53d4a280b1d5ca3053585f8d
Author: Nick Wu
Date: Mon Jul 16 14:29:21 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB84c0f57d35c7985c53d4a280b1d5ca3053585f8d
Code style fixes. Uncrustify processed.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_all.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_snake.c
M source/blender/draw/engines/lanpr/lanpr_util.c
M source/blender/makesdna/DNA_lanpr_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_lanpr.c
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h
b/source/blender/draw/engines/lanpr/lanpr_all.h
index 11fda8992dd..a54e0995986 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -307,8 +307,8 @@ typedef struct LANPR_RenderBuffer {
nListHandle IntersectingVertexBuffer;
- struct Gwn_Batch* DPIXIntersectionTransformBatch;
- struct Gwn_Batch* DPIXIntersectionBatch;
+ struct Gwn_Batch *DPIXIntersectionTransformBatch;
+ struct Gwn_Batch *DPIXIntersectionBatch;
/* use own-implemented one */
nStaticMemoryPool RenderDataPool;
@@ -379,8 +379,8 @@ typedef struct LANPR_RenderBuffer {
struct Scene *Scene;
struct Object *Camera;
- int calculate_intersections;
- int size;
+ int calculate_intersections;
+ int size;
//tnsRenderTriangles are in mesh object.
}LANPR_RenderBuffer;
@@ -778,14 +778,14 @@ int lanpr_feed_atlas_data_obj(void *vedata,
Object *ob, int BeginIndex);
int lanpr_feed_atlas_data_intersection_cache(void *vedata,
- float *AtlasPointsL, float *AtlasPointsR,
- float *AtlasFaceNormalL, float *AtlasFaceNormalR,
- float *AtlasEdgeMask,
- int BeginIndex);
+ float *AtlasPointsL, float
*AtlasPointsR,
+ float *AtlasFaceNormalL, float
*AtlasFaceNormalR,
+ float *AtlasEdgeMask,
+ int BeginIndex);
int lanpr_feed_atlas_trigger_preview_obj(void *vedata, Object *ob, int
BeginIndex);
-void lanpr_create_atlas_intersection_preview(void *vedata, int BeginIndex) ;
+void lanpr_create_atlas_intersection_preview(void *vedata, int BeginIndex);
-void lanpr_dpix_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl,
LANPR_PassList *psl, LANPR_PrivateData *pd, SceneLANPR *lanpr, GPUFrameBuffer*
DefaultFB);
+void lanpr_dpix_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl,
LANPR_PassList *psl, LANPR_PrivateData *pd, SceneLANPR *lanpr, GPUFrameBuffer
*DefaultFB);
-void lanpr_snake_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList
*fbl, LANPR_PassList *psl, LANPR_PrivateData *pd, SceneLANPR *lanpr,
GPUFrameBuffer* DefaultFB);
+void lanpr_snake_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList
*fbl, LANPR_PassList *psl, LANPR_PrivateData *pd, SceneLANPR *lanpr,
GPUFrameBuffer *DefaultFB);
diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c
b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index 416582ab8e4..f3a7a305e4f 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -213,18 +213,18 @@ int lanpr_feed_atlas_data_obj(void *vedata,
}
int lanpr_feed_atlas_data_intersection_cache(void *vedata,
- float *AtlasPointsL, float *AtlasPointsR,
- float *AtlasFaceNormalL, float *AtlasFaceNormalR,
- float *AtlasEdgeMask,
- int BeginIndex) {
+ float *AtlasPointsL, float
*AtlasPointsR,
+ float *AtlasFaceNormalL, float
*AtlasFaceNormalR,
+ float *AtlasEdgeMask,
+ int BeginIndex) {
LANPR_StorageList *stl = ((LANPR_Data *)vedata)->stl;
LANPR_PrivateData *pd = stl->g_data;
const DRWContextState *draw_ctx = DRW_context_state_get();
SceneLANPR *lanpr = &draw_ctx->scene->lanpr;
LANPR_RenderBuffer *rb = lanpr->render_buffer;
- nListItemPointer* lip;
- LANPR_RenderLine* rl;
- int i,idx;
+ nListItemPointer *lip;
+ LANPR_RenderLine *rl;
+ int i, idx;
i = 0;
@@ -232,7 +232,7 @@ int lanpr_feed_atlas_data_intersection_cache(void *vedata,
for (lip = rb->IntersectionLines.pFirst; lip; lip = lip->pNext) {
rl = lip->p;
-
+
idx = (BeginIndex + i) * 4;
AtlasEdgeMask[idx + 2] = 1; // channel B
@@ -255,7 +255,7 @@ int lanpr_feed_atlas_data_intersection_cache(void *vedata,
AtlasFaceNormalR[idx + 1] = 0;
AtlasFaceNormalR[idx + 2] = 1;
AtlasFaceNormalR[idx + 3] = 0;
-
+
i++;
}
@@ -328,7 +328,7 @@ void lanpr_create_atlas_intersection_preview(void *vedata,
int BeginIndex) {
if (!rb) return;
- if(rb->DPIXIntersectionBatch)
GWN_batch_discard(rb->DPIXIntersectionBatch);
+ if (rb->DPIXIntersectionBatch)
GWN_batch_discard(rb->DPIXIntersectionBatch);
rb->DPIXIntersectionBatch = 0;
if (!rb->IntersectionCount) return;
@@ -350,7 +350,7 @@ void lanpr_create_atlas_intersection_preview(void *vedata,
int BeginIndex) {
Gwn_VertBuf *vbo2 = GWN_vertbuf_create_with_format(&format2);
GWN_vertbuf_data_alloc(vbo2, rb->IntersectionCount);
- for (i=0;i<rb->IntersectionCount;i++) {
+ for (i = 0; i < rb->IntersectionCount; i++) {
lanpr_dpix_index_to_coord(i + BeginIndex, &co[0], &co[1]);
GWN_vertbuf_attr_set(vbo, attr_id.pos, i, co);
lanpr_dpix_index_to_coord_absolute(i + BeginIndex, &co[0],
&co[1]);
@@ -361,7 +361,7 @@ void lanpr_create_atlas_intersection_preview(void *vedata,
int BeginIndex) {
}
-void lanpr_dpix_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl,
LANPR_PassList *psl, LANPR_PrivateData *pd, SceneLANPR *lanpr, GPUFrameBuffer*
DefaultFB) {
+void lanpr_dpix_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl,
LANPR_PassList *psl, LANPR_PrivateData *pd, SceneLANPR *lanpr, GPUFrameBuffer
*DefaultFB) {
float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f};
float clear_depth = 1.0f;
uint clear_stencil = 0xFF;
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c
b/source/blender/draw/engines/lanpr/lanpr_engine.c
index af64aeee070..fa8cad44e43 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -286,8 +286,9 @@ static void lanpr_cache_init(void *vedata){
DRW_shgroup_call_add(stl->g_data->edge_thinning_shgrp, quad,
NULL);
}
- elif (lanpr->master_mode == LANPR_MASTER_MODE_DPIX &&
lanpr->active_layer) {
- LANPR_LineLayer* ll = lanpr->active_layer;
+ elif(lanpr->master_mode == LANPR_MASTER_MODE_DPIX &&
lanpr->active_layer)
+ {
+ LANPR_LineLayer *ll = lanpr->active_layer;
psl->dpix_transform_pass = DRW_pass_create("DPIX Transform
Stage", DRW_STATE_WRITE_COLOR);
stl->g_data->dpix_transform_shgrp =
DRW_shgroup_create(OneTime.dpix_transform_shader, psl->dpix_transform_pass);
DRW_shgroup_uniform_texture_ref(stl->g_data->dpix_transform_shgrp, "vert0_tex",
&txl->dpix_in_pl);
@@ -345,9 +346,10 @@ static void lanpr_cache_init(void *vedata){
pd->dpix_batch_list.first = pd->dpix_batch_list.last =
0;
BLI_mempool_clear(pd->mp_batch_list);
}
- }elif(lanpr->master_mode == LANPR_MASTER_MODE_SOFTWARE) {
+ } elif(lanpr->master_mode == LANPR_MASTER_MODE_SOFTWARE)
+ {
psl->software_pass = DRW_pass_create("Software Render Preview",
DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL);
- LANPR_LineLayer* ll;
+ LANPR_LineLayer *ll;
for (ll = lanpr->line_layers.first; ll; ll = ll->next) {
ll->shgrp = DRW_shgroup_create(OneTime.software_shader,
psl->software_pass);
DRW_shgroup_uniform_vec4(ll->shgrp, "color", ll->color,
1);
@@ -362,7 +364,7 @@ static void lanpr_cache_init(void *vedata){
DRW_shgroup_uniform_float(ll->shgrp,
"thickness_intersection", &ll->thickness_intersection, 1);
DRW_shgroup_uniform_vec4(ll->shgrp, "preview_viewport",
stl->g_data->dpix_viewport, 1);
DRW_shgroup_uniform_vec4(ll->shgrp, "output_viewport",
stl->g_data->output_viewport, 1);
- if(ll->batch) DRW_shgroup_call_add(ll->shgrp,
ll->batch, NULL);
+ if (ll->batch) DRW_shgroup_call_add(ll->shgrp,
ll->batch, NULL);
}
}
@@ -441,7 +443,7 @@ static void lanpr_cache_finish(void *vedata){
}
}
-static void lanpr_draw_scene_exec(void *vedata, GPUFrameBuffer* dfb) {
+static void lanpr_draw_scene_exec(void *vedata, GPUFrameBuffer *dfb) {
LANPR_PassList *psl = ((LANPR_Data *)vedata)->psl;
LANPR_TextureList *txl = ((LANPR_Data *)vedata)->txl;
LANPR_StorageList *stl = ((LANPR_Data *)vedata)->stl;
@@ -473,15 +475,17 @@ static void lanpr_draw_scene_exec(void *vedata,
GPUFrameBuffer* dfb) {
DRW_draw_pass(psl->color_pass);
lanpr_dpix_draw_scene(txl, fbl, psl, stl->g_data, lanpr, dfb);
}
- elif(lanpr->master_mode == LANPR_MASTER_MODE_SNAKE) {
+ elif(lanpr->master_mode == LANPR_MASTER_MODE_SNAKE)
+ {
DRW_draw_pass(psl->color_pass);
lanpr_snake_draw_scene(txl, fbl, psl, stl->g_data, lanpr, dfb);
}
- elif(lanpr->master_mode == LANPR_MASTER_MODE_SOFTWARE) {
+ elif(lanpr->master_mode == LANPR_MASTER_MODE_SOFTWARE)
+ {
GPU_framebuffer_bind(fbl->software_ms);
- GPU_framebuffer_clear(fbl->software_ms, clear_bits,
lanpr->background_color, clear_depth, clear_stencil);
+ GPU_framebuffer_clear(fbl->software_ms, clear_bits,
lanpr->background_color, clear_depth, clear_stencil);
int texw = GPU_texture_width(txl->ms_resolve_color), texh =
GPU_texture_height(txl->ms_resolve_color);;
pd->output_viewport[2] = scene->r.xsch;
@@ -494,7 +498,7 @@ static void lanpr_draw_scene_exec(void *vedata,
GPUFrameBuffer* dfb) {
//DRW_draw_pass(psl->color_pass);
DRW_draw_pass(psl->software_pass);
- GPU_framebuffer_blit(fbl->software_ms,0,dfb,0,GPU_COLOR_BIT);
+ GPU_framebuffer_blit(fbl->software_ms, 0, dfb, 0,
GPU_COLOR_BIT);
}
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c
b/source/blender/draw/engines/lanpr/lanpr_ops.c
index 5c413bb31fc..2f18f6e2bbd 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -710,7 +710,7 @@ void lanpr_CalculateSingleLineOcclusion(LANPR_RenderBuffer
*rb, LANPR_RenderLine
for (lip = nba->AssociatedTriangles.pFirst; lip; lip =
lip->pNext) {
rt = lip->p;
- if (rt->Testing[ThreadID] == rl || rl->L->IntersectWith
== (void*)rt || rl->R->IntersectWith == (void*)rt) continue;
+ if (rt->Testing[ThreadID] == rl || rl->L->IntersectWith
== (void *)rt || rl->R->IntersectWith == (void *)rt)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
