Skip to content

1d elements dev #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tzanio merged 23 commits into from
Aug 12, 2023
Merged

1d elements dev #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0dde1a3
3D works.
termi-official Oct 8, 2021
e5b11f6
Add first try on 1d elements in 2d.
termi-official Oct 8, 2021
ad5bc27
Fix some issues with 2D rendering.
termi-official Oct 8, 2021
493d5cb
Fix crash in 2D.
termi-official Oct 23, 2021
96a3a46
Fix crash in 3D.
termi-official Oct 23, 2021
1488a99
Merge v4.2 master.
termi-official May 24, 2022
228c0e4
Make rendering of segments in 2D more like rendering of triangles and…
termi-official May 24, 2022
335bed6
Use same line width default everywhere.
termi-official May 24, 2022
57d4546
Fix typos.
termi-official May 24, 2022
e342339
Improve nc rendering of segments in 3D.
termi-official May 24, 2022
c338a86
Fixing crash in 3D for segment rendering.
termi-official May 24, 2022
e8096f9
Fix astyle command being hardcoded.
termi-official May 24, 2022
c5d9dee
Simplify segment rendering.
termi-official May 24, 2022
883f2ac
Style+warnings.
termi-official May 24, 2022
e3f729b
Add support for vector-valued fields on segments.
termi-official May 24, 2022
34f1624
Some cleanup.
termi-official May 24, 2022
6ec3880
Style.
termi-official May 24, 2022
9618441
Remove obsolete variables.
termi-official May 24, 2022
adb037e
Tweak grid visualization for 1d meshes embedded in 2d space.
termi-official Jul 26, 2022
aca0fa7
make style
tzanio Aug 6, 2023
b17516b
Merge branch 'master' into 1d-elements-dev
termi-official Aug 7, 2023
94350f7
Add changelog entry.
termi-official Aug 7, 2023
4383f05
Fix line renderer texture.
termi-official Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Version 4.2.1 (development)

- Significantly improved memory usage.

- Add support to visualize solutions on 1D elements embedded in 2D and 3D.


Version 4.2 released on May 23, 2022
====================================
Expand Down
4 changes: 2 additions & 2 deletions glvis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,8 +1148,8 @@ int main (int argc, char *argv[])
const char *font_name = string_default;
int portnum = 19916;
int multisample = GetMultisample();
double line_width = 1.0;
double ms_line_width = gl3::LINE_WIDTH_AA;
double line_width = GetLineWidth();
double ms_line_width = GetLineWidthMS();
Comment on lines +1151 to +1152
Copy link
Member

@tzanio tzanio Aug 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do these make any difference?

Copy link
Contributor Author

@termi-official termi-official Aug 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If your question is regarding the change itself, then this change just introduces a call to the internal API to keep the defaults consistent. If your question is regarding whether multisampling makes a difference, then it depends on the system. Not all systems support the respective OpenGL calls for multisampling of lines, which is part of the reason why I wanted to merge the line rendering PR before this. However, this PR is also functional without the line rendering PR.

Copy link
Contributor Author

@termi-official termi-official Aug 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For example pressing A on my workstation during interactive visualization removes stair-casing though antialiasing.

int geom_ref_type = Quadrature1D::ClosedUniform;
bool legacy_gl_ctx = false;
bool enable_hidpi = true;
Expand Down
85 changes: 64 additions & 21 deletions lib/openglvis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,25 @@ ::DrawQuad(gl3::GlDrawable& buff,
{fpts[3], fnorm, texcoord[3]});
}


void VisualizationScene
::DrawLine(gl3::GlDrawable& buff,
const double (&pts)[4][3], const double (&cv)[4],
const double minv, const double maxv)
{
float texcoord[2];
std::array<float, 3> fpts[2];
for (int i = 0; i < 2; i++)
{
texcoord[i] = palette.GetColorCoord(cv[i], minv, maxv);
fpts[i] = {(float) pts[i][0], (float) pts[i][1], (float) pts[i][2]};
}
buff.addLine<gl3::VertexTex>(
{fpts[0], texcoord[0]},
{fpts[1], texcoord[1]}
);
}

void VisualizationScene
::DrawPatch(gl3::GlDrawable& drawable, const DenseMatrix &pts, Vector &vals,
DenseMatrix &normals,
Expand Down Expand Up @@ -376,41 +395,65 @@ ::DrawPatch(gl3::GlDrawable& drawable, const DenseMatrix &pts, Vector &vals,
}
else
{
if (n == 3)
if (n == 2)
{
poly.glBegin(GL_LINES);
}
else if (n == 3)
{
poly.glBegin(GL_TRIANGLES);
}
else
else if (n == 4)
{
poly.glBegin(GL_QUADS);
}
else // We should never hit this case
{
mfem_error("VisualizationScene::DrawPatch() : unknown input geometry.");
}
for (int i = 0; i < ind.Size(); i += n)
{
int j;
if (n == 3)
j = Compute3DUnitNormal(&pts(0, ind[i]), &pts(0, ind[i+1]),
&pts(0, ind[i+2]), na);
else
j = Compute3DUnitNormal(&pts(0, ind[i]), &pts(0, ind[i+1]),
&pts(0, ind[i+2]), &pts(0, ind[i+3]), na);
if (j == 0)
if (n == 2) // Lines
{
if (normals_opt == 0)
// Draw solution line
for (int j=0; j<2; j++)
{
poly.glNormal3dv(na);
for ( ; j < n; j++)
{
MySetColor(poly, vals(ind[i+j]), minv, maxv);
poly.glVertex3dv(&pts(0, ind[i+j]));
}
MySetColor(poly, vals(ind[i+j]), minv, maxv);
poly.glVertex3d(pts(0, ind[i+j]), pts(1, ind[i+j]), pts(2, ind[i+j]));
}
}
else // Quads and triangles
{
int j;
if (n == 3)
{
j = Compute3DUnitNormal(&pts(0, ind[i]), &pts(0, ind[i+1]),
&pts(0, ind[i+2]), na);
}
else
{
poly.glNormal3d(-na[0], -na[1], -na[2]);
for (j = n-1; j >= 0; j--)
j = Compute3DUnitNormal(&pts(0, ind[i]), &pts(0, ind[i+1]),
&pts(0, ind[i+2]), &pts(0, ind[i+3]), na);
}
if (j == 0)
{
if (normals_opt == 0)
{
poly.glNormal3dv(na);
for ( ; j < n; j++)
{
MySetColor(poly, vals(ind[i+j]), minv, maxv);
poly.glVertex3dv(&pts(0, ind[i+j]));
}
}
else
{
MySetColor(poly, vals(ind[i+j]), minv, maxv);
poly.glVertex3dv(&pts(0, ind[i+j]));
poly.glNormal3d(-na[0], -na[1], -na[2]);
for (j = n-1; j >= 0; j--)
{
MySetColor(poly, vals(ind[i+j]), minv, maxv);
poly.glVertex3dv(&pts(0, ind[i+j]));
}
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions lib/openglvis.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ class VisualizationScene
const double (&pts)[4][3], const double (&cv)[4],
const double minv, const double maxv);

void DrawLine(gl3::GlDrawable& buff,
const double (&pts)[4][3], const double (&cv)[4],
const double minv, const double maxv);

/// Draw a 3D triangle in physical space with a central triangle removed. The
/// cut is controlled by value of cut_lambda. See keys Ctrl+F3/F4. Similar to
/// CutReferenceTriangle in lib/vssolution3d.cpp.
Expand Down
Loading