Changeset 789 for trunk/geant4
- Timestamp:
- Apr 23, 2008, 3:28:50 PM (16 years ago)
- Location:
- trunk/geant4/visualization/OpenGL
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/visualization/OpenGL/GNUmakefile
r777 r789 6 6 G4INSTALL = ../../.. 7 7 endif 8 9 8 10 9 # Definition of macro for moc files (for Qt use only) -
trunk/geant4/visualization/OpenGL/History
r776 r789 1 $Id: History,v 1.11 1 2008/03/11 16:05:56 lgarnierExp $1 $Id: History,v 1.112 2008/04/04 13:32:22 allison Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 20 20 History file for visualization/OpenGL 21 21 ------------------------------------- 22 23 22th April 2008 Laurent Garnier 24 - Add better moc control/compilation step in GNUmakefile 25 26 4th April 2008 John Allison (opengl-V09-01-01) 27 - Fixed DBL_MAX problem in 2D drawing: 28 o changed G4OPENGL_DBL_MAX to G4OPENGL_FLT_BIG. 29 - Fix gcc-4.3.0 compiler warnings. 22 30 23 31 11th March 2008, Laurent Garnier -
trunk/geant4/visualization/OpenGL/include/G4OpenGL.hh
r608 r789 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4OpenGL.hh,v 1. 6 2007/11/15 10:14:23allison Exp $26 // $Id: G4OpenGL.hh,v 1.7 2008/04/04 13:32:22 allison Exp $ 27 27 // GEANT4 tag $Name: $ 28 28 // … … 41 41 #include <GL/glu.h> 42 42 43 #define G4OPENGL_ DBL_MAX 1.e30843 #define G4OPENGL_FLT_BIG 1.e20 44 44 45 45 #endif -
trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
r688 r789 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredSceneHandler.hh,v 1.2 5 2008/01/04 22:07:01allison Exp $27 // $Id: G4OpenGLStoredSceneHandler.hh,v 1.26 2008/04/04 13:32:22 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 99 99 TO(G4int id, const G4Transform3D& tr = G4Transform3D()): 100 100 fDisplayListId(id), fTransform(tr), fPickName(0), 101 fStartTime(- G4OPENGL_DBL_MAX), fEndTime(G4OPENGL_DBL_MAX) {}101 fStartTime(-DBL_MAX), fEndTime(DBL_MAX) {} 102 102 G4int fDisplayListId; 103 103 G4Transform3D fTransform; -
trunk/geant4/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
r754 r789 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateSceneHandler.cc,v 1. 29 2008/02/18 08:53:49 asaimExp $27 // $Id: G4OpenGLImmediateSceneHandler.cc,v 1.30 2008/04/04 13:32:22 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 171 171 glPushMatrix(); 172 172 glLoadIdentity(); 173 ////// glOrtho (-1., 1., -1., 1., -G4OPENGL_DBL_MAX, G4OPENGL_DBL_MAX); 174 glOrtho (-1., 1., -1., 1., -1., 1.); 173 glOrtho (-1., 1., -1., 1., -G4OPENGL_FLT_BIG, G4OPENGL_FLT_BIG); 175 174 glMatrixMode (GL_MODELVIEW); 176 175 glPushMatrix(); -
trunk/geant4/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
r754 r789 25 25 // 26 26 // 27 // $Id: G4OpenGLSceneHandler.cc,v 1.5 3 2008/02/01 06:26:45allison Exp $27 // $Id: G4OpenGLSceneHandler.cc,v 1.54 2008/04/04 13:32:22 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 736 736 u_knot_array = u_knot_array_ptr = new GLfloat [nurb.GetnbrKnots(G4NURBS::U)]; 737 737 G4NURBS::KnotsIterator u_iterator (nurb, G4NURBS::U); 738 while (u_iterator.pick (u_knot_array_ptr++)) ;738 while (u_iterator.pick (u_knot_array_ptr++)){} 739 739 740 740 GLfloat *v_knot_array, *v_knot_array_ptr; 741 741 v_knot_array = v_knot_array_ptr = new GLfloat [nurb.GetnbrKnots(G4NURBS::V)]; 742 742 G4NURBS::KnotsIterator v_iterator (nurb, G4NURBS::V); 743 while (v_iterator.pick (v_knot_array_ptr++)) ;743 while (v_iterator.pick (v_knot_array_ptr++)){} 744 744 745 745 GLfloat *ctrl_pnt_array, *ctrl_pnt_array_ptr; … … 747 747 new GLfloat [nurb.GettotalnbrCtrlPts () * G4NURBS::NofC]; 748 748 G4NURBS::CtrlPtsCoordsIterator c_p_iterator (nurb); 749 while (c_p_iterator.pick (ctrl_pnt_array_ptr++)) ;749 while (c_p_iterator.pick (ctrl_pnt_array_ptr++)){} 750 750 751 751 // Get vis attributes - pick up defaults if none. -
trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
r754 r789 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.3 6 2008/02/18 08:53:49 asaimExp $27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.37 2008/04/04 13:32:22 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 133 133 glPushMatrix(); 134 134 glLoadIdentity(); 135 // glOrtho (-1., 1., -1., 1., -G4OPENGL_DBL_MAX, G4OPENGL_DBL_MAX); 136 glOrtho (-1., 1., -1., 1., -1., 1.); 135 glOrtho (-1., 1., -1., 1., -G4OPENGL_FLT_BIG, G4OPENGL_FLT_BIG); 137 136 glMatrixMode (GL_MODELVIEW); 138 137 glPushMatrix(); -
trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredViewer.cc
r688 r789 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredViewer.cc,v 1.2 3 2007/04/04 16:50:27allison Exp $27 // $Id: G4OpenGLStoredViewer.cc,v 1.24 2008/04/04 13:32:22 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 168 168 169 169 // Display time at "head" of time range, which is fEndTime... 170 if (fDisplayHeadTime && fEndTime < G4OPENGL_DBL_MAX) {170 if (fDisplayHeadTime && fEndTime < DBL_MAX) { 171 171 glMatrixMode (GL_PROJECTION); 172 172 glPushMatrix(); 173 173 glLoadIdentity(); 174 glOrtho (-1., 1., -1., 1., -G4OPENGL_ DBL_MAX, G4OPENGL_DBL_MAX);174 glOrtho (-1., 1., -1., 1., -G4OPENGL_FLT_BIG, G4OPENGL_FLT_BIG); 175 175 glMatrixMode (GL_MODELVIEW); 176 176 glPushMatrix(); … … 193 193 194 194 // Display light front... 195 if (fDisplayLightFront && fEndTime < G4OPENGL_DBL_MAX) {195 if (fDisplayLightFront && fEndTime < DBL_MAX) { 196 196 G4double lightFrontRadius = (fEndTime - fDisplayLightFrontT) * c_light; 197 197 if (lightFrontRadius > 0.) { -
trunk/geant4/visualization/OpenGL/src/G4OpenGLViewer.cc
r754 r789 25 25 // 26 26 // 27 // $Id: G4OpenGLViewer.cc,v 1.3 6 2008/03/10 16:57:04 lgarnierExp $27 // $Id: G4OpenGLViewer.cc,v 1.37 2008/04/04 13:32:22 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 90 90 antialiasing_enabled (false), 91 91 haloing_enabled (false), 92 fStartTime(- G4OPENGL_DBL_MAX),93 fEndTime( G4OPENGL_DBL_MAX),92 fStartTime(-DBL_MAX), 93 fEndTime(DBL_MAX), 94 94 fFadeFactor(0.), 95 95 fDisplayHeadTime(false), -
trunk/geant4/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc
r608 r789 25 25 // 26 26 // 27 // $Id: G4OpenGLViewerMessenger.cc,v 1.1 1 2007/11/15 10:14:23allison Exp $27 // $Id: G4OpenGLViewerMessenger.cc,v 1.12 2008/04/04 13:32:22 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 … … 158 158 fpCommandEndTime->SetGuidance("Set end and range of track time."); 159 159 parameter = new G4UIparameter ("end-time", 'd', omitable = false); 160 parameter->SetDefaultValue( G4OPENGL_DBL_MAX);160 parameter->SetDefaultValue(DBL_MAX); 161 161 fpCommandEndTime->SetParameter(parameter); 162 162 parameter = new G4UIparameter ("end-time-unit", 's', omitable = false); … … 188 188 fpCommandStartTime->SetGuidance("Set start and range of track time."); 189 189 parameter = new G4UIparameter ("start-time", 'd', omitable = false); 190 parameter->SetDefaultValue(- G4OPENGL_DBL_MAX);190 parameter->SetDefaultValue(-DBL_MAX); 191 191 fpCommandStartTime->SetParameter(parameter); 192 192 parameter = new G4UIparameter ("start-time-unit", 's', omitable = false);
Note: See TracChangeset
for help on using the changeset viewer.