Changeset 1196 for trunk/source/visualization/OpenInventor/src/SoMarkerSet.cc

Timestamp:

Nov 25, 2009, 5:13:58 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

File:

• trunk/source/visualization/OpenInventor/src/SoMarkerSet.cc (modified) (1 diff)

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

@@ -717 +717 @@
     w = h = 5;
     xorig = yorig = 2;
+    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;
   }
-  if (w != 0) {
-    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
-    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
-    delete bitmap;
-  }
-#ifdef G4DEBUG_VIS_OI
-  printf("DM %d %d %f %f",w,h,xorig,yorig);
-#endif
 
   if(aAction->isOfType(SoGL2PSAction::getClassTypeId())) {
-#ifdef G4DEBUG_VIS_OI
-    printf(" GL2PS ");
-#endif
-    ((SoGL2PSAction*)aAction)->addBitmap(w-2,h-2,xorig,yorig,xmove,ymove);
+    ((SoGL2PSAction*)aAction)->addBitmap(w,h,xorig,yorig,xmove,ymove);
   }