Commit: 483d5d7c9363cebd43524a4559748bfea0a73fb8
Author: Nick Wu
Date: Tue Jul 24 15:30:06 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB483d5d7c9363cebd43524a4559748bfea0a73fb8
Fixed c function and glsl file names.
===================================================================
M release/scripts/startup/bl_ui/properties_scene.py
M source/blender/draw/CMakeLists.txt
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_engine.c
M source/blender/draw/engines/lanpr/lanpr_ops.c
R100 source/blender/draw/engines/lanpr/shaders/lanpr_atlas_preview.fragment
source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl
R100 source/blender/draw/engines/lanpr/shaders/lanpr_atlas_preview.geometry
source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl
R100
source/blender/draw/engines/lanpr/shaders/lanpr_atlas_project_clip.fragment
source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl
R100
source/blender/draw/engines/lanpr/shaders/lanpr_atlas_project_passthrough.vertex
source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_passthrough_vert.glsl
R100 source/blender/draw/engines/lanpr/shaders/lanpr_snake_edge.fragment
source/blender/draw/engines/lanpr/shaders/lanpr_snake_edge_frag.glsl
R100 source/blender/draw/engines/lanpr/shaders/lanpr_image_peel.fragment
source/blender/draw/engines/lanpr/shaders/lanpr_snake_image_peel_frag.glsl
R100
source/blender/draw/engines/lanpr/shaders/lanpr_line_connection.fragment
source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_frag.glsl
R100
source/blender/draw/engines/lanpr/shaders/lanpr_line_connection.geometry
source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_geom.glsl
R100 source/blender/draw/engines/lanpr/shaders/lanpr_line_connection.vertex
source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_vert.glsl
R100
source/blender/draw/engines/lanpr/shaders/lanpr_snake_multichannel.fragment
source/blender/draw/engines/lanpr/shaders/lanpr_snake_multichannel_frag.glsl
R100 source/blender/draw/engines/lanpr/shaders/lanpr_software_chain.geometry
source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl
R100
source/blender/draw/engines/lanpr/shaders/lanpr_software_line_width.geometry
source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
R100
source/blender/draw/engines/lanpr/shaders/lanpr_software_scale_compensate.vertex
source/blender/draw/engines/lanpr/shaders/lanpr_software_passthrough_vert.glsl
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_scene.py
b/release/scripts/startup/bl_ui/properties_scene.py
index a95ed107725..e142397a5fc 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -626,7 +626,7 @@ class SCENE_PT_lanpr(SceneButtonsPanel, Panel):
layout.label(text="RUN:")
layout.operator("scene.lanpr_calculate", icon='RENDER_STILL')
layout.label(text="Layer Composition:")
- layout.template_list("LANPR_linesets", "", lanpr, "layers",
lanpr.layers, "active_layer_index", rows=rows)
+ layout.template_list("LANPR_linesets", "", lanpr, "layers",
lanpr.layers, "active_layer_index", rows=4)
if active_layer:
split = layout.split()
col = split.column()
diff --git a/source/blender/draw/CMakeLists.txt
b/source/blender/draw/CMakeLists.txt
index 1ed2b724f7a..75031fabc9f 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -240,19 +240,19 @@
data_to_c_simple(engines/workbench/shaders/workbench_volume_vert.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_volume_frag.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_world_light_lib.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_preview.geometry SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_preview.fragment SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_project_clip.fragment SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_project_passthrough.vertex
SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_image_peel.fragment SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_line_connection.vertex SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_line_connection.geometry SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_line_connection.fragment SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_snake_edge.fragment SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_snake_multichannel.fragment SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_software_line_width.geometry SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_software_scale_compensate.vertex
SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_software_chain.geometry SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_passthrough_vert.glsl
SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_snake_image_peel_frag.glsl SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_vert.glsl
SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_geom.glsl
SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_frag.glsl
SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_snake_edge_frag.glsl SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_snake_multichannel_frag.glsl SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_software_passthrough_vert.glsl
SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_software_chain_geom.glsl SRC)
data_to_c_simple(modes/shaders/common_globals_lib.glsl SRC)
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h
b/source/blender/draw/engines/lanpr/lanpr_all.h
index b9e5c9d3e30..4d0e59a982b 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -766,7 +766,7 @@ __inline void tMatVectorConvert3fd(tnsVector3f from,
tnsVector3d to) {
}
-int lanpr_PointInsideTrianglef(tnsVector2d v, tnsVector2d v0, tnsVector2d v1,
tnsVector2d v2);
+int lanpr_point_inside_triangled(tnsVector2d v, tnsVector2d v0, tnsVector2d
v1, tnsVector2d v2);
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);
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c
b/source/blender/draw/engines/lanpr/lanpr_chain.c
index fbbea5b5578..8eead84b30f 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -26,12 +26,12 @@
#include <math.h>
-int lanpr_GetLineBoundingAreas(LANPR_RenderBuffer *rb, LANPR_RenderLine *rl,
int *RowBegin, int *RowEnd, int *ColBegin, int *ColEnd);
-LANPR_BoundingArea* lanpr_GetPointBoundingArea(LANPR_RenderBuffer *rb, real x,
real y);
+int lanpr_get_line_bounding_areas(LANPR_RenderBuffer *rb, LANPR_RenderLine
*rl, int *RowBegin, int *RowEnd, int *ColBegin, int *ColEnd);
+LANPR_BoundingArea* lanpr_get_point_bounding_area(LANPR_RenderBuffer *rb, real
x, real y);
#define LANPR_OTHER_RV(rl,rv) ((rv) == (rl)->L?(rl)->R:(rl)->L)
-LANPR_RenderLine* lanpr_GetConnectedRenderLine(LANPR_BoundingArea* ba,
LANPR_RenderVert* rv, LANPR_RenderVert** new_rv) {
+LANPR_RenderLine* lanpr_get_connected_render_line(LANPR_BoundingArea* ba,
LANPR_RenderVert* rv, LANPR_RenderVert** new_rv) {
nListItemPointer* lip;
LANPR_RenderLine* nrl;
real cosine;
@@ -65,7 +65,7 @@ LANPR_RenderLine*
lanpr_GetConnectedRenderLine(LANPR_BoundingArea* ba, LANPR_Ren
return 0;
}
-int lanpr_GetNearByRenderLine(LANPR_BoundingArea* ba, LANPR_RenderLine* rl){
+int lanpr_get_nearby_render_line(LANPR_BoundingArea* ba, LANPR_RenderLine* rl){
// hold on
}
@@ -140,7 +140,7 @@ void
lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain* rlc, LANPR_
}
-void lanpr_ChainFeatureLines_NO_THREAD(LANPR_RenderBuffer *rb, float
dist_threshold){
+void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb, float
dist_threshold){
LANPR_RenderLineChain* rlc;
LANPR_RenderLineChainItem* rlci;
LANPR_RenderLine* rl;
@@ -160,11 +160,11 @@ void lanpr_ChainFeatureLines_NO_THREAD(LANPR_RenderBuffer
*rb, float dist_thresh
LANPR_RenderVert* new_rv;
// step 1: grow left
- ba = lanpr_GetPointBoundingArea(rb,rl->L->FrameBufferCoord[0],
rl->L->FrameBufferCoord[1]);
+ ba = lanpr_get_point_bounding_area(rb,rl->L->FrameBufferCoord[0],
rl->L->FrameBufferCoord[1]);
new_rv = rl->L;
rls = rl->Segments.pFirst;
lanpr_push_render_line_chain_point(rb,rlc,new_rv->FrameBufferCoord[0],new_rv->FrameBufferCoord[1],rl->Flags,
rls->OcclusionLevel);
- while(ba &&(new_rl = lanpr_GetConnectedRenderLine(ba,new_rv,&new_rv))){
+ while(ba &&(new_rl =
lanpr_get_connected_render_line(ba,new_rv,&new_rv))){
new_rl->Flags |= LANPR_EDGE_FLAG_CHAIN_PICKED;
int last_occlusion;
@@ -189,7 +189,7 @@ void lanpr_ChainFeatureLines_NO_THREAD(LANPR_RenderBuffer
*rb, float dist_thresh
}
lanpr_push_render_line_chain_point(rb,rlc,
new_rl->R->FrameBufferCoord[0], new_rl->R->FrameBufferCoord[1],
new_rl->Flags,last_occlusion);
}
- ba = lanpr_GetPointBoundingArea(rb,new_rv->FrameBufferCoord[0],
new_rv->FrameBufferCoord[1]);
+ ba = lanpr_get_point_bounding_area(rb,new_rv->FrameBufferCoord[0],
new_rv->FrameBufferCoord[1]);
}
// step 2: this line
@@ -203,11 +203,11 @@ void lanpr_ChainFeatureLines_NO_THREAD(LANPR_RenderBuffer
*rb, float dist_thresh
lanpr_append_render_line_chain_point(rb, rlc,
rl->R->FrameBufferCoord[0], rl->R->FrameBufferCoord[1], rl->Flags, 0);
// step 3: grow right
- ba = lanpr_GetPointBoundingArea(rb,rl->R->FrameBufferCoord[0],
rl->R->FrameBufferCoord[1]);
+ ba = lanpr_get_point_bounding_area(rb,rl->R->FrameBufferCoord[0],
rl->R->FrameBufferCoord[1]);
new_rv = rl->R;
// below already done in step 2
//
lanpr_push_render_line_chain_point(rb,rlc,new_rv->FrameBufferCoord[0],new_rv->FrameBufferCoord[1],rl->Flags,0);
- while(ba && (new_rl =
lanpr_GetConnectedRenderLine(ba,new_rv,&new_rv))){
+ while(ba && (new_rl =
lanpr_get_connected_render_line(ba,new_rv,&new_rv))){
new_rl->Flags |= LANPR_EDGE_FLAG_CHAIN_PICKED;
int last_occlusion;
@@ -243,7 +243,7 @@ void lanpr_ChainFeatureLines_NO_THREAD(LANPR_RenderBuffer
*rb, float dist_thresh
}
lanpr_append_render_line_chain_point(rb, rlc,
new_rl->R->FrameBufferCoord[0], new_rl->R->FrameBufferCoord[1], new_rl->Flags,
0);
}
- ba = lanpr_GetPointBoundingArea(rb,
new_rv->FrameBufferCoord[0], new_rv->FrameBufferCoord[1]);
+ ba = lanpr_get_point_bounding_area(rb,
new_rv->FrameBufferCoord[0], new_rv->FrameBufferCoord[1]);
}
//LANPR_RenderLineChainItem* rlci;
@@ -257,7 +257,7 @@ void lanpr_ChainFeatureLines_NO_THREAD(LANPR_RenderBuffer
*rb, float dist_thresh
}
}
-int lanpr_CountChain(LANPR_RenderLineChain* rlc){
+int lanpr_count_chain(LANPR_RenderLineChain* rlc){
LANPR_RenderLineChainItem* rlci;
int Count = 0;
for (rlci = rlc->Chain.pFirst; rlci; rlci = rlci->Item.pNext) {
@@ -266,7 +266,7 @@ int lanpr_CountChain(LANPR_RenderLineChain* rlc){
return Count;
}
-float lanpr_ComputeChainLength(LANPR_RenderLineChain* rlc, float* lengths, int
begin_index) {
+float lanpr_compute_chain_length(LANPR_RenderLineChain* rlc, float* lengths,
int begin_index) {
LANPR_RenderLineChainItem* rlci;
int i=0;
float offset_accum = 0;
@@ -285,7 +285,7 @@ float lanpr_ComputeChainLength(LANPR_RenderLineChain* rlc,
float* lengths, int b
return offset_accum;
}
-int lanpr_GetGPULineType(LANPR_RenderLineChainItem* rlci) {
+int lanpr_get_gpu_line_type(LANPR_RenderLineChainItem* rlci) {
switch (rlci->LineType) {
case LANPR_EDGE_FLAG_CONTOUR: return 0;
case LANPR_EDGE_FLAG_CREASE: return 1;
@@ -296,7 +296,7 @@ int lanpr_GetGPULineType(LANPR_RenderLineChainItem* rlci) {
}
}
-void lanpr_ChainGenerateDrawCommand(LANPR_RenderBuffer *rb){
+void lanpr_chain_generate_draw_command(LANPR_RenderBuffer *rb){
LANPR_RenderLineChain* rlc;
LANPR_RenderLineChainItem* rlci;
int vert_count=0;
@@ -318,7 +318,7 @@ void lanpr_ChainGenerateDrawCommand(LANPR_Ren
@@ 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
