Changeset 936 for trunk/source/visualization/OpenGL
- Timestamp:
- Mar 3, 2009, 5:46:00 PM (16 years ago)
- Location:
- trunk/source/visualization/OpenGL
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
r935 r936 108 108 private: 109 109 G4Polymarker fLastPolymarker ; 110 std::vector< G4Polymarker > fLastPolymarkers ; 110 111 }; 111 112 -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
r915 r936 81 81 fMemoryForDisplayLists (true), 82 82 fAddPrimitivePreambleNestingDepth (0), 83 fTopPODL (0) 83 fTopPODL (0), 84 fLastPolymarker(), 85 fLastPolymarkers() 84 86 {} 85 87 … … 207 209 void G4OpenGLStoredSceneHandler::AddPrimitive (const G4Polymarker& polymarker) 208 210 { 211 212 // 40,83 N03 lancement 213 // 289,69 10Gev supp doublons + bitmap 21 frame en 10 sec 214 // 343,45 10Gev full polymarker + bitmap 15 frame en 10 sec 215 // 351,67 10Gev full polymarker - bitmap 31 frame en 10 sec 216 // 294,90 10Gev supp doublons - bitmap 42 frame en 10 sec 217 // Check 218 int reste = polymarker.size(); 219 for (unsigned int a=0; a< fLastPolymarkers.size();a++) { 220 for (unsigned int b=0; b< polymarker.size();b++) { 221 if (( fLastPolymarkers[a].GetPosition().x() == polymarker[b].x()) && 222 ( fLastPolymarkers[a].GetPosition().y() == polymarker[b].y()) && 223 ( fLastPolymarkers[a].GetPosition().z() == polymarker[b].z())) { 224 reste --; 225 printf("G4OpenGLStoredSceneHandler::AddPrimitive DOUBLON %d et pos %d reste %d ----------- point %f %f %f\n",a,b,reste,polymarker[b].x(),polymarker[b].y(),polymarker[b].z()); 226 } 227 } 228 } 229 // Add 230 for (unsigned int a=0; a< polymarker.size();a++) { 231 G4Polymarker tmp; 232 tmp.SetPosition(polymarker[a]); 233 fLastPolymarkers.push_back(tmp); 234 } 235 236 #define TEST_MARKER 1 237 #ifdef TEST_MARKER 238 // if it is already done 239 if (polymarker.size() >0) { 240 if (( fLastPolymarker.GetPosition().x() == polymarker[0].x()) && 241 ( fLastPolymarker.GetPosition().y() == polymarker[0].y()) && 242 ( fLastPolymarker.GetPosition().z() == polymarker[0].z())) { 243 if (fpViewer->GetViewParameters().IsPicking()) { 244 glLoadName(++fPickName); 245 fPickMap[fPickName] = 0; 246 } 247 printf("G4OpenGLStoredSceneHandler::AddPrimitive SUPPR ----------- point %f %f %f\n",polymarker[0].x(),polymarker[0].y(),polymarker[0].z()); 248 const G4Colour& c = GetColour (polymarker); 249 glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ()); 250 G4OpenGLSceneHandler::AddPrimitive(polymarker); 251 fLastPolymarker.SetPosition(polymarker[polymarker.size()-1]); 252 return; 253 } 254 } 255 #endif 256 printf("G4OpenGLStoredSceneHandler::AddPrimitive Cree une nouvelle liste de markers\n"); 209 257 AddPrimitivePreamble(polymarker); 210 258 G4OpenGLSceneHandler::AddPrimitive(polymarker); 211 259 AddPrimitivePostamble(); 260 fLastPolymarker.SetPosition(polymarker[polymarker.size()-1]); 212 261 } 213 262 … … 297 346 void G4OpenGLStoredSceneHandler::EndModeling () { 298 347 // Make a List which calls the other lists. 348 printf("G4OpenGLStoredSceneHandler::EndModeling Cree une nouvelle liste+++++++++++++++++++++++++++\n"); 299 349 fTopPODL = glGenLists (1); 300 350 if (glGetError() == GL_OUT_OF_MEMORY) { // Could pre-allocate?
Note: See TracChangeset
for help on using the changeset viewer.