Changeset 930 for trunk/source
- Timestamp:
- Feb 18, 2009, 10:59:48 AM (15 years ago)
- Location:
- trunk/source/visualization
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
r929 r930 368 368 // Draw... 369 369 /// 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); 372 372 373 373 // } else { // Size specified in screen (window) coordinates. 374 374 // printf("G4OpenGLSceneHandler::AddCircleSquare bitmap\n"); 375 375 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); 381 381 // } 382 382 } -
trunk/source/visualization/OpenInventor/src/SoGL2PSAction.cc
r929 r930 33 33 /*--------------------------------------------------------------------------*/ 34 34 35 #define G4DEBUG_VIS_OGL 135 //#define G4DEBUG_VIS_OGL 1 36 36 37 37 // this : … … 172 172 } 173 173 174 void SoGL2PSAction::DrawXYPolygon175 (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 }201 174 202 175 #endif -
trunk/source/visualization/OpenInventor/src/SoMarkerSet.cc
r929 r930 711 711 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// 712 712 { 713 printf("drawMarker\n");713 // printf("drawMarker\n"); 714 714 GLsizei w = 0,h = 0; 715 715 GLfloat xorig = 0,yorig = 0; -
trunk/source/visualization/externals/gl2ps/GNUmakefile
r921 r930 1 # $Id: GNUmakefile,v 1.1 2009/0 6/02 12:39:31garnier Exp $1 # $Id: GNUmakefile,v 1.1 2009/02/18 09:54:12 lgarnier Exp $ 2 2 # ------------------------------------------------------------- 3 3 # GNUmakefile for gl2ps. Laurent Garnier, 6/2/09. -
trunk/source/visualization/externals/gl2ps/History
r924 r930 1 $Id: History,v 1.1 06 2009/02/16 16:05:06garnier Exp $1 $Id: History,v 1.1 2009/02/18 09:54:12 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 -
trunk/source/visualization/externals/gl2ps/include/gl2ps.h
r919 r930 28 28 * Copyright (C) 1999-2003 Christophe Geuzaine 29 29 * 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 $ 31 31 * 32 32 * E-mail: geuz@geuz.org -
trunk/source/visualization/externals/gl2ps/src/gl2ps.cc
r923 r930 37 37 * Copyright (C) 1999-2003 Christophe Geuzaine 38 38 * 39 * $Id: gl2ps.cc,v 1.1 2 2008/04/30 10:05:31 allisonExp $39 * $Id: gl2ps.cc,v 1.1 2009/02/18 09:54:12 lgarnier Exp $ 40 40 * 41 41 * E-mail: geuz@geuz.org
Note: See TracChangeset
for help on using the changeset viewer.