mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-26 05:50:32 +05:00
* no-opengl-dependencies if 'nodisplay' is set (commit initiated by Michael Woopen)
This commit is contained in:
parent
2ab7b02555
commit
8765b12a8d
16
ng/ngpkg.cpp
16
ng/ngpkg.cpp
@ -1832,6 +1832,9 @@ namespace netgen
|
|||||||
|
|
||||||
void MyOpenGLText (const char * text)
|
void MyOpenGLText (const char * text)
|
||||||
{
|
{
|
||||||
|
if (nodisplay)
|
||||||
|
return;
|
||||||
|
|
||||||
glListBase (fontbase);
|
glListBase (fontbase);
|
||||||
glCallLists (GLsizei(strlen(text)), GL_UNSIGNED_BYTE, text);
|
glCallLists (GLsizei(strlen(text)), GL_UNSIGNED_BYTE, text);
|
||||||
}
|
}
|
||||||
@ -1840,6 +1843,9 @@ namespace netgen
|
|||||||
|
|
||||||
static void init( struct Togl *togl )
|
static void init( struct Togl *togl )
|
||||||
{
|
{
|
||||||
|
if (nodisplay)
|
||||||
|
return;
|
||||||
|
|
||||||
fontbase = Togl_LoadBitmapFont( togl, TOGL_BITMAP_8_BY_13 );
|
fontbase = Togl_LoadBitmapFont( togl, TOGL_BITMAP_8_BY_13 );
|
||||||
|
|
||||||
glMatrixMode(GL_PROJECTION);
|
glMatrixMode(GL_PROJECTION);
|
||||||
@ -1857,6 +1863,9 @@ namespace netgen
|
|||||||
|
|
||||||
static void draw( struct Togl *togl )
|
static void draw( struct Togl *togl )
|
||||||
{
|
{
|
||||||
|
if (nodisplay)
|
||||||
|
return;
|
||||||
|
|
||||||
Tcl_Interp * interp = Togl_Interp(togl);
|
Tcl_Interp * interp = Togl_Interp(togl);
|
||||||
|
|
||||||
SetVisualScene (interp);
|
SetVisualScene (interp);
|
||||||
@ -1898,6 +1907,9 @@ namespace netgen
|
|||||||
|
|
||||||
static void reshape( struct Togl *togl)
|
static void reshape( struct Togl *togl)
|
||||||
{
|
{
|
||||||
|
if (nodisplay)
|
||||||
|
return;
|
||||||
|
|
||||||
int w = Togl_Width (togl);
|
int w = Togl_Width (togl);
|
||||||
int h = Togl_Height (togl);
|
int h = Togl_Height (togl);
|
||||||
|
|
||||||
@ -2679,6 +2691,8 @@ void Ng_InitSolutionData (Ng_SolutionData * soldata)
|
|||||||
void Ng_SetSolutionData (Ng_SolutionData * soldata)
|
void Ng_SetSolutionData (Ng_SolutionData * soldata)
|
||||||
{
|
{
|
||||||
#ifdef OPENGL
|
#ifdef OPENGL
|
||||||
|
if (nodisplay)
|
||||||
|
return;
|
||||||
// vssolution.ClearSolutionData ();
|
// vssolution.ClearSolutionData ();
|
||||||
VisualSceneSolution::SolData * vss = new VisualSceneSolution::SolData;
|
VisualSceneSolution::SolData * vss = new VisualSceneSolution::SolData;
|
||||||
|
|
||||||
@ -2701,6 +2715,8 @@ void Ng_SetSolutionData (Ng_SolutionData * soldata)
|
|||||||
void Ng_ClearSolutionData ()
|
void Ng_ClearSolutionData ()
|
||||||
{
|
{
|
||||||
#ifdef OPENGL
|
#ifdef OPENGL
|
||||||
|
if (nodisplay)
|
||||||
|
return;
|
||||||
vssolution.ClearSolutionData();
|
vssolution.ClearSolutionData();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user