[Bf-blender-cvs] [07b7fae45d9] soc-2018-npr: Updated ui, more easy to be used. (take advantage of new grouping api)
Nick Wu
noreply at git.blender.org
Mon Jul 2 11:16:16 CEST 2018
Commit: 07b7fae45d908dd1b58a4f9629295ec92e9edbcf
Author: Nick Wu
Date: Mon Jul 2 17:11:00 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB07b7fae45d908dd1b58a4f9629295ec92e9edbcf
Updated ui, more easy to be used. (take advantage of new grouping api)
===================================================================
M release/scripts/startup/bl_ui/properties_scene.py
M source/blender/draw/engines/lanpr/lanpr_ops.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index 1eafc10823a..4c2a95c600a 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -510,9 +510,10 @@ class LANPR_linesets(UIList):
layout.alignment = 'CENTER'
layout.label("", icon_value=icon)
-class SCENE_PT_lanpr(SceneButtonsPanel, PropertyPanel, Panel):
+class SCENE_PT_lanpr(SceneButtonsPanel, Panel):
COMPAT_ENGINES = {'BLENDER_CLAY'}
- bl_label = "LANPR AHOY"
+ bl_label = "LANPR"
+ bl_options = {'DEFAULT_CLOSED'}
@classmethod
def poll(cls, context):
@@ -522,15 +523,14 @@ class SCENE_PT_lanpr(SceneButtonsPanel, PropertyPanel, Panel):
layout = self.layout
scene = context.scene
lanpr = scene.lanpr
- active_layer = lanpr.layers.active_layer #this is alwas none.
+ active_layer = lanpr.layers.active_layer
layout.prop(lanpr, "master_mode", expand=True)
if lanpr.master_mode == "DPIX" or lanpr.master_mode == "SOFTWARE":
- layout.label(text="DPIX:")
- layout.prop(lanpr, "reloaded")
+ if lanpr.master_mode == "DPIX":
+ layout.prop(lanpr, "reloaded")
-
rows = 4
if lanpr.master_mode == "SOFTWARE":
layout.operator("scene.lanpr_calculate", icon='RENDER_STILL')
@@ -539,169 +539,186 @@ class SCENE_PT_lanpr(SceneButtonsPanel, PropertyPanel, Panel):
if active_layer:
split = layout.split()
col = split.column()
- col.operator("scene.lanpr_add_line_layer")
+ col.operator("scene.lanpr_add_line_layer", icon="ZOOMIN")
col = split.column()
- col.operator("scene.lanpr_rebuild_all_commands")
+ col.operator("scene.lanpr_delete_line_layer", icon="ZOOMOUT")
+ layout.operator("scene.lanpr_rebuild_all_commands")
else:
layout.operator("scene.lanpr_add_line_layer")
elif not lanpr.layers.active_layer:
layout.operator("scene.lanpr_add_line_layer")
- if active_layer:
-
- split = layout.split()
- col = split.column()
- col.prop(active_layer, "color", text="")
- col = split.column()
- col.prop(active_layer, "thickness")
-
- if active_layer.thickness > 0.01:
- col = layout.column()
- col.label(text="Enable:")
- row = col.row(align=True)
- row.prop(active_layer, "enable_contour", text="Contour", toggle=True)
- row.prop(active_layer, "enable_crease", text="Crease", toggle=True)
- row.prop(active_layer, "enable_edge_mark", text="Mark", toggle=True)
- row.prop(active_layer, "enable_material_seperate", text="Material", toggle=True)
- row.prop(active_layer, "enable_intersection", text="Intersection", toggle=True)
-
- row = col.row(align=True)
- if active_layer.enable_contour:
- row.prop(active_layer, "color", text="")
- else:
- row.label(text="OFF")
-
- if active_layer.enable_crease:
- row.prop(active_layer, "crease_color", text="")
- else:
- row.label(text="OFF")
-
- if active_layer.enable_edge_mark:
- row.prop(active_layer, "edge_mark_color", text="")
- else:
- row.label(text="OFF")
-
- if active_layer.enable_material_seperate:
- row.prop(active_layer, "material_color", text="")
- else:
- row.label(text="OFF")
-
- if active_layer.enable_intersection:
- row.prop(active_layer, "intersection_color", text="")
- else:
- row.label(text="OFF")
-
- row = col.row(align=True)
- if active_layer.enable_contour:
- row.prop(active_layer, "thickness", text="")
- else:
- row.label(text="OFF")
-
- if active_layer.enable_crease:
- row.prop(active_layer, "thickness_crease", text="")
- else:
- row.label(text="OFF")
-
- if active_layer.enable_edge_mark:
- row.prop(active_layer, "thickness_edge_mark", text="")
- else:
- row.label(text="OFF")
-
- if active_layer.enable_material_seperate:
- row.prop(active_layer, "thickness_material", text="")
- else:
- row.label(text="OFF")
-
- if active_layer.enable_intersection:
- row.prop(active_layer, "thickness_intersection", text="")
- else:
- row.label(text="OFF")
-
- split = layout.split(align=True)
- col = split.column()
- layout.prop(active_layer, "qi_begin")
- col = split.column()
- layout.prop(active_layer, "qi_end")
-
-
- layout.prop(lanpr, "crease_threshold")
-
- layout.label(text="Below INOP in software:")
-
- layout.prop(lanpr, "crease_fade_threshold")
-
- split = layout.split()
- col = split.column()
- col.prop(lanpr, "depth_width_influence")
- col.prop(lanpr, "depth_alpha_influence")
- col = split.column()
- col.prop(lanpr, "depth_width_curve")
- col.prop(lanpr, "depth_alpha_curve")
-
else:
- layout.label(text="Snake:")
- layout.prop(lanpr, "enable_vector_trace")
+ layout.label(text="Vectorization:")
+ layout.prop(lanpr, "enable_vector_trace", expand = True)
- if lanpr.enable_vector_trace == "DISABLED":
- layout.prop(lanpr, "display_thinning_result")
+ #col = layout.column()
+ #col.label(text="Enable:")
+ #row = col.row(align=True)
+ #row.prop(lanpr, "enable_edge_mark", text="Mark", toggle=True)
+ #row.prop(lanpr, "enable_material_seperate", text="Material", toggle=True)
- layout.prop(lanpr, "depth_clamp")
- layout.prop(lanpr, "depth_strength")
- layout.prop(lanpr, "normal_clamp")
- layout.prop(lanpr, "normal_strength")
- col = layout.column()
- col.label(text="Enable:")
- row = col.row(align=True)
- row.prop(lanpr, "enable_edge_mark", text="Mark", toggle=True)
- row.prop(lanpr, "enable_material_seperate", text="Material", toggle=True)
-
- if lanpr.enable_vector_trace == "ENABLED":
-
- split = layout.split()
- col = split.column()
- col.prop(lanpr, "background_color")
- col = split.column()
- col.prop(lanpr, "line_color")
-
- layout.label(text="Thickness:")
- layout.prop(lanpr, "line_thickness")
-
- layout.label(text="Effect Settings:")
-
- split = layout.split()
- col = split.column()
- col.prop(lanpr, "depth_width_influence")
- col.prop(lanpr, "depth_alpha_influence")
- col = split.column()
- col.prop(lanpr, "depth_width_curve")
- col.prop(lanpr, "depth_alpha_curve")
-
- layout.prop(lanpr, "use_same_taper")
-
- if lanpr.use_same_taper == "DISABLED":
- split = layout.split()
- col = split.column()
- col.label(text="Left:")
- col.prop(lanpr,"taper_left_distance")
- col.prop(lanpr,"taper_left_strength")
- col = split.column()
- col.label(text="Right:")
- col.prop(lanpr,"taper_right_distance")
- col.prop(lanpr,"taper_right_strength")
- else:
- layout.prop(lanpr,"taper_left_distance")
- layout.prop(lanpr,"taper_left_strength")
+class SCENE_PT_lanpr_line_types(SceneButtonsPanel, Panel):
+ bl_label = "Types"
+ bl_parent_id = "SCENE_PT_lanpr"
+ COMPAT_ENGINES = {'BLENDER_CLAY'}
- layout.prop(lanpr, "enable_tip_extend")
- if lanpr.enable_tip_extend == "ENABLED":
- layout.prop(lanpr,"extend_length")
-
- else: #disabled vectorization
- layout.label(text="Adjust values to avoid large pure white regions!")
+ @classmethod
+ def poll(cls, context):
+ scene = context.scene
+ lanpr = scene.lanpr
+ active_layer = lanpr.layers.active_layer
+ return active_layer and lanpr.master_mode != "SNAKE"
-
+ def draw(self, context):
+ layout = self.layout
+ scene = context.scene
+ lanpr = scene.lanpr
+ active_layer = lanpr.layers.active_layer
+
+ split = layout.split(percentage=0.3)
+ col = split.column()
+ col.prop(active_layer, "enable_contour", text="Contour", toggle=True)
+ col.prop(active_layer, "enable_crease", text="Crease", toggle=True)
+ col.prop(active_layer, "enable_edge_mark", text="Mark", toggle=True)
+ col.prop(active_layer, "enable_material_seperate", text="Material", toggle=True)
+ col.prop(active_layer, "enable
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list