[Bf-blender-cvs] [8b9131bd753] temp-lanpr-staging: LANPR: LANPR_LineType::enabled => use.
YimingWu
noreply at git.blender.org
Wed Sep 4 09:05:02 CEST 2019
Commit: 8b9131bd753407d893173fedde342f573e56917e
Author: YimingWu
Date: Wed Sep 4 15:03:56 2019 +0800
Branches: temp-lanpr-staging
https://developer.blender.org/rB8b9131bd753407d893173fedde342f573e56917e
LANPR: LANPR_LineType::enabled => use.
===================================================================
M release/scripts/startup/bl_ui/properties_collection.py
M release/scripts/startup/bl_ui/properties_lanpr.py
M release/scripts/startup/bl_ui/properties_render.py
M source/blender/draw/engines/lanpr/lanpr_cpu.c
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl
M source/blender/editors/include/ED_lanpr.h
M source/blender/editors/lanpr/lanpr_cpu.c
M source/blender/makesrna/intern/rna_collection.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py
index 6393101fef3..5d93f8dc9d8 100644
--- a/release/scripts/startup/bl_ui/properties_collection.py
+++ b/release/scripts/startup/bl_ui/properties_collection.py
@@ -98,11 +98,11 @@ class COLLECTION_PT_lanpr_collection(CollectionButtonsPanel, Panel):
else:
layout.prop(lanpr,'level_start',text="Level")
- layout.prop(lanpr,'enable_contour')
- layout.prop(lanpr,'enable_crease')
+ layout.prop(lanpr,'use_contour')
+ layout.prop(lanpr,'use_crease')
layout.prop(lanpr,'enable_mark')
- layout.prop(lanpr,'enable_material')
- layout.prop(lanpr,'enable_intersection')
+ layout.prop(lanpr,'use_material')
+ layout.prop(lanpr,'use_intersection')
layout.prop(lanpr,'layer')
layout.prop(lanpr,'material')
diff --git a/release/scripts/startup/bl_ui/properties_lanpr.py b/release/scripts/startup/bl_ui/properties_lanpr.py
index 37c65640dbc..07e8f4a61e4 100644
--- a/release/scripts/startup/bl_ui/properties_lanpr.py
+++ b/release/scripts/startup/bl_ui/properties_lanpr.py
@@ -73,11 +73,11 @@ class OBJECT_PT_lanpr_settings(LanprButtonsPanel, Panel):
else:
layout.prop(md,'level_start', text="Level")
- layout.prop(md,'enable_contour')
- layout.prop(md,'enable_crease')
+ layout.prop(md,'use_contour')
+ layout.prop(md,'use_crease')
layout.prop(md,'enable_mark')
- layout.prop(md,'enable_material')
- layout.prop(md,'enable_intersection')
+ layout.prop(md,'use_material')
+ layout.prop(md,'use_intersection')
layout.prop(md,'enable_modifier_mark')
class OBJECT_PT_lanpr_modifier_target(LanprButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 5219ccaa344..73eefc9387c 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -826,7 +826,7 @@ class RENDER_PT_lanpr_layer_settings(RenderButtonsPanel, Panel):
lanpr_make_line_type(expand,layout,active_layer.edge_mark,"EdgeMark")
lanpr_make_line_type(expand,layout,active_layer.material_separate,"Material")
- if lanpr.enable_intersections:
+ if lanpr.use_intersections:
lanpr_make_line_type(expand,layout,active_layer.intersection,"Intersection")
else:
layout.label(text= "Intersection calculation disabled.")
@@ -1116,7 +1116,7 @@ class RENDER_PT_lanpr_options(RenderButtonsPanel, Panel):
if mode == "DPIX":
layout.prop(lanpr,"gpu_cache_size")
- layout.prop(lanpr,"enable_intersections")
+ layout.prop(lanpr,"use_intersections")
if scene.render.engine=='BLENDER_LANPR' and lanpr.master_mode=='SOFTWARE':
layout.prop(lanpr,"enable_chaining", text = "Chained Lines")
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index dd3a98c5d02..8043e50cc7e 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -97,19 +97,19 @@ static void lanpr_rebuild_render_draw_command(LANPR_RenderBuffer *rb, LANPR_Line
GPUVertBuf *vbo = GPU_vertbuf_create_with_format(&format);
- if (ll->contour.enabled) {
+ if (ll->contour.use) {
Count += lanpr_count_leveled_edge_segment_count(&rb->contours, ll);
}
- if (ll->crease.enabled) {
+ if (ll->crease.use) {
Count += lanpr_count_leveled_edge_segment_count(&rb->crease_lines, ll);
}
- if (ll->intersection.enabled) {
+ if (ll->intersection.use) {
Count += lanpr_count_leveled_edge_segment_count(&rb->intersection_lines, ll);
}
- if (ll->edge_mark.enabled) {
+ if (ll->edge_mark.use) {
Count += lanpr_count_leveled_edge_segment_count(&rb->edge_marks, ll);
}
- if (ll->material_separate.enabled) {
+ if (ll->material_separate.use) {
Count += lanpr_count_leveled_edge_segment_count(&rb->material_lines, ll);
}
@@ -124,19 +124,19 @@ static void lanpr_rebuild_render_draw_command(LANPR_RenderBuffer *rb, LANPR_Line
tv = v = MEM_callocN(sizeof(float) * 6 * Count, "temp v data");
tn = N = MEM_callocN(sizeof(float) * 6 * Count, "temp n data");
- if (ll->contour.enabled) {
+ if (ll->contour.use) {
tv = lanpr_make_leveled_edge_vertex_array(rb, &rb->contours, tv, tn, &tn, ll, 1.0f);
}
- if (ll->crease.enabled) {
+ if (ll->crease.use) {
tv = lanpr_make_leveled_edge_vertex_array(rb, &rb->crease_lines, tv, tn, &tn, ll, 2.0f);
}
- if (ll->material_separate.enabled) {
+ if (ll->material_separate.use) {
tv = lanpr_make_leveled_edge_vertex_array(rb, &rb->material_lines, tv, tn, &tn, ll, 3.0f);
}
- if (ll->edge_mark.enabled) {
+ if (ll->edge_mark.use) {
tv = lanpr_make_leveled_edge_vertex_array(rb, &rb->edge_marks, tv, tn, &tn, ll, 4.0f);
}
- if (ll->intersection.enabled) {
+ if (ll->intersection.use) {
tv = lanpr_make_leveled_edge_vertex_array(rb, &rb->intersection_lines, tv, tn, &tn, ll, 5.0f);
}
@@ -347,13 +347,13 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
&unit_thickness :
&ll->intersection.thickness,
1);
- DRW_shgroup_uniform_int(rb->ChainShgrp, "enable_contour", &ll->contour.enabled, 1);
- DRW_shgroup_uniform_int(rb->ChainShgrp, "enable_crease", &ll->crease.enabled, 1);
+ DRW_shgroup_uniform_int(rb->ChainShgrp, "use_contour", &ll->contour.use, 1);
+ DRW_shgroup_uniform_int(rb->ChainShgrp, "use_crease", &ll->crease.use, 1);
DRW_shgroup_uniform_int(
- rb->ChainShgrp, "enable_material", &ll->material_separate.enabled, 1);
- DRW_shgroup_uniform_int(rb->ChainShgrp, "enable_edge_mark", &ll->edge_mark.enabled, 1);
+ rb->ChainShgrp, "use_material", &ll->material_separate.use, 1);
+ DRW_shgroup_uniform_int(rb->ChainShgrp, "use_edge_mark", &ll->edge_mark.use, 1);
DRW_shgroup_uniform_int(
- rb->ChainShgrp, "enable_intersection", &ll->intersection.enabled, 1);
+ rb->ChainShgrp, "use_intersection", &ll->intersection.use, 1);
static int normal_effect_inverse;
normal_effect_inverse = (ll->flags & LANPR_LINE_LAYER_NORMAL_INVERSE) ? 1 : 0;
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 87734e07c70..d011e4ba76b 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -316,15 +316,15 @@ static void lanpr_cache_init(void *vedata)
&lanpr->crease_fade_threshold,
1);
DRW_shgroup_uniform_int(
- stl->g_data->dpix_transform_shgrp, "enable_contour", &ll->contour.enabled, 1);
+ stl->g_data->dpix_transform_shgrp, "use_contour", &ll->contour.use, 1);
DRW_shgroup_uniform_int(
- stl->g_data->dpix_transform_shgrp, "enable_crease", &ll->crease.enabled, 1);
+ stl->g_data->dpix_transform_shgrp, "use_crease", &ll->crease.use, 1);
DRW_shgroup_uniform_int(
- stl->g_data->dpix_transform_shgrp, "enable_material", &ll->material_separate.enabled, 1);
+ stl->g_data->dpix_transform_shgrp, "use_material", &ll->material_separate.use, 1);
DRW_shgroup_uniform_int(
- stl->g_data->dpix_transform_shgrp, "enable_edge_mark", &ll->edge_mark.enabled, 1);
+ stl->g_data->dpix_transform_shgrp, "use_edge_mark", &ll->edge_mark.use, 1);
DRW_shgroup_uniform_int(
- stl->g_data->dpix_transform_shgrp, "enable_intersection", &ll->intersection.enabled, 1);
+ stl->g_data->dpix_transform_shgrp, "use_intersection", &ll->intersection.use, 1);
psl->dpix_preview_pass = DRW_pass_create("DPIX Preview",
DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH |
diff --git a/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl b/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl
index 7c29d65402b..66012d447d6 100644
--- a/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl
+++ b/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl
@@ -4,11 +4,11 @@ uniform mat4 ViewMatrixInverse;
uniform mat4 ProjectionMatrix;
uniform mat4 ProjectionMatrixInverse;
-uniform int enable_contour;
-uniform int enable_crease;
-uniform int enable_material;
-uniform int enable_edge_mark;
-uniform int enable_intersection;
+uniform int use_contour;
+uniform int use_crease;
+uniform int use_material;
+uniform int use_edge_mark;
+uniform int use_intersection;
uniform float crease_threshold;
uniform float crease_fade_threshold;
@@ -336,7 +336,7 @@ int testProfileEdge(ivec2 texcoord, vec3 world_position)
bool contour = (dot0 >= 0.0 && dot1 <= 0.0) || (dot0 <= 0.0 && dot1 >= 0.0);
- is_crease = (((enable_contour > 0 && !contour) || enable_contour == 0) &&
+ is_crease = (((use_contour > 0 && !contour) || use_contour == 0) &&
((dot2 < crease_threshold) || (dot2 < crease_fade_threshold))) ?
1 :
0;
@@ -347,11 +347,11 @@ int testProfileEdge(ivec2 texcoord, vec3 world_position)
0;
// use 0 to 0.5 to repesent the range, because 1 will represent another meaning
- if (enable_contour > 0 && contour)
+ if (use_contour > 0 && contour)
return 1;
- if (((enable_crease > 0) && (is_crease > 0)) || ((enable_material > 0) && (edge_mask.r > 0)) ||
- ((enable_edge_mark > 0) && (edge_mask.g > 0)) ||
- ((enable_intersection > 0) && (edge_mask.b > 0)) || false)
+ if (((use_crease > 0) && (is_crease > 0)) || ((use_material > 0) && (edge_mask.r > 0)) ||
+ ((use_edge_mark > 0) && (edge_mask.g > 0)) ||
+ ((use_int
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list