Changeset 940 for trunk/source/visualization/OpenGL
- Timestamp:
- Mar 5, 2009, 12:35:38 PM (16 years ago)
- Location:
- trunk/source/visualization/OpenGL
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/GNUmakefile
r924 r940 1 # $Id: GNUmakefile,v 1. 9 2009/02/16 15:31:05lgarnier Exp $1 # $Id: GNUmakefile,v 1.10 2009/03/05 11:17:42 lgarnier Exp $ 2 2 3 3 name := G4OpenGL … … 9 9 # Definition of macro for moc files (for Qt use only) 10 10 MOC_MACRO = -DG4VIS_BUILD_OPENGLQT_DRIVER 11 12 # For debug mode 13 # CPPFLAGS += -DG4DEBUG_VIS_OGL 11 14 12 15 GLOBLIBS = libG4vis_management.lib libG4modeling.lib -
trunk/source/visualization/OpenGL/History
r938 r940 1 $Id: History,v 1.12 7 2009/03/03 14:51:29lgarnier Exp $1 $Id: History,v 1.128 2009/03/05 11:04:20 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 21 21 ------------------------------------- 22 22 23 3rd March 2009, Laurent Garnier23 4rd March 2009, Laurent Garnier 24 24 - G4OpenGLQtViewer: 25 25 - Suppress some warnings when saving file 26 26 - Changing size is now allowed when saving (to save with better resolution than screen size) 27 - G4OpenGLViewer: Some renaming for print methods to be more clear about Vectored and non Vectored 28 - G4OpenGLViewer: Now using Gl2PS method to do PS (changes also in G4OpenGLXViewer and G4OpenGLQtViewer) 27 29 28 30 1st March 2009, Laurent Garnier -
trunk/source/visualization/OpenGL/include/G4OpenGLViewer.hh
r938 r940 25 25 // 26 26 // 27 // $Id: G4OpenGLViewer.hh,v 1.2 7 2009/02/16 15:31:05lgarnier Exp $27 // $Id: G4OpenGLViewer.hh,v 1.28 2009/03/05 11:04:20 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r938 r940 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.cc,v 1.3 6 2009/02/25 15:14:29lgarnier Exp $27 // $Id: G4OpenGLQtViewer.cc,v 1.37 2009/03/05 11:04:20 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r931 r940 32 32 // G4OpenGLStoredViewer. 33 33 34 #define G4DEBUG_VIS_OGL35 36 34 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER 37 35 -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc
r938 r940 33 33 // and G4OpenGLStoredViewer. 34 34 35 #define G4DEBUG_VIS_OGL 136 35 #ifdef G4VIS_BUILD_OPENGLXM_DRIVER 37 36 … … 122 121 FinishView (); 123 122 } else { 124 #ifdef G4DEBUG_VIS_OGL125 printf("************************** G4OpenGLStoredXmViewer::ComputeView Need kernel Visit \n");126 #endif127 123 // However, union cutaways are implemented in DrawDisplayLists, so make 128 124 // an extra pass... -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r939 r940 25 25 // 26 26 // 27 // $Id: G4OpenGLViewer.cc,v 1.4 8 2009/02/16 15:31:05lgarnier Exp $27 // $Id: G4OpenGLViewer.cc,v 1.49 2009/03/05 11:04:20 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 33 33 34 34 #ifdef G4VIS_BUILD_OPENGL_DRIVER 35 36 #define G4DEBUG_VIS_OGL37 35 38 36 #include "G4ios.hh" … … 51 49 #include "G4AttHolder.hh" 52 50 #include "G4AttCheck.hh" 53 #include "G4StateManager.hh"54 51 55 52 // GL2PS … … 146 143 147 144 void G4OpenGLViewer::ClearView () { 148 #ifdef G4DEBUG_VIS_OGL149 printf("G4OpenGLViewer::ClearView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");150 #endif151 145 glClearColor (background.GetRed(), 152 146 background.GetGreen(), … … 160 154 glClear (GL_STENCIL_BUFFER_BIT); 161 155 glFlush (); 162 #ifdef G4DEBUG_VIS_OGL163 printf("G4OpenGLViewer::ClearView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");164 #endif165 156 } 166 157 … … 178 169 179 170 void G4OpenGLViewer::SetView () { 180 181 #ifdef G4DEBUG_VIS_OGL182 printf("G4OpenGLViewer::SetView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");183 #endif184 171 185 172 if (!fSceneHandler.GetScene()) { … … 321 308 background = fVP.GetBackgroundColour (); 322 309 323 #ifdef G4DEBUG_VIS_OGL324 printf("G4OpenGLViewer::SetView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");325 #endif326 310 } 327 311 328 312 void G4OpenGLViewer::HaloingFirstPass () { 329 313 330 #ifdef G4DEBUG_VIS_OGL331 printf("G4OpenGLViewer::HaloingFirstPass VVVVVVVVVVVVVVVVVV \n");332 #endif333 314 //To perform haloing, first Draw all information to the depth buffer 334 315 //alone, using a chunky line width, and then Draw all info again, to … … 353 334 void G4OpenGLViewer::HaloingSecondPass () { 354 335 355 #ifdef G4DEBUG_VIS_OGL356 printf("G4OpenGLViewer::HaloingSecondtPass VVVVVVVVVVVVVVVVVV \n");357 #endif358 336 //And finally, turn the colour buffer back on with a sesible line width... 359 337 glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); … … 907 885 if (!fGL2PSAction) return false; 908 886 909 910 887 fGL2PSAction->setFileName(fPrintFilename.c_str()); 911 888 // try to resize -
trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
r939 r940 25 25 // 26 26 // 27 // $Id: G4OpenGLXViewer.cc,v 1. 49 2009/02/16 15:31:05lgarnier Exp $27 // $Id: G4OpenGLXViewer.cc,v 1.50 2009/03/05 11:04:20 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 49 49 #include "G4Point3D.hh" 50 50 #include "G4Normal3D.hh" 51 #include "G4StateManager.hh"52 51 53 52 #include <X11/Xatom.h>
Note: See TracChangeset
for help on using the changeset viewer.