ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-27 13:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

opengl improvements and fixes

Browse Source
This commit is contained in:
Joachim Schoeberl 2011-11-14 18:16:40 +00:00
parent cfc7c46df0
commit f8b82a24eb
1 changed files with 13 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
libsrc/visualization/vsmesh.cpp
View File

@ -83,7 +83,6 @@ namespace netgen
NgProfiler::RegionTimer reg (timer); NgProfiler::RegionTimer reg (timer);
BuildScene(); BuildScene();
glClearColor(backcolor, backcolor, backcolor, 1.0); glClearColor(backcolor, backcolor, backcolor, 1.0);
@ -893,29 +892,15 @@ namespace netgen
NgProfiler::RegionTimer reg (timer); NgProfiler::RegionTimer reg (timer);
#ifdef PARALLELGL #ifdef PARALLELGL
// cout << "buildfillelist, id = " << id << ", nse = " << mesh -> GetNSE() << endl;
if (id == 0 && ntasks > 1) if (id == 0 && ntasks > 1)
{ {
InitParallelGL(); InitParallelGL();
par_filledlists.SetSize (ntasks); par_filledlists.SetSize (ntasks);
/*
for ( int dest = 1; dest < ntasks; dest++ )
{
MyMPI_Send ("redraw", dest, MPI_TAG_CMD);
// MyMPI_Send ("filledlist", dest, MPI_TAG_VIS);
}
*/
MyMPI_SendCmd ("redraw"); MyMPI_SendCmd ("redraw");
MyMPI_SendCmd ("filledlist"); MyMPI_SendCmd ("filledlist");
for ( int dest = 1; dest < ntasks; dest++ ) for ( int dest = 1; dest < ntasks; dest++ )
{ MyMPI_Recv (par_filledlists[dest], dest, MPI_TAG_VIS);
MyMPI_Recv (par_filledlists[dest], dest, MPI_TAG_VIS);
// cout << "proc " << dest << " has drawn to list " << par_filledlists[dest] << endl;
}
if (filledlist) if (filledlist)
glDeleteLists (filledlist, 1); glDeleteLists (filledlist, 1);
@ -928,8 +913,6 @@ namespace netgen
glEndList(); glEndList();
filledtimestamp = NextTimeStamp(); filledtimestamp = NextTimeStamp();
return; return;
} }
@ -988,10 +971,6 @@ namespace netgen
GLfloat matcol[] = { 0, 1, 0, 1 }; GLfloat matcol[] = { 0, 1, 0, 1 };
GLfloat matcolsel[] = { 1, 0, 0, 1 }; GLfloat matcolsel[] = { 1, 0, 0, 1 };
#ifdef PARALLEL
GLfloat mat_coll_transp[] = { 0, 1, 0, 0.3 };
GLfloat mat_coll_transp_sel[] = { 1, 0, 0, 0.3 };
#endif
GLint rendermode; GLint rendermode;
glGetIntegerv (GL_RENDER_MODE, &rendermode); glGetIntegerv (GL_RENDER_MODE, &rendermode);
@ -1005,7 +984,6 @@ namespace netgen
for (int faceindex = 1; faceindex <= mesh->GetNFD(); faceindex++) for (int faceindex = 1; faceindex <= mesh->GetNFD(); faceindex++)
{ {
// const FaceDescriptor & fd = mesh->GetFaceDescriptor(faceindex);
mesh->GetSurfaceElementsOfFace (faceindex, seia); mesh->GetSurfaceElementsOfFace (faceindex, seia);
// Philippose - 06/07/2009 // Philippose - 06/07/2009
@ -1024,31 +1002,10 @@ namespace netgen
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, matcol); glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, matcol);
/*
#ifdef PARALLEL
if ( el.IsGhost() )
{
if ( faceindex == selface )
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_coll_transp_sel);
else
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_coll_transp);
}
#endif
*/
bool simpletrig = !names && !curv.IsHighOrder();
for (int hi = 0; hi < seia.Size(); hi++)
if ((*mesh)[seia[hi]].GetType() != TRIG)
simpletrig = false;
if (simpletrig)
glBegin (GL_TRIANGLES);
for (int hi = 0; hi < seia.Size(); hi++) for (int hi = 0; hi < seia.Size(); hi++)
{ {
SurfaceElementIndex sei = seia[hi]; SurfaceElementIndex sei = seia[hi];
const Element2d & el = (*mesh)[sei]; const Element2d & el = (*mesh)[sei];
bool drawel = (!el.IsDeleted() & el.IsVisible()); bool drawel = (!el.IsDeleted() & el.IsVisible());
@ -1118,42 +1075,29 @@ namespace netgen
} }
else // not high order else // not high order
{ {
if (!simpletrig) glBegin (GL_TRIANGLES);
glBegin (GL_TRIANGLES);
const Point<3> & lp0 = (*mesh) [el[0]]; const Point<3> & lp0 = (*mesh) [el[0]];
const Point<3> & lp1 = (*mesh) [el[1]]; const Point<3> & lp1 = (*mesh) [el[1]];
const Point<3> & lp2 = (*mesh) [el[2]]; const Point<3> & lp2 = (*mesh) [el[2]];
Vec<3> n = Cross (lp1-lp0, lp2-lp0).Normalize(); Vec<3> n = Cross (lp1-lp0, lp2-lp0).Normalize();
glNormal3dv (n); glNormal3dv (n);
if (vispar.colormeshsize) for (int j = 0; j < 3; j++)
{ {
SetOpenGlColor (locms(el[0]-1), minh, maxh, 0); if (vispar.colormeshsize)
glVertex3dv (lp0); SetOpenGlColor (locms(el[0]-1), minh, maxh, 0);
SetOpenGlColor (locms(el[1]-1), minh, maxh, 0); glVertex3dv ( (*mesh)[el[j]] );
glVertex3dv (lp1);
SetOpenGlColor (locms(el[2]-1), minh, maxh, 0);
glVertex3dv (lp2);
}
else
{
glVertex3dv (lp0);
glVertex3dv (lp1);
glVertex3dv (lp2);
} }
if (!simpletrig) glEnd();
glEnd();
} }
break; break;
} }
case QUAD: case QUAD:
{ {
// cout << "BuildFilledList: QUAD" << endl;
// CurvedElements & curv = mesh->GetCurvedElements();
if (curv.IsHighOrder()) // && curv.IsSurfaceElementCurved(sei)) if (curv.IsHighOrder()) // && curv.IsSurfaceElementCurved(sei))
{ {
Point<2> xr[4]; Point<2> xr[4];
@ -1315,9 +1259,6 @@ namespace netgen
} }
if (simpletrig)
glEnd ();
} }
@ -1330,9 +1271,6 @@ namespace netgen
if (id > 0) if (id > 0)
MyMPI_Send (filledlist, 0, MPI_TAG_VIS); MyMPI_Send (filledlist, 0, MPI_TAG_VIS);
#endif #endif
// endtime = clock();
// cout << "BuildFillList time = " << double(endtime - starttime)/CLOCKS_PER_SEC << endl;
} }
@ -1349,13 +1287,6 @@ namespace netgen
par_linelists.SetSize (ntasks); par_linelists.SetSize (ntasks);
/*
for ( int dest = 1; dest < ntasks; dest++ )
{
MyMPI_Send ("redraw", dest, MPI_TAG_CMD);
MyMPI_Send ("linelist", dest, MPI_TAG_VIS);
}
*/
MyMPI_SendCmd ("redraw"); MyMPI_SendCmd ("redraw");
MyMPI_SendCmd ("linelist"); MyMPI_SendCmd ("linelist");
@ -1457,6 +1388,9 @@ namespace netgen
{ {
glBegin (GL_TRIANGLES); glBegin (GL_TRIANGLES);
for (int j = 0; j < 3; j++)
glVertex3dv ( (*mesh) [el[j]] );
/*
const Point<3> & lp0 = (*mesh) [el[0]]; const Point<3> & lp0 = (*mesh) [el[0]];
const Point<3> & lp1 = (*mesh) [el[1]]; const Point<3> & lp1 = (*mesh) [el[1]];
const Point<3> & lp2 = (*mesh) [el[2]]; const Point<3> & lp2 = (*mesh) [el[2]];
@ -1464,7 +1398,7 @@ namespace netgen
glVertex3dv (lp0); glVertex3dv (lp0);
glVertex3dv (lp1); glVertex3dv (lp1);
glVertex3dv (lp2); glVertex3dv (lp2);
*/
glEnd(); glEnd();
} }