Changeset 931 for trunk/source/visualization/OpenInventor

Timestamp:

Feb 25, 2009, 4:19:05 PM (15 years ago)

Author:

garnier

Message:

test pour GL_POINTS au lieu de glBitmap

Location:

trunk/source/visualization/OpenInventor

Files:

• History (modified) (2 diffs)
• src/G4OpenInventorSceneHandler.cc (modified) (3 diffs)
• src/SoMarkerSet.cc (modified) (3 diffs)

trunk/source/visualization/OpenInventor/History

@@ -1 @@
-$Id: History,v 1.97 2009/02/16 15:31:05 lgarnier Exp $
+$Id: History,v 1.98 2009/02/18 10:04:25 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/OpenInventor
 -------------------------------------------
+
+18 February 2009, Laurent Garnier
+ - Bug fix in gl2ps drawing
 
 16 February 2009, Laurent Garnier

trunk/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenInventorSceneHandler.cc,v 1.54 2008/04/04 13:40:04 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4OpenInventorSceneHandler.cc,v 1.55 2009/02/18 14:21:38 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -46 +46 @@
 #include <Inventor/nodes/SoLineSet.h>
 #include <Inventor/nodes/SoCube.h>
-#include <Inventor/nodes/SoSphere.h>
 #include <Inventor/nodes/SoFont.h>
 #include <Inventor/nodes/SoText2.h>
@@ -230 +229 @@
 void G4OpenInventorSceneHandler::AddPrimitive (const G4Polymarker& polymarker)
 {
-  printf("G4OpenInventorSceneHandler::AddPrimitive------ \n");
-
   AddProperties(polymarker.GetVisAttributes()); // Transformation, colour, etc.
 

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

@@ -657 +657 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  printf("HEPVis_SoMarkerSet::GLRender\n");
+  //  printf("HEPVis_SoMarkerSet::GLRender\n");
   SoState* state = aAction->getState();
 
@@ -711 +711 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  //  printf("drawMarker\n");
   GLsizei w = 0,h = 0;
   GLfloat xorig = 0,yorig = 0;
@@ -719 +718 @@
     w = h = 5;
     xorig = yorig = 2;
+  } else if((aStyle>=18)&&(aStyle<36)) {
+    w = h = 7;
+    xorig = yorig = 3;
+  } else if((aStyle>=36)&&(aStyle<54)) {
+    w = h = 9;
+    xorig = yorig = 4;
+  } else {
+    return;
+  }
+  if (w != 0) {
     GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
     glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
     delete bitmap;
-  } else if((aStyle>=18)&&(aStyle<36)) {
-    w = h = 7;
-    xorig = yorig = 3;
-    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
-    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
-    delete bitmap;
-  } else if((aStyle>=36)&&(aStyle<54)) {
-    w = h = 9;
-    xorig = yorig = 4;
-    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
-    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
-    delete bitmap;
-  } else {
-    return;
   }
+  printf("DM %d %d %f %f",w,h,xorig,yorig);
 
   if(aAction->isOfType(SoGL2PSAction::getClassTypeId())) {
-    ((SoGL2PSAction*)aAction)->addBitmap(w,h,xorig,yorig,xmove,ymove);
+    printf(" GL2PS ");
+    ((SoGL2PSAction*)aAction)->addBitmap(w-2,h-2,xorig,yorig,xmove,ymove);
   }