on the way to Togl2.0

ng/Makefile.am

@@ -18,7 +18,6 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \
 	$(top_builddir)/libsrc/general/libgeneral.la \
 	$(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) 
 
-
 #
 # add for static linkage of ngsolve:
 # /opt/netgen/lib/libngsolve.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngcomp.a  /opt/netgen/lib/libngfemng.a   /opt/netgen/lib/libngmg.a  /opt/netgen/lib/libngla.a  /opt/netgen/lib/libngbla.a  /opt/netgen/lib/libngstd.a -llapack

ng/drawing.tcl

@@ -7,9 +7,11 @@ set oldmousey 0
 
 # if { 1 } {
 
-# if {[catch {togl .ndraw -width 400 -height 300  -rgba true -double true -depth true -privatecmap false -stereo false -indirect true -create create_cb  -display display_cb -reshape reshape_cb  }] } {    
+
-#     puts "no OpenGL20" 
+
-# } {
+
+# if {[catch {togl .ndraw -width 400 -height 300  -rgba true -double true -depth true -privatecmap false -stereo false -indirect true -create init  -display draw -reshape reshape  }] } {    
+
 
 if {[catch {togl .ndraw -width 400 -height 300  -rgba true -double true -depth true -privatecmap false -stereo false -indirect true }] } {    
     puts "no OpenGL" 

ng/ngpkg.cpp

@@ -34,7 +34,7 @@ The interface between the GUI and the netgen library
 
 // to be sure to include the 'right' togl-version
 #include "togl_1_7.h"
-
+// #include "Togl2/togl.h"
 
 extern bool nodisplay;
 
@@ -3212,6 +3212,89 @@ namespace netgen
 
   // Sorry, Togl 2.0 not supported
 
+  Tcl_Obj * togl_font;
+ 
+  void MyOpenGLText (const char * text)
+  {
+    cout << "togl - text" << endl;
+  }
+  
+
+
+  static int
+  init(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
+  {
+    Togl * togl;
+    if (Togl_GetToglFromObj(interp, objv[1], &togl) != TCL_OK) 
+      return TCL_ERROR;
+
+    cout << "call Togl - load font (crash on my Linux64)" << endl;
+    // togl_font = Togl_LoadBitmapFont( togl, "Times"); // TOGL_BITMAP_8_BY_13 );
+    togl_font = Togl_LoadBitmapFont( togl, TOGL_BITMAP_8_BY_13 );
+    cout << "success" << endl;
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glMatrixMode(GL_MODELVIEW);
+
+    SetVisualScene (Togl_Interp(togl));
+    vs->DrawScene();
+    return TCL_OK;
+  }
+
+  static int
+  zap(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
+  {
+    return TCL_OK;
+  }
+
+
+  static int
+  draw(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
+  {
+    Togl * togl;
+    if (Togl_GetToglFromObj(interp, objv[1], &togl) != TCL_OK) 
+      return TCL_ERROR;
+    
+
+    SetVisualScene (interp);
+
+    glPushMatrix();
+    glLoadIdentity();
+    // gluLookAt (0, 0, 6, 0, 0, 0, 0, 1, 0);
+    vs->DrawScene();
+    
+    Togl_SwapBuffers(togl);
+    glPopMatrix();
+
+    return TCL_OK;
+  }
+
+  static int
+  reshape(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
+  {
+    Togl * togl;
+    if (Togl_GetToglFromObj(interp, objv[1], &togl) != TCL_OK) 
+      return TCL_ERROR;
+
+    int w = Togl_Width (togl);
+    int h = Togl_Height (togl);
+
+    glViewport(0, 0, w, h);
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    gluPerspective(20.0f, double(w) / h, pnear, pfar);
+    glMatrixMode(GL_MODELVIEW);
+
+    // draw (togl);
+
+    return TCL_OK;
+  }
+
+
+
+
 
 #endif
 
@@ -5137,7 +5220,24 @@ namespace netgen
 	//   Togl_CreateCommand("position",position);
       }
 #else
-    cout << "togl 2.0 setup missing" << endl;
+    if(!nodisplay)
+      {
+	Tcl_CreateObjCommand(interp, "init", init, NULL, NULL);
+	Tcl_CreateObjCommand(interp, "zap", zap, NULL, NULL);
+	Tcl_CreateObjCommand(interp, "draw", draw, NULL, NULL);
+	Tcl_CreateObjCommand(interp, "reshape", reshape, NULL, NULL);
+	/*
+	Togl_CreateFunc( init );
+	Togl_DestroyFunc( zap );
+	Togl_DisplayFunc( draw );
+	Togl_ReshapeFunc( reshape );
+	*/
+	//   Togl_TimerFunc(  idle );
+	// Togl_CreateCommand( (char*)"Ng_SnapShot", Ng_SnapShot);
+	// Togl_CreateCommand( (char*)"Ng_VideoClip", Ng_VideoClip);
+	//   Togl_CreateCommand("position",position);
+      }
+
 #endif