Michel2/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad.git synced 2026-07-28 04:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Draw conditional lines on a separate pass.

Browse Source
This commit is contained in:
Leonardo Zide
2021-03-21 17:53:13 -07:00
parent 2a019412e1
commit 8039f5b180
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_scene.cpp
+24 -26
View File
@@ -415,33 +415,21 @@ void lcScene::Draw(lcContext* Context) const
if (mShadingMode == lcShadingMode::Wireframe)
{
int PrimitiveTypes = LC_MESH_LINES;
DrawOpaqueMeshes(Context, false, LC_MESH_LINES, true, true);
if (DrawConditional)
PrimitiveTypes |= LC_MESH_CONDITIONAL_LINES;
DrawOpaqueMeshes(Context, false, PrimitiveTypes, true, true);
DrawOpaqueMeshes(Context, false, LC_MESH_CONDITIONAL_LINES, true, true);
if (mPreTranslucentCallback)
mPreTranslucentCallback();
}
else if (mShadingMode == lcShadingMode::Flat)
{
int LinePrimitiveTypes = 0;
if (DrawLines)
{
LinePrimitiveTypes |= LC_MESH_LINES;
if (DrawConditional)
LinePrimitiveTypes |= LC_MESH_CONDITIONAL_LINES;
}
const int SolidPrimitiveTypes = LC_MESH_TRIANGLES | LC_MESH_TEXTURED_TRIANGLES;
const int SolidPrimitiveTypes = LC_MESH_TRIANGLES | LC_MESH_TEXTURED_TRIANGLES | (DrawLines ? LC_MESH_LINES : 0);
if (mTranslucentFade && mHasFadedParts)
{
DrawOpaqueMeshes(Context, false, SolidPrimitiveTypes | LinePrimitiveTypes, false, true);
DrawOpaqueMeshes(Context, false, SolidPrimitiveTypes, false, true);
if (mPreTranslucentCallback)
mPreTranslucentCallback();
@@ -449,13 +437,19 @@ void lcScene::Draw(lcContext* Context) const
DrawTranslucentMeshes(Context, false, true, true, false);
if (DrawLines)
DrawOpaqueMeshes(Context, false, LinePrimitiveTypes, true, false);
DrawOpaqueMeshes(Context, false, LC_MESH_LINES, true, false);
if (DrawConditional)
DrawOpaqueMeshes(Context, false, LC_MESH_CONDITIONAL_LINES, true, false);
DrawTranslucentMeshes(Context, false, false, true, true);
}
else
{
DrawOpaqueMeshes(Context, false, SolidPrimitiveTypes | LinePrimitiveTypes, true, true);
DrawOpaqueMeshes(Context, false, SolidPrimitiveTypes, true, true);
if (DrawConditional)
DrawOpaqueMeshes(Context, false, LC_MESH_CONDITIONAL_LINES, true, true);
if (mPreTranslucentCallback)
mPreTranslucentCallback();
@@ -465,17 +459,15 @@ void lcScene::Draw(lcContext* Context) const
}
else
{
int LinePrimitiveTypes = LC_MESH_LINES;
if (DrawConditional)
LinePrimitiveTypes |= LC_MESH_CONDITIONAL_LINES;
if (mTranslucentFade && mHasFadedParts)
{
DrawOpaqueMeshes(Context, true, LC_MESH_TRIANGLES | LC_MESH_TEXTURED_TRIANGLES, false, true);
if (DrawLines)
DrawOpaqueMeshes(Context, false, LinePrimitiveTypes, false, true);
DrawOpaqueMeshes(Context, false, LC_MESH_LINES, false, true);
if (DrawConditional)
DrawOpaqueMeshes(Context, false, LC_MESH_CONDITIONAL_LINES, false, true);
if (mPreTranslucentCallback)
mPreTranslucentCallback();
@@ -483,14 +475,20 @@ void lcScene::Draw(lcContext* Context) const
DrawTranslucentMeshes(Context, false, true, true, false);
if (DrawLines)
DrawOpaqueMeshes(Context, false, LinePrimitiveTypes, true, false);
DrawOpaqueMeshes(Context, false, LC_MESH_LINES, true, false);
if (DrawConditional)
DrawOpaqueMeshes(Context, false, LC_MESH_CONDITIONAL_LINES, true, false);
DrawTranslucentMeshes(Context, true, false, true, true);
}
else
{
if (DrawLines)
DrawOpaqueMeshes(Context, false, LinePrimitiveTypes, true, true);
DrawOpaqueMeshes(Context, false, LC_MESH_LINES, true, true);
if (DrawConditional)
DrawOpaqueMeshes(Context, false, LC_MESH_CONDITIONAL_LINES, true, true);
DrawOpaqueMeshes(Context, true, LC_MESH_TRIANGLES | LC_MESH_TEXTURED_TRIANGLES, true, true);