Changeset 930 for trunk


Ignore:
Timestamp:
Feb 18, 2009, 10:59:48 AM (15 years ago)
Author:
garnier
Message:

rien de special, juste un backup avant de commiter sur cvs

Location:
trunk/source/visualization
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc

    r929 r930  
    368368  // Draw...
    369369///   if (sizeType == world) {  // Size specified in world coordinates.
    370     printf("G4OpenGLSceneHandler::AddCircleSquare  world\n");
    371     DrawXYPolygon (shape, size, centre, pVA);
     370    //    printf("G4OpenGLSceneHandler::AddCircleSquare  world\n");
     371    //    DrawXYPolygon (shape, size, centre, pVA);
    372372
    373373//   } else { // Size specified in screen (window) coordinates.
    374374//     printf("G4OpenGLSceneHandler::AddCircleSquare  bitmap\n");
    375375
    376 //     glRasterPos3d(centre.x(),centre.y(),centre.z());
    377 //     const GLubyte* marker =
    378 //       G4OpenGLBitMapStore::GetBitMap(shape, size, filled);
    379 //     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
    380 //     glBitmap(GLsizei(size), GLsizei(size), size/2., size/2., 0., 0., marker);
     376     glRasterPos3d(centre.x(),centre.y(),centre.z());
     377     const GLubyte* marker =
     378       G4OpenGLBitMapStore::GetBitMap(shape, size, filled);
     379     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
     380     glBitmap(GLsizei(size), GLsizei(size), size/2., size/2., 0., 0., marker);
    381381//   }
    382382}

  • trunk/source/visualization/OpenInventor/src/SoGL2PSAction.cc

    r929 r930  
    3333/*--------------------------------------------------------------------------*/
    3434
    35 #define G4DEBUG_VIS_OGL 1
     35//#define G4DEBUG_VIS_OGL 1
    3636
    3737// this :
    … …  
    172172}
    173173
    174 void SoGL2PSAction::DrawXYPolygon
    175 (G4double size,
    176  const G4Point3D& centre,
    177  const G4VisAttributes* pApplicableVisAtts)
    178 {
    179   G4int nSides;
    180   G4double startPhi;
    181   nSides = GetNoOfSides(pApplicableVisAtts);
    182   startPhi = 0.;
    183 
    184   const G4Vector3D& viewpointDirection =
    185     fpViewer -> GetViewParameters().GetViewpointDirection();
    186   const G4Vector3D& up = fpViewer->GetViewParameters().GetUpVector();
    187   const G4double dPhi = twopi / nSides;
    188   const G4double radius = size / 2.;
    189   G4Vector3D start = radius * (up.cross(viewpointDirection)).unit();
    190   G4double phi;
    191   G4int i;
    192 
    193   glBegin (GL_POLYGON);
    194   for (i = 0, phi = startPhi; i < nSides; i++, phi += dPhi) {
    195     G4Vector3D r = start; r.rotate(phi, viewpointDirection);
    196     G4Vector3D p = centre + r;
    197     glVertex3d (p.x(), p.y(), p.z());
    198   }
    199   glEnd ();
    200 }
    201174
    202175#endif

  • trunk/source/visualization/OpenInventor/src/SoMarkerSet.cc

    r929 r930  
    711711//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    712712{
    713   printf("drawMarker\n");
     713  //  printf("drawMarker\n");
    714714  GLsizei w = 0,h = 0;
    715715  GLfloat xorig = 0,yorig = 0;

  • trunk/source/visualization/externals/gl2ps/GNUmakefile

    r921 r930  
    1 # $Id: GNUmakefile,v 1.1 2009/06/02 12:39:31 garnier Exp $
     1# $Id: GNUmakefile,v 1.1 2009/02/18 09:54:12 lgarnier Exp $
    22# -------------------------------------------------------------
    33# GNUmakefile for gl2ps.  Laurent Garnier, 6/2/09.

  • trunk/source/visualization/externals/gl2ps/History

    r924 r930  
    1 $Id: History,v 1.106 2009/02/16 16:05:06 garnier Exp $
     1$Id: History,v 1.1 2009/02/18 09:54:12 lgarnier Exp $
    22-------------------------------------------------------------------
    33

  • trunk/source/visualization/externals/gl2ps/include/gl2ps.h

    r919 r930  
    2828 * Copyright (C) 1999-2003  Christophe Geuzaine
    2929 *
    30  * $Id: gl2ps.h,v 1.5 2006/06/29 21:23:11 gunter Exp $
     30 * $Id: gl2ps.h,v 1.1 2009/02/18 09:54:12 lgarnier Exp $
    3131 *
    3232 * E-mail: geuz@geuz.org

  • trunk/source/visualization/externals/gl2ps/src/gl2ps.cc

    r923 r930  
    3737 * Copyright (C) 1999-2003  Christophe Geuzaine
    3838 *
    39  * $Id: gl2ps.cc,v 1.12 2008/04/30 10:05:31 allison Exp $
     39 * $Id: gl2ps.cc,v 1.1 2009/02/18 09:54:12 lgarnier Exp $
    4040 *
    4141 * E-mail: geuz@geuz.org
Note: See TracChangeset for help on using the changeset viewer.