Changeset 789 for trunk/geant4/visualization/OpenGL/src

Timestamp:

Apr 23, 2008, 3:28:50 PM (16 years ago)

Author:

garnier

Message:

r815@wl-72126: garnier | 2008-04-23 15:28:34 +0200
maj par rapport au CVS

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLImmediateSceneHandler.cc (modified) (2 diffs)
• G4OpenGLSceneHandler.cc (modified) (3 diffs)
• G4OpenGLStoredSceneHandler.cc (modified) (2 diffs)
• G4OpenGLStoredViewer.cc (modified) (3 diffs)
• G4OpenGLViewer.cc (modified) (2 diffs)
• G4OpenGLViewerMessenger.cc (modified) (3 diffs)

trunk/geant4/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.29 2008/02/18 08:53:49 asaim Exp $
+// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.30 2008/04/04 13:32:22 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -171 +171 @@
   glPushMatrix();
   glLoadIdentity();
-//////  glOrtho (-1., 1., -1., 1., -G4OPENGL_DBL_MAX, G4OPENGL_DBL_MAX);
-  glOrtho (-1., 1., -1., 1., -1., 1.);
+  glOrtho (-1., 1., -1., 1., -G4OPENGL_FLT_BIG, G4OPENGL_FLT_BIG);
   glMatrixMode (GL_MODELVIEW);
   glPushMatrix();

trunk/geant4/visualization/OpenGL/src/G4OpenGLSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLSceneHandler.cc,v 1.53 2008/02/01 06:26:45 allison Exp $
+// $Id: G4OpenGLSceneHandler.cc,v 1.54 2008/04/04 13:32:22 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -736 +736 @@
   u_knot_array = u_knot_array_ptr = new GLfloat [nurb.GetnbrKnots(G4NURBS::U)];
   G4NURBS::KnotsIterator u_iterator (nurb, G4NURBS::U);
-  while (u_iterator.pick (u_knot_array_ptr++));
+  while (u_iterator.pick (u_knot_array_ptr++)){}
 
   GLfloat *v_knot_array, *v_knot_array_ptr;
   v_knot_array = v_knot_array_ptr = new GLfloat [nurb.GetnbrKnots(G4NURBS::V)];
   G4NURBS::KnotsIterator v_iterator (nurb, G4NURBS::V);
-  while (v_iterator.pick (v_knot_array_ptr++));
+  while (v_iterator.pick (v_knot_array_ptr++)){}
 
   GLfloat *ctrl_pnt_array, *ctrl_pnt_array_ptr;
@@ -747 +747 @@
     new GLfloat [nurb.GettotalnbrCtrlPts () * G4NURBS::NofC];
   G4NURBS::CtrlPtsCoordsIterator c_p_iterator (nurb);
-  while (c_p_iterator.pick (ctrl_pnt_array_ptr++));
+  while (c_p_iterator.pick (ctrl_pnt_array_ptr++)){}
 
   // Get vis attributes - pick up defaults if none.

trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.cc,v 1.36 2008/02/18 08:53:49 asaim Exp $
+// $Id: G4OpenGLStoredSceneHandler.cc,v 1.37 2008/04/04 13:32:22 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -133 +133 @@
     glPushMatrix();
     glLoadIdentity();
-//    glOrtho (-1., 1., -1., 1., -G4OPENGL_DBL_MAX, G4OPENGL_DBL_MAX);
-    glOrtho (-1., 1., -1., 1., -1., 1.);
+    glOrtho (-1., 1., -1., 1., -G4OPENGL_FLT_BIG, G4OPENGL_FLT_BIG);
     glMatrixMode (GL_MODELVIEW);
     glPushMatrix();

trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredViewer.cc,v 1.23 2007/04/04 16:50:27 allison Exp $
+// $Id: G4OpenGLStoredViewer.cc,v 1.24 2008/04/04 13:32:22 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -168 +168 @@
 
   // Display time at "head" of time range, which is fEndTime...
-  if (fDisplayHeadTime && fEndTime < G4OPENGL_DBL_MAX) {
+  if (fDisplayHeadTime && fEndTime < DBL_MAX) {
     glMatrixMode (GL_PROJECTION);
     glPushMatrix();
     glLoadIdentity();
-    glOrtho (-1., 1., -1., 1., -G4OPENGL_DBL_MAX, G4OPENGL_DBL_MAX);
+    glOrtho (-1., 1., -1., 1., -G4OPENGL_FLT_BIG, G4OPENGL_FLT_BIG);
     glMatrixMode (GL_MODELVIEW);
     glPushMatrix();
@@ -193 +193 @@
 
   // Display light front...
-  if (fDisplayLightFront && fEndTime < G4OPENGL_DBL_MAX) {
+  if (fDisplayLightFront && fEndTime < DBL_MAX) {
     G4double lightFrontRadius = (fEndTime - fDisplayLightFrontT) * c_light;
     if (lightFrontRadius > 0.) {

trunk/geant4/visualization/OpenGL/src/G4OpenGLViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.cc,v 1.36 2008/03/10 16:57:04 lgarnier Exp $
+// $Id: G4OpenGLViewer.cc,v 1.37 2008/04/04 13:32:22 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -90 +90 @@
 antialiasing_enabled (false),
 haloing_enabled (false),
-fStartTime(-G4OPENGL_DBL_MAX),
-fEndTime(G4OPENGL_DBL_MAX),
+fStartTime(-DBL_MAX),
+fEndTime(DBL_MAX),
 fFadeFactor(0.),
 fDisplayHeadTime(false),

trunk/geant4/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewerMessenger.cc,v 1.11 2007/11/15 10:14:23 allison Exp $
+// $Id: G4OpenGLViewerMessenger.cc,v 1.12 2008/04/04 13:32:22 allison Exp $
 // GEANT4 tag $Name:  $
 
@@ -158 +158 @@
   fpCommandEndTime->SetGuidance("Set end and range of track time.");
   parameter = new G4UIparameter ("end-time", 'd', omitable = false);
-  parameter->SetDefaultValue(G4OPENGL_DBL_MAX);
+  parameter->SetDefaultValue(DBL_MAX);
   fpCommandEndTime->SetParameter(parameter);
   parameter = new G4UIparameter ("end-time-unit", 's', omitable = false);
@@ -188 +188 @@
   fpCommandStartTime->SetGuidance("Set start and range of track time.");
   parameter = new G4UIparameter ("start-time", 'd', omitable = false);
-  parameter->SetDefaultValue(-G4OPENGL_DBL_MAX);
+  parameter->SetDefaultValue(-DBL_MAX);
   fpCommandStartTime->SetParameter(parameter);
   parameter = new G4UIparameter ("start-time-unit", 's', omitable = false);