lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.3.1 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-02-28 16:16:20 +01:00
parent a3452e42ac
commit 4597adb7c4
267 changed files with 14761 additions and 24650 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/OpenGL/History
+4 -1
View File
@@ -1,4 +1,4 @@
$Id: History 101714 2016-11-22 08:53:13Z gcosmo $
$Id: History 102570 2017-02-09 08:40:47Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,9 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
6th January 2017 John Allison (opengl-V10-02-27)
- G4OpenGLSceneHandler.cc: Fixed bug in ScaledFlush.
21th November 2016 Laurent Garnier (opengl-V10-02-26)
- Go back on the glCheckFramebufferStatus(): comment out this command
source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
+51 -27
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4OpenGLSceneHandler.cc 99503 2016-09-26 07:17:29Z gcosmo $
// $Id: G4OpenGLSceneHandler.cc 102570 2017-02-09 08:40:47Z gcosmo $
//
//
// Andrew Walkden 27th March 1996
@@ -120,17 +120,54 @@ void G4OpenGLSceneHandler::ScaledFlush()
// Drawing transients, e.g., trajectories.
if (!fpScene) {
// No scene, so probably not in event loop.
glFlush();
return;
}
// Get event from modeling parameters
if (!fpModel) {
// No model, so probably not in event loop
glFlush();
return;
}
const G4ModelingParameters* modelingParameters =
fpModel->GetModelingParameters();
if (!modelingParameters) {
// No modeling parameters, so probably not in event loop.
glFlush();
return;
}
const G4Event* thisEvent = modelingParameters->GetEvent();
if (!thisEvent) {
// No event, so probably not in event loop.
glFlush();
return;
}
G4RunManager* runMan = G4RunManager::GetRunManager();
#ifdef G4MULTITHREADED
if (G4Threading::IsMultithreadedApplication()) {
runMan = G4MTRunManager::GetMasterRunManager();
}
#endif
if (!runMan) {
glFlush();
return;
}
const G4Run* thisRun = runMan->GetCurrentRun();
if (!thisRun) {
glFlush();
return;
}
switch (fFlushAction) {
case endOfEvent:
// If "/vis/scene/endOfEventAction refresh", primitives are flushed at
// end of event anyway.
// But if "/vis/scene/endOfEventAction accumulate", ShowView is not
// called until end of run, so we have to watch for a new event.
if (fpScene->GetRefreshAtEndOfEvent()) return;
else {
// end of run anyway, so only scale if false.
if (!fpScene->GetRefreshAtEndOfEvent()) {
// But if "/vis/scene/endOfEventAction accumulate", ShowView is not
// called until end of run, so we have to watch for a new event.
// Get event from modeling parameters
const G4Event* thisEvent = fpModel->GetModelingParameters()->GetEvent();
if (!thisEvent) {glFlush(); return;}
G4int thisEventID = thisEvent->GetEventID();
static G4int lastEventID = 0;
if (thisEventID != lastEventID) {
@@ -141,20 +178,10 @@ void G4OpenGLSceneHandler::ScaledFlush()
break;
case endOfRun:
// If "/vis/scene/endOfRunAction refresh", primitives are flushed at
// end of run anyway.
// If "/vis/scene/endOfRunAction accumulate", ShowView is never called
// so we have to watch for a new run.
if (fpScene->GetRefreshAtEndOfRun()) return;
else {
G4RunManager* runMan = G4RunManager::GetRunManager();
#ifdef G4MULTITHREADED
if (G4Threading::IsMultithreadedApplication()) {
runMan = G4MTRunManager::GetMasterRunManager();
}
#endif
if (!runMan) {glFlush(); return;}
const G4Run* thisRun = runMan->GetCurrentRun();
if (!thisRun) {glFlush(); return;}
// end of run anyway, so only scale if false.
if (!fpScene->GetRefreshAtEndOfRun()) {
// If "/vis/scene/endOfRunAction accumulate", ShowView is never called
// so we have to watch for a new run.
G4int thisRunID = thisRun->GetRunID();
static G4int lastRunID = 0;
if (thisRunID != lastRunID) {
@@ -178,11 +205,8 @@ void G4OpenGLSceneHandler::ScaledFlush()
}
case NthEvent:
// If "/vis/scene/endOfEventAction refresh", primitives are flushed at
// end of event anyway.
if (fpScene->GetRefreshAtEndOfEvent()) return;
else {
// Get event from modeling parameters
const G4Event* thisEvent = fpModel->GetModelingParameters()->GetEvent();
// end of event anyway, so only scale if false.
if (!fpScene->GetRefreshAtEndOfEvent()) {
G4int thisEventID = thisEvent->GetEventID();
static G4int lastEventID = 0;
if (thisEventID != lastEventID) {