archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Subdiv: Set edge render flags according to Optimal Display

Browse Source 
This is a part of T58609, but work is still needed to properly
support this flag in the draw manager.
This commit is contained in:
Sergey Sharybin
2018-12-03 16:59:11 +01:00
parent bb16167fd8
commit 17a4323ef5
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_subdiv_mesh.h
View File

@@ -45,6 +45,8 @@ typedef struct SubdivToMeshSettings {
* `resolution - 1`. * `resolution - 1`.
*/ */
int resolution; int resolution;
/* When true, only edges emitted from coarse ones will be displayed. */
bool use_optimal_display;
} SubdivToMeshSettings; } SubdivToMeshSettings;
/* Create real hi-res mesh from subdivision, all geometry is "real". */ /* Create real hi-res mesh from subdivision, all geometry is "real". */

2
source/blender/blenkernel/intern/multires_subdiv.c
View File

@@ -64,4 +64,6 @@ void BKE_multires_subdiv_mesh_settings_init(
const int level = multires_get_level( const int level = multires_get_level(
scene, object, mmd, use_render_params, ignore_simplify); scene, object, mmd, use_render_params, ignore_simplify);
mesh_settings->resolution = (1 << level) + 1; mesh_settings->resolution = (1 << level) + 1;
mesh_settings->use_optimal_display =
(mmd->flags & eMultiresModifierFlag_ControlEdges);
} }

6
source/blender/blenkernel/intern/subdiv_mesh.c
View File

@@ -53,6 +53,7 @@
*/ */
typedef struct SubdivMeshContext { typedef struct SubdivMeshContext {
const SubdivToMeshSettings *settings;
const Mesh *coarse_mesh; const Mesh *coarse_mesh;
Subdiv *subdiv; Subdiv *subdiv;
Mesh *subdiv_mesh; Mesh *subdiv_mesh;
@@ -766,6 +767,9 @@ static void subdiv_copy_edge_data(
subdiv_edge->crease = 0; subdiv_edge->crease = 0;
subdiv_edge->bweight = 0; subdiv_edge->bweight = 0;
subdiv_edge->flag = 0; subdiv_edge->flag = 0;
if (!ctx->settings->use_optimal_display) {
subdiv_edge->flag |= ME_EDGERENDER;
}
if (ctx->edge_origindex != NULL) { if (ctx->edge_origindex != NULL) {
ctx->edge_origindex[subdiv_edge_index] = ORIGINDEX_NONE; ctx->edge_origindex[subdiv_edge_index] = ORIGINDEX_NONE;
} }
@@ -777,6 +781,7 @@ static void subdiv_copy_edge_data(
coarse_edge_index, coarse_edge_index,
subdiv_edge_index, subdiv_edge_index,
1); 1);
subdiv_edge->flag |= ME_EDGERENDER;
} }
static void subdiv_mesh_edge( static void subdiv_mesh_edge(
@@ -1123,6 +1128,7 @@ Mesh *BKE_subdiv_to_mesh(
} }
/* Initialize subdivion mesh creation context/ */ /* Initialize subdivion mesh creation context/ */
SubdivMeshContext subdiv_context = {0}; SubdivMeshContext subdiv_context = {0};
subdiv_context.settings = settings;
subdiv_context.coarse_mesh = coarse_mesh; subdiv_context.coarse_mesh = coarse_mesh;
subdiv_context.subdiv = subdiv; subdiv_context.subdiv = subdiv;
/* Multi-threaded traversal/evaluation. */ /* Multi-threaded traversal/evaluation. */

2
source/blender/modifiers/intern/MOD_subsurf.c
View File

@@ -130,6 +130,8 @@ static void subdiv_mesh_settings_init(SubdivToMeshSettings *settings,
{ {
const int level = subdiv_levels_for_modifier_get(smd, ctx); const int level = subdiv_levels_for_modifier_get(smd, ctx);
settings->resolution = (1 << level) + 1; settings->resolution = (1 << level) + 1;
settings->use_optimal_display =
(smd->flags & eSubsurfModifierFlag_ControlEdges);
} }
static Mesh *subdiv_as_mesh(SubsurfModifierData *smd, static Mesh *subdiv_as_mesh(SubsurfModifierData *smd,