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

Import Geant4 0.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:09:25 +02:00
parent b97f8d0df7
commit aaa409b6ee
2922 changed files with 55107 additions and 81674 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/OpenGL/src/G4OpenGLImmediateScene.cc → source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
+21 -21
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLImmediateScene.cc,v 2.3 1998/11/06 13:42:25 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.2 1999/01/11 00:47:42 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 10th February 1997
@@ -27,8 +27,8 @@
#include <GL/glx.h>
#include <GL/glu.h>
#include "G4OpenGLScene.hh"
#include "G4OpenGLView.hh"
#include "G4OpenGLSceneHandler.hh"
#include "G4OpenGLViewer.hh"
#include "G4OpenGLTransform3D.hh"
#include "G4Point3D.hh"
#include "G4Normal3D.hh"
@@ -40,25 +40,25 @@
#include "G4Polyhedron.hh"
#include "G4VisAttributes.hh"
#include "G4OpenGLImmediateScene.hh"
#include "G4OpenGLImmediateSceneHandler.hh"
G4OpenGLImmediateScene::G4OpenGLImmediateScene (G4VGraphicsSystem& system,
G4OpenGLImmediateSceneHandler::G4OpenGLImmediateSceneHandler (G4VGraphicsSystem& system,
const G4String& name):
G4OpenGLScene (system, fSceneIdCount++, name)
G4OpenGLSceneHandler (system, fSceneIdCount++, name)
{
fSceneCount++;
}
G4OpenGLImmediateScene::~G4OpenGLImmediateScene ()
G4OpenGLImmediateSceneHandler::~G4OpenGLImmediateSceneHandler ()
{
fSceneCount--;
}
#include <iomanip.h>
void G4OpenGLImmediateScene::BeginPrimitives
void G4OpenGLImmediateSceneHandler::BeginPrimitives
(const G4Transform3D& objectTransformation) {
G4VScene::BeginPrimitives (objectTransformation);
G4VSceneHandler::BeginPrimitives (objectTransformation);
glPushMatrix();
G4OpenGLTransform3D oglt (objectTransformation);
@@ -75,37 +75,37 @@ void G4OpenGLImmediateScene::BeginPrimitives
glMultMatrixd (oglt.GetGLMatrix ());
}
void G4OpenGLImmediateScene::EndPrimitives () {
void G4OpenGLImmediateSceneHandler::EndPrimitives () {
glPopMatrix();
if (fReadyForTransients) {
glFlush ();
}
G4VScene::EndPrimitives ();
G4VSceneHandler::EndPrimitives ();
}
void G4OpenGLImmediateScene::BeginModeling () {
void G4OpenGLImmediateSceneHandler::BeginModeling () {
if (fpView -> GetViewParameters ().GetDrawingStyle() == G4ViewParameters::hlr) {
if (fpViewer -> GetViewParameters ().GetDrawingStyle() == G4ViewParameters::hlr) {
initialize_hlr = true;
}
G4VScene::BeginModeling();
G4VSceneHandler::BeginModeling();
}
void G4OpenGLImmediateScene::EndModeling () {
G4VScene::EndModeling ();
if (fpView -> GetViewParameters ().GetDrawingStyle() == G4ViewParameters::hlr) {
void G4OpenGLImmediateSceneHandler::EndModeling () {
G4VSceneHandler::EndModeling ();
if (fpViewer -> GetViewParameters ().GetDrawingStyle() == G4ViewParameters::hlr) {
initialize_hlr = true;
// glDisable (GL_POLYGON_OFFSET_FILL);
}
}
G4int G4OpenGLImmediateScene::GetSceneCount () {
G4int G4OpenGLImmediateSceneHandler::GetSceneCount () {
return fSceneCount;
}
G4int G4OpenGLImmediateScene::fSceneIdCount = 0;
G4int G4OpenGLImmediateSceneHandler::fSceneIdCount = 0;
G4int G4OpenGLImmediateScene::fSceneCount = 0;
G4int G4OpenGLImmediateSceneHandler::fSceneCount = 0;
#endif
source/visualization/OpenGL/src/G4OpenGLImmediateView.cc → source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
+8 -8
View File
@@ -5,18 +5,18 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLImmediateView.cc,v 2.1 1998/07/13 17:11:25 urbi Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLImmediateViewer.cc,v 1.2 1999/01/11 00:47:42 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 7th February 1997
// Class G4OpenGLImmediateView : Encapsulates the `immediateness' of
// Class G4OpenGLImmediateViewer : Encapsulates the `immediateness' of
// an OpenGL view, for inheritance by
// derived (X, Xm...) classes.
#ifdef G4VIS_BUILD_OPENGL_DRIVER
#include "G4OpenGLImmediateView.hh"
#include "G4OpenGLImmediateViewer.hh"
#include <GL/gl.h>
#include <GL/glx.h>
@@ -26,10 +26,10 @@
#include <assert.h>
#include <unistd.h>
G4OpenGLImmediateView::G4OpenGLImmediateView (G4OpenGLImmediateScene& scene):
G4VView (scene, -1),
G4OpenGLView (scene),
fScene (scene)
G4OpenGLImmediateViewer::G4OpenGLImmediateViewer (G4OpenGLImmediateSceneHandler& scene):
G4VViewer (scene, -1),
G4OpenGLViewer (scene),
fSceneHandler (scene)
{}
#endif
source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
+16 -16
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLImmediateWin32.cc,v 2.1 1998/07/13 17:11:26 urbi Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLImmediateWin32.cc,v 1.3 1999/01/11 00:47:43 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// OpenGLImmediateWin32 graphics system factory.
@@ -18,11 +18,11 @@
#include <GL/glu.h>
#include "G4VisFeaturesOfOpenGL.hh"
#include "G4VScene.hh"
#include "G4OpenGLScene.hh"
#include "G4OpenGLView.hh"
#include "G4VSceneHandler.hh"
#include "G4OpenGLSceneHandler.hh"
#include "G4OpenGLViewer.hh"
#include "G4OpenGLImmediateWin32.hh"
#include "G4OpenGLImmediateWin32View.hh"
#include "G4OpenGLImmediateWin32Viewer.hh"
G4OpenGLImmediateWin32::G4OpenGLImmediateWin32 ():
G4VGraphicsSystem ("OpenGLImmediateWin32",
@@ -30,20 +30,20 @@ G4OpenGLImmediateWin32::G4OpenGLImmediateWin32 ():
G4VisFeaturesOfOpenGLIWin32 (),
G4VGraphicsSystem::threeD) {}
G4VScene* G4OpenGLImmediateWin32::CreateScene () {
G4VScene* pScene = new G4OpenGLImmediateScene (*this);
G4cout << G4OpenGLImmediateScene::GetSceneCount ()
G4VSceneHandler* G4OpenGLImmediateWin32::CreateSceneHandler () {
G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this);
G4cout << G4OpenGLImmediateSceneHandler::GetSceneCount ()
<< ' ' << fName << " scenes extanct." << endl;
return pScene;
}
G4VView* G4OpenGLImmediateWin32::CreateView (G4VScene& scene) {
G4VView* pView =
new G4OpenGLImmediateWin32View ((G4OpenGLImmediateScene&) scene);
G4VViewer* G4OpenGLImmediateWin32::CreateViewer (G4VSceneHandler& scene) {
G4VViewer* pView =
new G4OpenGLImmediateWin32Viewer ((G4OpenGLImmediateSceneHandler&) scene);
if (pView) {
if (pView -> GetViewId () < 0) {
G4cerr << "G4OpenGLImmediateWin32::CreateView: error flagged by negative"
" view id in G4OpenGLImmediateWin32View creation."
G4cerr << "G4OpenGLImmediateWin32::CreateViewer: error flagged by negative"
" view id in G4OpenGLImmediateWin32Viewer creation."
"\n Destroying view and returning null pointer."
<< endl;
delete pView;
@@ -51,8 +51,8 @@ G4VView* G4OpenGLImmediateWin32::CreateView (G4VScene& scene) {
}
}
else {
G4cerr << "G4OpenGLImmediateWin32::CreateView: null pointer on"
" new G4OpenGLImmediateWin32View." << endl;
G4cerr << "G4OpenGLImmediateWin32::CreateViewer: null pointer on"
" new G4OpenGLImmediateWin32Viewer." << endl;
}
return pView;
}
source/visualization/OpenGL/src/G4OpenGLImmediateWin32View.cc → source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc
+11 -11
View File
@@ -5,16 +5,16 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLImmediateWin32View.cc,v 2.2 1998/08/04 14:17:16 ajw Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.1 1999/01/09 16:23:12 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Class G4OpenGLImmediateWin32View : a class derived from G4OpenGLWin32View and
// G4OpenGLImmediateView.
// Class G4OpenGLImmediateWin32Viewer : a class derived from G4OpenGLWin32Viewer and
// G4OpenGLImmediateViewer.
#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
#include "G4OpenGLImmediateWin32View.hh"
#include "G4OpenGLImmediateWin32Viewer.hh"
#include <GL/gl.h>
#include <GL/glx.h>
@@ -24,11 +24,11 @@
#include <assert.h>
#include <unistd.h>
G4OpenGLImmediateWin32View::G4OpenGLImmediateWin32View (G4OpenGLImmediateScene& scene):
G4OpenGLView (scene),
G4OpenGLWin32View (scene),
G4OpenGLImmediateView (scene),
G4VView (scene, scene.IncrementViewCount ()) {
G4OpenGLImmediateWin32Viewer::G4OpenGLImmediateWin32Viewer (G4OpenGLImmediateSceneHandler& scene):
G4OpenGLViewer (scene),
G4OpenGLWin32Viewer (scene),
G4OpenGLImmediateViewer (scene),
G4VViewer (scene, scene.IncrementViewCount ()) {
if (fViewId < 0) return; // In case error in base class instantiation.
@@ -53,7 +53,7 @@ G4VView (scene, scene.IncrementViewCount ()) {
}
void G4OpenGLImmediateWin32View::DrawView () {
void G4OpenGLImmediateWin32Viewer::DrawView () {
// If a double buffer context has been forced upon us, ignore the
// back buffer for this OpenGLImmediate view.
source/visualization/OpenGL/src/G4OpenGLImmediateX.cc
+18 -16
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLImmediateX.cc,v 2.2 1998/11/06 13:42:26 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLImmediateX.cc,v 1.4 1999/05/10 14:03:54 johna Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 27th March 1996
@@ -19,11 +19,11 @@
#include <GL/glu.h>
#include "G4VisFeaturesOfOpenGL.hh"
#include "G4VScene.hh"
#include "G4OpenGLScene.hh"
#include "G4OpenGLView.hh"
#include "G4VSceneHandler.hh"
#include "G4OpenGLSceneHandler.hh"
#include "G4OpenGLViewer.hh"
#include "G4OpenGLImmediateX.hh"
#include "G4OpenGLImmediateXView.hh"
#include "G4OpenGLImmediateXViewer.hh"
G4OpenGLImmediateX::G4OpenGLImmediateX ():
G4VGraphicsSystem ("OpenGLImmediateX",
@@ -31,21 +31,23 @@ G4OpenGLImmediateX::G4OpenGLImmediateX ():
G4VisFeaturesOfOpenGLIX (),
G4VGraphicsSystem::threeD) {}
G4VScene* G4OpenGLImmediateX::CreateScene (const G4String& name) {
G4VScene* pScene = new G4OpenGLImmediateScene (*this, name);
G4cout << G4OpenGLImmediateScene::GetSceneCount ()
G4OpenGLImmediateX::~G4OpenGLImmediateX () {}
G4VSceneHandler* G4OpenGLImmediateX::CreateSceneHandler (const G4String& name) {
G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this, name);
G4cout << G4OpenGLImmediateSceneHandler::GetSceneCount ()
<< ' ' << fName << " scenes extanct." << endl;
return pScene;
}
G4VView* G4OpenGLImmediateX::CreateView (G4VScene& scene,
G4VViewer* G4OpenGLImmediateX::CreateViewer (G4VSceneHandler& scene,
const G4String& name) {
G4VView* pView =
new G4OpenGLImmediateXView ((G4OpenGLImmediateScene&) scene, name);
G4VViewer* pView =
new G4OpenGLImmediateXViewer ((G4OpenGLImmediateSceneHandler&) scene, name);
if (pView) {
if (pView -> GetViewId () < 0) {
G4cerr << "G4OpenGLImmediateX::CreateView: error flagged by negative"
" view id in G4OpenGLImmediateXView creation."
G4cerr << "G4OpenGLImmediateX::CreateViewer: error flagged by negative"
" view id in G4OpenGLImmediateXViewer creation."
"\n Destroying view and returning null pointer."
<< endl;
delete pView;
@@ -53,8 +55,8 @@ G4VView* G4OpenGLImmediateX::CreateView (G4VScene& scene,
}
}
else {
G4cerr << "G4OpenGLImmediateX::CreateView: null pointer on"
" new G4OpenGLImmediateXView." << endl;
G4cerr << "G4OpenGLImmediateX::CreateViewer: null pointer on"
" new G4OpenGLImmediateXViewer." << endl;
}
return pView;
}
source/visualization/OpenGL/src/G4OpenGLImmediateXView.cc → source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
+15 -13
View File
@@ -5,17 +5,17 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLImmediateXView.cc,v 2.3 1998/11/06 13:42:27 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLImmediateXViewer.cc,v 1.2 1999/05/10 14:03:55 johna Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 7th February 1997
// Class G4OpenGLImmediateXView : a class derived from G4OpenGLXView and
// G4OpenGLImmediateView.
// Class G4OpenGLImmediateXViewer : a class derived from G4OpenGLXViewer and
// G4OpenGLImmediateViewer.
#ifdef G4VIS_BUILD_OPENGLX_DRIVER
#include "G4OpenGLImmediateXView.hh"
#include "G4OpenGLImmediateXViewer.hh"
#include <GL/gl.h>
#include <GL/glx.h>
@@ -28,19 +28,19 @@
#include <X11/Xatom.h>
#include <X11/Xutil.h>
G4OpenGLImmediateXView::G4OpenGLImmediateXView (G4OpenGLImmediateScene& scene,
G4OpenGLImmediateXViewer::G4OpenGLImmediateXViewer (G4OpenGLImmediateSceneHandler& scene,
const G4String& name):
G4OpenGLView (scene),
G4OpenGLXView (scene),
G4OpenGLImmediateView (scene),
G4VView (scene, scene.IncrementViewCount (), name) {
G4OpenGLViewer (scene),
G4OpenGLXViewer (scene),
G4OpenGLImmediateViewer (scene),
G4VViewer (scene, scene.IncrementViewCount (), name) {
if (fViewId < 0) return; // In case error in base class instantiation.
// ensure a suitable window was found
if (!vi_immediate) {
G4cerr << "G4OpenGLImmediateXView::G4OpenGLImmediateXView -"
" G4OpenGLXView couldn't get a visual." << endl;
G4cerr << "G4OpenGLImmediateXViewer::G4OpenGLImmediateXViewer -"
" G4OpenGLXViewer couldn't get a visual." << endl;
fViewId = -1; // This flags an error.
return;
}
@@ -67,7 +67,9 @@ G4VView (scene, scene.IncrementViewCount (), name) {
}
void G4OpenGLImmediateXView::DrawView () {
G4OpenGLImmediateXViewer::~G4OpenGLImmediateXViewer () {}
void G4OpenGLImmediateXViewer::DrawView () {
// If a double buffer context has been forced upon us, ignore the
// back buffer for this OpenGLImmediate view.
source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc
+16 -16
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLImmediateXm.cc,v 2.2 1998/11/06 13:42:28 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLImmediateXm.cc,v 1.3 1999/01/11 00:47:44 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 10th February 1997
@@ -19,11 +19,11 @@
#include <GL/glu.h>
#include "G4VisFeaturesOfOpenGL.hh"
#include "G4VScene.hh"
#include "G4OpenGLScene.hh"
#include "G4OpenGLView.hh"
#include "G4VSceneHandler.hh"
#include "G4OpenGLSceneHandler.hh"
#include "G4OpenGLViewer.hh"
#include "G4OpenGLImmediateXm.hh"
#include "G4OpenGLImmediateXmView.hh"
#include "G4OpenGLImmediateXmViewer.hh"
G4OpenGLImmediateXm::G4OpenGLImmediateXm ():
G4VGraphicsSystem ("OpenGLImmediateXm",
@@ -31,29 +31,29 @@ G4OpenGLImmediateXm::G4OpenGLImmediateXm ():
G4VisFeaturesOfOpenGLIXm (),
G4VGraphicsSystem::threeD) {}
G4VScene* G4OpenGLImmediateXm::CreateScene (const G4String& name) {
G4VScene* pScene = new G4OpenGLImmediateScene (*this, name);
G4cout << G4OpenGLImmediateScene::GetSceneCount ()
G4VSceneHandler* G4OpenGLImmediateXm::CreateSceneHandler (const G4String& name) {
G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this, name);
G4cout << G4OpenGLImmediateSceneHandler::GetSceneCount ()
<< ' ' << fName << " scenes extanct." << endl;
return pScene;
}
G4VView* G4OpenGLImmediateXm::CreateView (G4VScene& scene,
G4VViewer* G4OpenGLImmediateXm::CreateViewer (G4VSceneHandler& scene,
const G4String& name) {
G4VView* pView =
new G4OpenGLImmediateXmView ((G4OpenGLImmediateScene&) scene, name);
G4VViewer* pView =
new G4OpenGLImmediateXmViewer ((G4OpenGLImmediateSceneHandler&) scene, name);
if (pView) {
if (pView -> GetViewId () < 0) {
G4cerr << "G4OpenGLImmediateXm::CreateView: error flagged by"
" negative view id in G4OpenGLImmediateXmView creation."
G4cerr << "G4OpenGLImmediateXm::CreateViewer: error flagged by"
" negative view id in G4OpenGLImmediateXmViewer creation."
"\n Destroying view and returning null pointer." << endl;
delete pView;
pView = 0;
}
}
else {
G4cerr << "G4OpenGLImmediateXm::CreateView: null pointer on"
" new G4OpenGLImmediateXmView." << endl;
G4cerr << "G4OpenGLImmediateXm::CreateViewer: null pointer on"
" new G4OpenGLImmediateXmViewer." << endl;
}
return pView;
}
source/visualization/OpenGL/src/G4OpenGLImmediateXmView.cc → source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc
+15 -15
View File
@@ -5,17 +5,17 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLImmediateXmView.cc,v 2.3 1998/11/06 13:42:29 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLImmediateXmViewer.cc,v 1.1 1999/01/09 16:23:15 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 10th February 1997
// Class G4OpenGLImmediateXmView : a class derived from G4OpenGLXmView
// and G4OpenGLImmediateView.
// Class G4OpenGLImmediateXmViewer : a class derived from G4OpenGLXmViewer
// and G4OpenGLImmediateViewer.
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#include "G4OpenGLImmediateXmView.hh"
#include "G4OpenGLImmediateXmViewer.hh"
#include <GL/gl.h>
#include <GL/glx.h>
@@ -25,20 +25,20 @@
#include <assert.h>
#include <unistd.h>
G4OpenGLImmediateXmView::G4OpenGLImmediateXmView
(G4OpenGLImmediateScene& scene,
G4OpenGLImmediateXmViewer::G4OpenGLImmediateXmViewer
(G4OpenGLImmediateSceneHandler& scene,
const G4String& name):
G4OpenGLView (scene),
G4OpenGLXmView (scene),
G4OpenGLImmediateView (scene),
G4VView (scene, scene.IncrementViewCount (), name) {
G4OpenGLViewer (scene),
G4OpenGLXmViewer (scene),
G4OpenGLImmediateViewer (scene),
G4VViewer (scene, scene.IncrementViewCount (), name) {
if (fViewId < 0) return; // In case error in base class instantiation.
// ensure a suitable window was found
if (!vi_immediate) {
G4cerr << "G4OpenGLImmediateXmView::G4OpenGLImmediateXmView -"
" G4OpenGLXmView couldn't get a visual." << endl;
G4cerr << "G4OpenGLImmediateXmViewer::G4OpenGLImmediateXmViewer -"
" G4OpenGLXmViewer couldn't get a visual." << endl;
fViewId = -1; // This flags an error.
return;
}
@@ -65,7 +65,7 @@ G4VView (scene, scene.IncrementViewCount (), name) {
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//The following code is useless in its current position, as the
//G4OpenGLXmView constructor gets called *after* it, and hence sets
//G4OpenGLXmViewer constructor gets called *after* it, and hence sets
//doublebuffer to true or false there, after our little test to correct
//it in the case of a double buffer being got for an immediate view.
//Hence, code moved to DrawView.
@@ -79,7 +79,7 @@ G4VView (scene, scene.IncrementViewCount (), name) {
// }
}
void G4OpenGLImmediateXmView::DrawView () {
void G4OpenGLImmediateXmViewer::DrawView () {
// If a double buffer context has been forced upon us, ignore the
// back buffer for this OpenGLImmediate view.
source/visualization/OpenGL/src/G4OpenGLScene.cc → source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
+26 -25
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLScene.cc,v 2.8 1998/11/06 13:42:32 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLSceneHandler.cc,v 1.3 1999/02/07 17:17:10 johna Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 27th March 1996
@@ -28,8 +28,8 @@
#include <GL/glx.h>
#include <GL/glu.h>
#include "G4OpenGLScene.hh"
#include "G4OpenGLView.hh"
#include "G4OpenGLSceneHandler.hh"
#include "G4OpenGLViewer.hh"
#include "G4OpenGLTransform3D.hh"
#include "G4Point3D.hh"
#include "G4Normal3D.hh"
@@ -42,27 +42,27 @@
#include "G4Polyhedron.hh"
#include "G4VisAttributes.hh"
G4OpenGLScene::G4OpenGLScene (G4VGraphicsSystem& system,
G4OpenGLSceneHandler::G4OpenGLSceneHandler (G4VGraphicsSystem& system,
G4int id,
const G4String& name):
G4VScene (system, id, name)
G4VSceneHandler (system, id, name)
{
initialize_hlr = true;
// glPolygonOffset (1.0, 2);
}
G4OpenGLScene::~G4OpenGLScene ()
G4OpenGLSceneHandler::~G4OpenGLSceneHandler ()
{
ClearStore ();
}
//Method for handling G4Polyline objects (from tracking or wireframe).
void G4OpenGLScene::AddPrimitive (const G4Polyline& line)
void G4OpenGLSceneHandler::AddPrimitive (const G4Polyline& line)
{
const G4Colour& c = GetColour (line);
glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
if (fpView -> GetViewParameters ().IsMarkerNotHidden ())
if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ())
glDisable (GL_DEPTH_TEST);
else glEnable (GL_DEPTH_TEST);
@@ -80,11 +80,11 @@ void G4OpenGLScene::AddPrimitive (const G4Polyline& line)
glEnd ();
}
void G4OpenGLScene::AddPrimitive (const G4Text& text) {
void G4OpenGLSceneHandler::AddPrimitive (const G4Text& text) {
MarkerSizeType sizeType;
G4double size = GetMarkerSize (text, sizeType);
G4cerr
<< "G4OpenGLScene::AddPrimitive (const G4Text& text) not implemented yet."
<< "G4OpenGLSceneHandler::AddPrimitive (const G4Text& text) not implemented yet."
<< "\n Called with text " << text.GetText ()
<< " at " << text.GetPosition ()
<< ", size " << size
@@ -93,12 +93,12 @@ void G4OpenGLScene::AddPrimitive (const G4Text& text) {
<< endl;
}
void G4OpenGLScene::AddPrimitive (const G4Circle& circle) {
void G4OpenGLSceneHandler::AddPrimitive (const G4Circle& circle) {
const G4Colour& c = GetColour (circle);
glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
if (fpView -> GetViewParameters ().IsMarkerNotHidden ())
if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ())
glDisable (GL_DEPTH_TEST);
else glEnable (GL_DEPTH_TEST);
@@ -121,7 +121,7 @@ void G4OpenGLScene::AddPrimitive (const G4Circle& circle) {
break;
default:
G4cerr << "Unrecognised fill style for G4Circle in G4OpenGLScene."
G4cerr << "Unrecognised fill style for G4Circle in G4OpenGLSceneHandler."
<< "\nUsing G4VMarker::filled." << endl;
glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
break;
@@ -132,13 +132,13 @@ void G4OpenGLScene::AddPrimitive (const G4Circle& circle) {
G4bool userSpecified = (circle.GetWorldSize() || circle.GetScreenSize());
const G4VMarker& def = fpView -> GetViewParameters().GetDefaultMarker();
const G4VMarker& def = fpViewer -> GetViewParameters().GetDefaultMarker();
//Make sure we Draw circles...
glEnable (GL_POINT_SMOOTH);
G4double size;
G4double scale = fpView -> GetViewParameters().GetGlobalMarkerScale();
G4double scale = fpViewer -> GetViewParameters().GetGlobalMarkerScale();
if (size = scale * // Assignment intentional.
userSpecified ? circle.GetWorldSize() : def.GetWorldSize()) {
@@ -213,12 +213,12 @@ void G4OpenGLScene::AddPrimitive (const G4Circle& circle) {
}
void G4OpenGLScene::AddPrimitive (const G4Square& Square) {
void G4OpenGLSceneHandler::AddPrimitive (const G4Square& Square) {
const G4Colour& c = GetColour (Square);
glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
if (fpView -> GetViewParameters ().IsMarkerNotHidden ())
if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ())
glDisable (GL_DEPTH_TEST);
else glEnable (GL_DEPTH_TEST);
@@ -241,7 +241,7 @@ void G4OpenGLScene::AddPrimitive (const G4Square& Square) {
break;
default:
G4cerr << "Unrecognised fill style for G4Square in G4OpenGLScene."
G4cerr << "Unrecognised fill style for G4Square in G4OpenGLSceneHandler."
<< "\nUsing G4VMarker::filled." << endl;
glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
break;
@@ -268,10 +268,10 @@ void G4OpenGLScene::AddPrimitive (const G4Square& Square) {
G4bool userSpecified = (Square.GetWorldSize() || Square.GetScreenSize());
const G4VMarker& def = fpView -> GetViewParameters().GetDefaultMarker();
const G4VMarker& def = fpViewer -> GetViewParameters().GetDefaultMarker();
G4double size;
G4double scale = fpView -> GetViewParameters().GetGlobalMarkerScale();
G4double scale = fpViewer -> GetViewParameters().GetGlobalMarkerScale();
if (size = scale * // Assignment intentional.
userSpecified ? Square.GetWorldSize() : def.GetWorldSize()) {
@@ -315,7 +315,7 @@ void G4OpenGLScene::AddPrimitive (const G4Square& Square) {
}
//Method for handling G4Polyhedron objects for drawing solids.
void G4OpenGLScene::AddPrimitive (const G4Polyhedron& polyhedron) {
void G4OpenGLSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) {
//Assume all facets are convex quadrilaterals.
//Draw each G4Facet individually
@@ -335,7 +335,7 @@ void G4OpenGLScene::AddPrimitive (const G4Polyhedron& polyhedron) {
{
glPolygonMode (GL_FRONT, GL_FILL);
glCullFace (GL_BACK);
glEnable (GL_CULL_FACE);
//glEnable (GL_CULL_FACE);
glEnable (GL_LIGHTING);
glEnable (GL_DEPTH_TEST);
GLfloat materialColour [4];
@@ -407,11 +407,12 @@ void G4OpenGLScene::AddPrimitive (const G4Polyhedron& polyhedron) {
vertex[edgeCount].z());
edgeCount++;
} while (notLastEdge);
while (edgeCount++ < 4) { // duplicate last real vertex.
while (edgeCount < 4) { // duplicate last real vertex.
vertex[edgeCount] = vertex[edgeCount-1];
glVertex3d (vertex[edgeCount].x(),
vertex[edgeCount].y(),
vertex[edgeCount].z());
edgeCount++;
}
//do it all over again for hlr 2nd pass...
@@ -473,7 +474,7 @@ void G4OpenGLScene::AddPrimitive (const G4Polyhedron& polyhedron) {
//Method for handling G4NURBS objects for drawing solids.
//Knots and Ctrl Pnts MUST be arrays of GLfloats.
void G4OpenGLScene::AddPrimitive (const G4NURBS& nurb) {
void G4OpenGLSceneHandler::AddPrimitive (const G4NURBS& nurb) {
GLUnurbsObj *gl_nurb;
gl_nurb = gluNewNurbsRenderer ();
source/visualization/OpenGL/src/G4OpenGLStoredScene.cc → source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
+26 -26
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLStoredScene.cc,v 2.4 1998/11/06 13:42:33 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLStoredSceneHandler.cc,v 1.2 1999/01/11 00:47:45 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 10th February 1997
@@ -26,8 +26,8 @@
#include <GL/glx.h>
#include <GL/glu.h>
#include "G4OpenGLScene.hh"
#include "G4OpenGLView.hh"
#include "G4OpenGLSceneHandler.hh"
#include "G4OpenGLViewer.hh"
#include "G4OpenGLTransform3D.hh"
#include "G4Point3D.hh"
#include "G4Normal3D.hh"
@@ -41,16 +41,16 @@
#include "G4VPhysicalVolume.hh"
#include "G4ModelingParameters.hh"
#include "G4OpenGLStoredScene.hh"
#include "G4OpenGLStoredSceneHandler.hh"
inline static unsigned pSolidHashFun
(const G4OpenGLStoredScene::G4VSolidPointer& pSolid) {
(const G4OpenGLStoredSceneHandler::G4VSolidPointer& pSolid) {
return (unsigned)pSolid;
}
G4OpenGLStoredScene::G4OpenGLStoredScene (G4VGraphicsSystem& system,
G4OpenGLStoredSceneHandler::G4OpenGLStoredSceneHandler (G4VGraphicsSystem& system,
const G4String& name):
G4OpenGLScene (system, fSceneIdCount++, name),
G4OpenGLSceneHandler (system, fSceneIdCount++, name),
fMemoryForDisplayLists (true),
fTopPODL (0),
fSolidDictionary (pSolidHashFun)
@@ -58,15 +58,15 @@ fSolidDictionary (pSolidHashFun)
fSceneCount++;
}
G4OpenGLStoredScene::~G4OpenGLStoredScene ()
G4OpenGLStoredSceneHandler::~G4OpenGLStoredSceneHandler ()
{
fSceneCount--;
}
void G4OpenGLStoredScene::BeginPrimitives
void G4OpenGLStoredSceneHandler::BeginPrimitives
(const G4Transform3D& objectTransformation) {
G4VScene::BeginPrimitives (objectTransformation);
G4VSceneHandler::BeginPrimitives (objectTransformation);
if (fMemoryForDisplayLists) {
if (!(fDisplayListId = glGenLists (1))) { // Could pre-allocate?
@@ -100,7 +100,7 @@ void G4OpenGLStoredScene::BeginPrimitives
}
}
void G4OpenGLStoredScene::EndPrimitives () {
void G4OpenGLStoredSceneHandler::EndPrimitives () {
if (fMemoryForDisplayLists) {
glEndList();
}
@@ -109,10 +109,10 @@ void G4OpenGLStoredScene::EndPrimitives () {
glFlush ();
glDrawBuffer (GL_BACK);
}
G4VScene::EndPrimitives ();
G4VSceneHandler::EndPrimitives ();
}
void G4OpenGLStoredScene::ClearStore () {
void G4OpenGLStoredSceneHandler::ClearStore () {
int i;
@@ -145,19 +145,19 @@ void G4OpenGLStoredScene::ClearStore () {
fSolidDictionary.clear ();
}
void G4OpenGLStoredScene::BeginModeling () {
void G4OpenGLStoredSceneHandler::BeginModeling () {
if (fpView -> GetViewParameters ().GetDrawingStyle() == G4ViewParameters::hlr) {
if (fpViewer -> GetViewParameters ().GetDrawingStyle() == G4ViewParameters::hlr) {
initialize_hlr = true;
}
G4VScene::BeginModeling();
G4VSceneHandler::BeginModeling();
}
void G4OpenGLStoredScene::EndModeling () {
void G4OpenGLStoredSceneHandler::EndModeling () {
// Make a List which calls the other lists.
// if (!(fTopPODL = glGenLists (1))) {
// G4Exception ("Unable to allocate display List for fTopPODL in G4OpenGLStoredScene");
// G4Exception ("Unable to allocate display List for fTopPODL in G4OpenGLStoredSceneHandler");
// }
glNewList (fTopPODL, GL_COMPILE); {
@@ -170,19 +170,19 @@ void G4OpenGLStoredScene::EndModeling () {
}
}
glEndList ();
G4VScene::EndModeling ();
G4VSceneHandler::EndModeling ();
if (fpView -> GetViewParameters ().GetDrawingStyle() == G4ViewParameters::hlr) {
if (fpViewer -> GetViewParameters ().GetDrawingStyle() == G4ViewParameters::hlr) {
initialize_hlr = false;
// glDisable (GL_POLYGON_OFFSET_FILL);
}
}
void G4OpenGLStoredScene::RequestPrimitives (const G4VSolid& solid) {
void G4OpenGLStoredSceneHandler::RequestPrimitives (const G4VSolid& solid) {
if (fReadyForTransients ||
GetModel () -> GetModelingParameters () -> GetRepStyle () ==
G4ModelingParameters::hierarchy) {
G4VScene::RequestPrimitives (solid);
G4VSceneHandler::RequestPrimitives (solid);
}
else {
// Stop-gap solution for display List re-use. A proper
@@ -194,15 +194,15 @@ void G4OpenGLStoredScene::RequestPrimitives (const G4VSolid& solid) {
fPODLTransformList.append (*fpObjectTransformation);
}
else {
G4VScene::RequestPrimitives (solid);
G4VSceneHandler::RequestPrimitives (solid);
fSolidDictionary.insertKeyAndValue (pSolid, fDisplayListId);
}
}
}
G4int G4OpenGLStoredScene::fSceneIdCount = 0;
G4int G4OpenGLStoredSceneHandler::fSceneIdCount = 0;
G4int G4OpenGLStoredScene::fSceneCount = 0;
G4int G4OpenGLStoredSceneHandler::fSceneCount = 0;
#endif
source/visualization/OpenGL/src/G4OpenGLStoredView.cc → source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc
+17 -15
View File
@@ -5,18 +5,18 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLStoredView.cc,v 2.2 1998/07/13 17:11:34 urbi Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLStoredViewer.cc,v 1.3 1999/05/10 14:03:56 johna Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 7th February 1997
// Class G4OpenGLStoredView : Encapsulates the `storedness' of
// Class G4OpenGLStoredViewer : Encapsulates the `storedness' of
// an OpenGL view, for inheritance by
// derived (X, Xm...) classes.
#ifdef G4VIS_BUILD_OPENGL_DRIVER
#include "G4OpenGLStoredView.hh"
#include "G4OpenGLStoredViewer.hh"
#include <GL/gl.h>
#include <GL/glx.h>
@@ -26,15 +26,17 @@
#include <assert.h>
#include <unistd.h>
class G4OpenGLStoredScene;
class G4OpenGLStoredSceneHandler;
G4OpenGLStoredView::G4OpenGLStoredView (G4OpenGLStoredScene& scene):
G4VView (scene, -1),
G4OpenGLView (scene),
fScene (scene)
G4OpenGLStoredViewer::G4OpenGLStoredViewer (G4OpenGLStoredSceneHandler& scene):
G4VViewer (scene, -1),
G4OpenGLViewer (scene),
fSceneHandler (scene)
{}
void G4OpenGLStoredView::KernelVisitDecision () {
G4OpenGLStoredViewer::~G4OpenGLStoredViewer () {}
void G4OpenGLStoredViewer::KernelVisitDecision () {
// Trigger a display List refresh if necessary. This is a checklist
// of relevant view parameters.
@@ -75,16 +77,16 @@ void G4OpenGLStoredView::KernelVisitDecision () {
}
}
void G4OpenGLStoredView::DrawDisplayLists () {
void G4OpenGLStoredViewer::DrawDisplayLists () {
if (fScene.fTopPODL) glCallList (fScene.fTopPODL);
if (fSceneHandler.fTopPODL) glCallList (fSceneHandler.fTopPODL);
G4int nTODLs = fScene.fTODLList.entries ();
G4int nTODLs = fSceneHandler.fTODLList.entries ();
for (int i = 0; i < nTODLs; i++) {
glPushMatrix();
G4OpenGLTransform3D oglt (fScene.fTODLTransformList (i));
G4OpenGLTransform3D oglt (fSceneHandler.fTODLTransformList (i));
glMultMatrixd (oglt.GetGLMatrix ());
glCallList (fScene.fTODLList(i));
glCallList (fSceneHandler.fTODLList(i));
glPopMatrix();
}
}
source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc
+16 -16
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLStoredWin32.cc,v 2.1 1998/07/13 17:11:35 urbi Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLStoredWin32.cc,v 1.3 1999/01/11 00:47:47 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// OpenGLStoredWin32 graphics system factory.
@@ -19,11 +19,11 @@
#include <GL/glu.h>
#include "G4VisFeaturesOfOpenGL.hh"
#include "G4VScene.hh"
#include "G4OpenGLScene.hh"
#include "G4OpenGLView.hh"
#include "G4VSceneHandler.hh"
#include "G4OpenGLSceneHandler.hh"
#include "G4OpenGLViewer.hh"
#include "G4OpenGLStoredWin32.hh"
#include "G4OpenGLStoredWin32View.hh"
#include "G4OpenGLStoredWin32Viewer.hh"
G4OpenGLStoredWin32::G4OpenGLStoredWin32 ():
G4VGraphicsSystem ("OpenGLStoredWin32",
@@ -31,28 +31,28 @@ G4OpenGLStoredWin32::G4OpenGLStoredWin32 ():
G4VisFeaturesOfOpenGLSWin32 (),
G4VGraphicsSystem::threeD) {}
G4VScene* G4OpenGLStoredWin32::CreateScene () {
G4VScene* pScene = new G4OpenGLStoredScene (*this);
G4cout << G4OpenGLStoredScene::GetSceneCount ()
G4VSceneHandler* G4OpenGLStoredWin32::CreateSceneHandler () {
G4VSceneHandler* pScene = new G4OpenGLStoredSceneHandler (*this);
G4cout << G4OpenGLStoredSceneHandler::GetSceneCount ()
<< ' ' << fName << " scenes extanct." << endl;
return pScene;
}
G4VView* G4OpenGLStoredWin32::CreateView (G4VScene& scene) {
G4VView* pView =
new G4OpenGLStoredWin32View ((G4OpenGLStoredScene&) scene);
G4VViewer* G4OpenGLStoredWin32::CreateViewer (G4VSceneHandler& scene) {
G4VViewer* pView =
new G4OpenGLStoredWin32Viewer ((G4OpenGLStoredSceneHandler&) scene);
if (pView) {
if (pView -> GetViewId () < 0) {
delete pView;
pView = 0;
G4cerr << "G4OpenGLStoredWin32::CreateView: error flagged by"
" negative view id in G4OpenGLStoredWin32View creation."
G4cerr << "G4OpenGLStoredWin32::CreateViewer: error flagged by"
" negative view id in G4OpenGLStoredWin32Viewer creation."
"\n Destroying view and returning null pointer." << endl;
}
}
else {
G4cerr << "G4OpenGLStoredWin32::CreateView: null pointer on"
" new G4OpenGLStoredWin32View." << endl;
G4cerr << "G4OpenGLStoredWin32::CreateViewer: null pointer on"
" new G4OpenGLStoredWin32Viewer." << endl;
}
return pView;
}
source/visualization/OpenGL/src/G4OpenGLStoredWin32View.cc → source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc
+12 -12
View File
@@ -5,16 +5,16 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLStoredWin32View.cc,v 2.2 1998/08/04 14:22:27 ajw Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.1 1999/01/09 16:23:21 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Class G4OpenGLStoredWin32View : a class derived from G4OpenGLWin32View and
// G4OpenGLStoredView.
// Class G4OpenGLStoredWin32Viewer : a class derived from G4OpenGLWin32Viewer and
// G4OpenGLStoredViewer.
#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
#include "G4OpenGLStoredWin32View.hh"
#include "G4OpenGLStoredWin32Viewer.hh"
#include <GL/gl.h>
#include <GL/glx.h>
@@ -24,15 +24,15 @@
#include <assert.h>
#include <unistd.h>
G4OpenGLStoredWin32View::G4OpenGLStoredWin32View (G4OpenGLStoredScene& scene):
G4OpenGLView (scene),
G4OpenGLWin32View (scene),
G4OpenGLStoredView (scene),
G4VView (scene, scene.IncrementViewCount ()) {
G4OpenGLStoredWin32Viewer::G4OpenGLStoredWin32Viewer (G4OpenGLStoredSceneHandler& scene):
G4OpenGLViewer (scene),
G4OpenGLWin32Viewer (scene),
G4OpenGLStoredViewer (scene),
G4VViewer (scene, scene.IncrementViewCount ()) {
if (fViewId < 0) return; // In case error in base class instantiation.
//Check that G4OpenGLWin32View got a double buffered colour visual
//Check that G4OpenGLWin32Viewer got a double buffered colour visual
CreateGLWin32Context ();
CreateMainWindow ();
@@ -46,7 +46,7 @@ G4VView (scene, scene.IncrementViewCount ()) {
}
void G4OpenGLStoredWin32View::DrawView () {
void G4OpenGLStoredWin32Viewer::DrawView () {
if (white_background == true) {
glClearColor (1., 1., 1., 1.);
source/visualization/OpenGL/src/G4OpenGLStoredX.cc
+18 -16
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLStoredX.cc,v 2.2 1998/11/06 13:42:34 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLStoredX.cc,v 1.4 1999/05/10 14:03:57 johna Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 10th February 1997
@@ -20,11 +20,11 @@
#include <GL/glu.h>
#include "G4VisFeaturesOfOpenGL.hh"
#include "G4VScene.hh"
#include "G4OpenGLScene.hh"
#include "G4OpenGLView.hh"
#include "G4VSceneHandler.hh"
#include "G4OpenGLSceneHandler.hh"
#include "G4OpenGLViewer.hh"
#include "G4OpenGLStoredX.hh"
#include "G4OpenGLStoredXView.hh"
#include "G4OpenGLStoredXViewer.hh"
G4OpenGLStoredX::G4OpenGLStoredX ():
G4VGraphicsSystem ("OpenGLStoredX",
@@ -32,29 +32,31 @@ G4OpenGLStoredX::G4OpenGLStoredX ():
G4VisFeaturesOfOpenGLSX (),
G4VGraphicsSystem::threeD) {}
G4VScene* G4OpenGLStoredX::CreateScene (const G4String& name) {
G4VScene* pScene = new G4OpenGLStoredScene (*this, name);
G4cout << G4OpenGLStoredScene::GetSceneCount ()
G4OpenGLStoredX::~G4OpenGLStoredX () {}
G4VSceneHandler* G4OpenGLStoredX::CreateSceneHandler (const G4String& name) {
G4VSceneHandler* pScene = new G4OpenGLStoredSceneHandler (*this, name);
G4cout << G4OpenGLStoredSceneHandler::GetSceneCount ()
<< ' ' << fName << " scenes extanct." << endl;
return pScene;
}
G4VView* G4OpenGLStoredX::CreateView (G4VScene& scene,
G4VViewer* G4OpenGLStoredX::CreateViewer (G4VSceneHandler& scene,
const G4String& name) {
G4VView* pView =
new G4OpenGLStoredXView ((G4OpenGLStoredScene&) scene, name);
G4VViewer* pView =
new G4OpenGLStoredXViewer ((G4OpenGLStoredSceneHandler&) scene, name);
if (pView) {
if (pView -> GetViewId () < 0) {
delete pView;
pView = 0;
G4cerr << "G4OpenGLStoredX::CreateView: error flagged by"
" negative view id in G4OpenGLStoredXView creation."
G4cerr << "G4OpenGLStoredX::CreateViewer: error flagged by"
" negative view id in G4OpenGLStoredXViewer creation."
"\n Destroying view and returning null pointer." << endl;
}
}
else {
G4cerr << "G4OpenGLStoredX::CreateView: null pointer on"
" new G4OpenGLStoredXView." << endl;
G4cerr << "G4OpenGLStoredX::CreateViewer: null pointer on"
" new G4OpenGLStoredXViewer." << endl;
}
return pView;
}
source/visualization/OpenGL/src/G4OpenGLStoredXView.cc → source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
+15 -13
View File
@@ -5,17 +5,17 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLStoredXView.cc,v 2.3 1998/11/06 13:42:35 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLStoredXViewer.cc,v 1.2 1999/05/10 14:03:59 johna Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 7th February 1997
// Class G4OpenGLStoredXView : a class derived from G4OpenGLXView and
// G4OpenGLStoredView.
// Class G4OpenGLStoredXViewer : a class derived from G4OpenGLXViewer and
// G4OpenGLStoredViewer.
#ifdef G4VIS_BUILD_OPENGLX_DRIVER
#include "G4OpenGLStoredXView.hh"
#include "G4OpenGLStoredXViewer.hh"
#include <GL/gl.h>
#include <GL/glx.h>
@@ -28,19 +28,19 @@
#include <X11/Xatom.h>
#include <X11/Xutil.h>
G4OpenGLStoredXView::G4OpenGLStoredXView (G4OpenGLStoredScene& scene,
G4OpenGLStoredXViewer::G4OpenGLStoredXViewer (G4OpenGLStoredSceneHandler& scene,
const G4String& name):
G4OpenGLView (scene),
G4OpenGLXView (scene),
G4OpenGLStoredView (scene),
G4VView (scene, scene.IncrementViewCount (), name) {
G4OpenGLViewer (scene),
G4OpenGLXViewer (scene),
G4OpenGLStoredViewer (scene),
G4VViewer (scene, scene.IncrementViewCount (), name) {
if (fViewId < 0) return; // In case error in base class instantiation.
if (!vi_stored) {
fViewId = -1; // This flags an error.
G4cerr << "G4OpenGLStoredXView::G4OpenGLStoredXView -"
" G4OpenGLXView couldn't get a visual." << endl;
G4cerr << "G4OpenGLStoredXViewer::G4OpenGLStoredXViewer -"
" G4OpenGLXViewer couldn't get a visual." << endl;
return;
}
@@ -59,7 +59,9 @@ G4VView (scene, scene.IncrementViewCount (), name) {
}
void G4OpenGLStoredXView::DrawView () {
G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer () {}
void G4OpenGLStoredXViewer::DrawView () {
if (white_background == true) {
glClearColor (1., 1., 1., 1.);
source/visualization/OpenGL/src/G4OpenGLStoredXm.cc
+16 -16
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLStoredXm.cc,v 2.2 1998/11/06 13:42:36 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLStoredXm.cc,v 1.3 1999/01/11 00:47:48 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 10th February 1997
@@ -19,11 +19,11 @@
#include <GL/glu.h>
#include "G4VisFeaturesOfOpenGL.hh"
#include "G4VScene.hh"
#include "G4OpenGLScene.hh"
#include "G4OpenGLView.hh"
#include "G4VSceneHandler.hh"
#include "G4OpenGLSceneHandler.hh"
#include "G4OpenGLViewer.hh"
#include "G4OpenGLStoredXm.hh"
#include "G4OpenGLStoredXmView.hh"
#include "G4OpenGLStoredXmViewer.hh"
G4OpenGLStoredXm::G4OpenGLStoredXm ():
G4VGraphicsSystem ("OpenGLStoredXm",
@@ -31,28 +31,28 @@ G4OpenGLStoredXm::G4OpenGLStoredXm ():
G4VisFeaturesOfOpenGLSXm (),
G4VGraphicsSystem::threeD) {}
G4VScene* G4OpenGLStoredXm::CreateScene (const G4String& name) {
G4VScene* pScene = new G4OpenGLStoredScene (*this, name);
G4cout << G4OpenGLStoredScene::GetSceneCount ()
G4VSceneHandler* G4OpenGLStoredXm::CreateSceneHandler (const G4String& name) {
G4VSceneHandler* pScene = new G4OpenGLStoredSceneHandler (*this, name);
G4cout << G4OpenGLStoredSceneHandler::GetSceneCount ()
<< ' ' << fName << " scenes extanct." << endl;
return pScene;
}
G4VView* G4OpenGLStoredXm::CreateView (G4VScene& scene, const G4String& name) {
G4VView* pView =
new G4OpenGLStoredXmView ((G4OpenGLStoredScene&) scene, name);
G4VViewer* G4OpenGLStoredXm::CreateViewer (G4VSceneHandler& scene, const G4String& name) {
G4VViewer* pView =
new G4OpenGLStoredXmViewer ((G4OpenGLStoredSceneHandler&) scene, name);
if (pView) {
if (pView -> GetViewId () < 0) {
delete pView;
pView = 0;
G4cerr << "G4OpenGLStoredXm::CreateView: error flagged by"
" negative view id in G4OpenGLStoredXmView creation."
G4cerr << "G4OpenGLStoredXm::CreateViewer: error flagged by"
" negative view id in G4OpenGLStoredXmViewer creation."
"\n Destroying view and returning null pointer." << endl;
}
}
else {
G4cerr << "G4OpenGLStoredXm::CreateView: null pointer on"
" new G4OpenGLStoredXmView." << endl;
G4cerr << "G4OpenGLStoredXm::CreateViewer: null pointer on"
" new G4OpenGLStoredXmViewer." << endl;
}
return pView;
}
source/visualization/OpenGL/src/G4OpenGLStoredXmView.cc → source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc
+13 -13
View File
@@ -5,17 +5,17 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLStoredXmView.cc,v 2.3 1998/11/06 13:42:36 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLStoredXmViewer.cc,v 1.1 1999/01/09 16:23:28 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 10th February 1997
// Class G4OpenGLStoredXmView : a class derived from G4OpenGLXmView
// and G4OpenGLStoredView.
// Class G4OpenGLStoredXmViewer : a class derived from G4OpenGLXmViewer
// and G4OpenGLStoredViewer.
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#include "G4OpenGLStoredXmView.hh"
#include "G4OpenGLStoredXmViewer.hh"
#include <GL/gl.h>
#include <GL/glx.h>
@@ -25,19 +25,19 @@
#include <assert.h>
#include <unistd.h>
G4OpenGLStoredXmView::G4OpenGLStoredXmView (G4OpenGLStoredScene& scene,
G4OpenGLStoredXmViewer::G4OpenGLStoredXmViewer (G4OpenGLStoredSceneHandler& scene,
const G4String& name):
G4OpenGLView (scene),
G4OpenGLXmView (scene),
G4OpenGLStoredView (scene),
G4VView (scene, scene.IncrementViewCount (), name) {
G4OpenGLViewer (scene),
G4OpenGLXmViewer (scene),
G4OpenGLStoredViewer (scene),
G4VViewer (scene, scene.IncrementViewCount (), name) {
if (fViewId < 0) return; // In case error in base class instantiation.
if (!vi_stored) {
fViewId = -1; // This flags an error.
G4cerr << "G4OpenGLStoredXmView::G4OpenGLStoredXmView -"
" G4OpenGLXmView couldn't get a visual." << endl;
G4cerr << "G4OpenGLStoredXmViewer::G4OpenGLStoredXmViewer -"
" G4OpenGLXmViewer couldn't get a visual." << endl;
return;
}
@@ -60,7 +60,7 @@ G4VView (scene, scene.IncrementViewCount (), name) {
}
void G4OpenGLStoredXmView::DrawView () {
void G4OpenGLStoredXmViewer::DrawView () {
if (white_background == true) {
glClearColor (1., 1., 1., 1.);
source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLTransform3D.cc,v 2.0 1998/07/02 16:46:23 gunter Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLTransform3D.cc,v 1.2 1999/01/09 16:23:29 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 24th October 1996
source/visualization/OpenGL/src/G4OpenGLView.cc → source/visualization/OpenGL/src/G4OpenGLViewer.cc
+21 -19
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLView.cc,v 2.7 1998/12/16 20:23:39 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLViewer.cc,v 1.3 1999/05/10 14:04:00 johna Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 27th March 1996
@@ -18,8 +18,8 @@
#include <GL/glx.h>
#include <GL/glu.h>
#include "G4OpenGLView.hh"
#include "G4OpenGLScene.hh"
#include "G4OpenGLViewer.hh"
#include "G4OpenGLSceneHandler.hh"
#include "G4OpenGLTransform3D.hh"
#include "G4ios.hh"
#include <assert.h>
@@ -32,17 +32,17 @@
#include "G4Normal3D.hh"
#include "G4Plane3D.hh"
int G4OpenGLView::snglBuf_RGBA[10] =
int G4OpenGLViewer::snglBuf_RGBA[10] =
{ GLX_RGBA, GLX_RED_SIZE, 3, GLX_GREEN_SIZE, 3,
GLX_BLUE_SIZE, 2, GLX_DEPTH_SIZE, 1, None };
int G4OpenGLView::dblBuf_RGBA[11] =
int G4OpenGLViewer::dblBuf_RGBA[11] =
{ GLX_RGBA, GLX_RED_SIZE, 3, GLX_GREEN_SIZE, 3,
GLX_BLUE_SIZE, 2, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 1, None };
G4OpenGLView::G4OpenGLView (G4OpenGLScene& scene):
G4VView (scene, -1),
fScene (scene),
G4OpenGLViewer::G4OpenGLViewer (G4OpenGLSceneHandler& scene):
G4VViewer (scene, -1),
fSceneHandler (scene),
white_background (False),
transparency_enabled (False),
antialiasing_enabled (False),
@@ -56,7 +56,9 @@ haloing_enabled (False)
}
void G4OpenGLView::InitializeGLView ()
G4OpenGLViewer::~G4OpenGLViewer () {}
void G4OpenGLViewer::InitializeGLView ()
{
glClearColor (0.0, 0.0, 0.0, 0.0);
glClearDepth (1.0);
@@ -65,7 +67,7 @@ void G4OpenGLView::InitializeGLView ()
glDisable (GL_POLYGON_SMOOTH);
}
void G4OpenGLView::ClearView () {
void G4OpenGLViewer::ClearView () {
//Below line does not compile with Mesa includes.
//glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glClear (GL_COLOR_BUFFER_BIT);
@@ -74,7 +76,7 @@ void G4OpenGLView::ClearView () {
glFlush ();
}
void G4OpenGLView::SetView () {
void G4OpenGLViewer::SetView () {
// Calculates view representation based on extent of object being
// viewed and (initial) viewpoint. (Note: it can change later due
@@ -96,7 +98,7 @@ void G4OpenGLView::SetView () {
const G4Point3D& target = fVP.GetCurrentTargetPoint ();
// Get radius of scene.
G4double radius = fScene.GetSceneData().GetExtent().GetExtentRadius();
G4double radius = fSceneHandler.GetScene()->GetExtent().GetExtentRadius();
if(radius<=0.) radius = 1.;
const G4double cameraDistance = fVP.GetCameraDistance (radius);
@@ -163,7 +165,7 @@ void G4OpenGLView::SetView () {
}
void G4OpenGLView::HaloingFirstPass () {
void G4OpenGLViewer::HaloingFirstPass () {
//To perform haloing, first Draw all information to the depth buffer
//alone, using a chunky line width, and then Draw all info again, to
@@ -185,7 +187,7 @@ void G4OpenGLView::HaloingFirstPass () {
}
void G4OpenGLView::HaloingSecondPass () {
void G4OpenGLViewer::HaloingSecondPass () {
//And finally, turn the colour buffer back on with a sesible line width...
glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
@@ -194,12 +196,12 @@ void G4OpenGLView::HaloingSecondPass () {
}
void G4OpenGLView::HLRFirstPass () {
void G4OpenGLViewer::HLRFirstPass () {
G4cout << "First pass HLR" << endl;
//Hidden line drawing requires three renderings to different buffers, so it
//cannot be treated in G4OpenGLScene alone (as can wireframe or hidden
//cannot be treated in G4OpenGLSceneHandler alone (as can wireframe or hidden
//surface (solid) mode)
//So, after SIGGRAPH97
@@ -239,7 +241,7 @@ void G4OpenGLView::HLRFirstPass () {
ProcessView ();
}
void G4OpenGLView::HLRSecondPass () {
void G4OpenGLViewer::HLRSecondPass () {
G4cout << "Second pass HLR" << endl;
@@ -259,7 +261,7 @@ void G4OpenGLView::HLRSecondPass () {
}
void G4OpenGLView::HLRThirdPass () {
void G4OpenGLViewer::HLRThirdPass () {
//3) Turn off the stencil buffer, turn on the colour buffer
// and render polygons in wireframe mode.
source/visualization/OpenGL/src/G4OpenGLWin32View.cc → source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc
+12 -12
View File
@@ -5,16 +5,16 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLWin32View.cc,v 2.2 1998/07/13 17:11:43 urbi Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLWin32Viewer.cc,v 1.1 1999/01/09 16:23:32 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// G4OpenGLWin32View : Class to provide WindowsNT specific
// G4OpenGLWin32Viewer : Class to provide WindowsNT specific
// functionality for OpenGL in GEANT4
#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
#include "G4OpenGLWin32View.hh"
#include "G4OpenGLWin32Viewer.hh"
#include <GL/gl.h>
#include <GL/glx.h>
@@ -30,7 +30,7 @@
#include "G4Point3D.hh"
#include "G4Normal3D.hh"
void G4OpenGLWin32View::FinishView () {
void G4OpenGLWin32Viewer::FinishView () {
//Wait for GL commands to exit before going on...
//Swap buffers if double buffered...
@@ -38,26 +38,26 @@ void G4OpenGLWin32View::FinishView () {
}
void G4OpenGLWin32View::GetWin32Connection () {
void G4OpenGLWin32Viewer::GetWin32Connection () {
// get a connection.
}
void G4OpenGLWin32View::CreateGLWin32Context () {
void G4OpenGLWin32Viewer::CreateGLWin32Context () {
// create a GL context
// set attributes of window now the GL context has been created
}
void G4OpenGLWin32View::CreateMainWindow () {
void G4OpenGLWin32Viewer::CreateMainWindow () {
// create a window
// connect the context to a window
}
G4OpenGLWin32View::G4OpenGLWin32View (G4OpenGLScene& scene):
G4VView (scene, -1),
G4OpenGLView (scene)
G4OpenGLWin32Viewer::G4OpenGLWin32Viewer (G4OpenGLSceneHandler& scene):
G4VViewer (scene, -1),
G4OpenGLViewer (scene)
{
GetWin32Connection ();
if (fViewId < 0) return;
@@ -72,7 +72,7 @@ G4OpenGLView (scene)
}
G4OpenGLWin32View::~G4OpenGLWin32View () {
G4OpenGLWin32Viewer::~G4OpenGLWin32Viewer () {
if (fViewId >= 0) {
//Close a window from here
//destroy GL context
source/visualization/OpenGL/src/G4OpenGLXView.cc → source/visualization/OpenGL/src/G4OpenGLXViewer.cc
+39 -28
View File
@@ -5,17 +5,17 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXView.cc,v 2.6 1998/10/14 14:26:26 allison Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXViewer.cc,v 1.4 1999/07/03 10:51:45 johna Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 7th February 1997
// G4OpenGLXView : Class to provide XWindows specific
// G4OpenGLXViewer : Class to provide XWindows specific
// functionality for OpenGL in GEANT4
#ifdef G4VIS_BUILD_OPENGLX_DRIVER
#ifdef G4VIS_BUILD_OPENGL_DRIVER
#include "G4OpenGLXView.hh"
#include "G4OpenGLXViewer.hh"
#include <GL/gl.h>
#include <GL/glx.h>
@@ -48,7 +48,18 @@ static Bool WaitForNotify (Display*, XEvent* e, char* arg) {
return (e->type == MapNotify) && (e->xmap.window == (Window) arg);
}
void G4OpenGLXView::FinishView () {
void G4OpenGLXViewer::SetView () {
glXMakeCurrent (dpy, win, cx);
G4OpenGLViewer::SetView ();
}
void G4OpenGLXViewer::ShowView () {
glXWaitGL (); //Wait for effects of all previous OpenGL commands to
//be propogated before progressing.
glFlush ();
}
void G4OpenGLXViewer::FinishView () {
glXWaitGL (); //Wait for effects of all previous OpenGL commands to
//be propogated before progressing.
if (doublebuffer == true) {
@@ -57,31 +68,31 @@ void G4OpenGLXView::FinishView () {
else glFlush ();
}
void G4OpenGLXView::GetXConnection () {
void G4OpenGLXViewer::GetXConnection () {
// get a connection.
dpy = XOpenDisplay (0);
if (!dpy) {
fViewId = -1; // This flags an error.
G4cerr << "G4OpenGLView::G4OpenGLView couldn't open display." << endl;
G4cerr << "G4OpenGLViewer::G4OpenGLViewer couldn't open display." << endl;
return;
}
// make sure OpenGL is supported and installed properly.
if (!glXQueryExtension (dpy, &errorBase, &eventBase)) {
fViewId = -1; // This flags an error.
G4cerr << "G4OpenGLView::G4OpenGLView X Server has no GLX extension."
G4cerr << "G4OpenGLViewer::G4OpenGLViewer X Server has no GLX extension."
<< endl;
return;
}
}
void G4OpenGLXView::CreateGLXContext (XVisualInfo* v) {
void G4OpenGLXViewer::CreateGLXContext (XVisualInfo* v) {
vi = v;
// get window's attributes
if (!XGetWindowAttributes(dpy, XRootWindow (dpy, vi -> screen), &xwa)) {
fViewId = -1; // This flags an error.
G4cerr << "G4OpenGLView::G4OpenGLView couldn't return window attributes"
G4cerr << "G4OpenGLViewer::G4OpenGLViewer couldn't return window attributes"
<< endl;
return;
}
@@ -90,7 +101,7 @@ void G4OpenGLXView::CreateGLXContext (XVisualInfo* v) {
cx = glXCreateContext (dpy, vi, 0, true);
if (!cx) {
fViewId = -1; // This flags an error.
G4cerr << "G4OpenGLView::G4OpenGLView couldn't create context."
G4cerr << "G4OpenGLViewer::G4OpenGLViewer couldn't create context."
<< endl;
return;
}
@@ -132,14 +143,14 @@ void G4OpenGLXView::CreateGLXContext (XVisualInfo* v) {
if (!cmap) {
fViewId = -1; // This flags an error.
G4cerr << "G4OpenGLView::G4OpenGLView failed to allocate a Colormap."
G4cerr << "G4OpenGLViewer::G4OpenGLViewer failed to allocate a Colormap."
<< endl;
return;
}
}
void G4OpenGLXView::CreateMainWindow () {
void G4OpenGLXViewer::CreateMainWindow () {
// create a window
swa.colormap = cmap;
@@ -207,9 +218,9 @@ void G4OpenGLXView::CreateMainWindow () {
glXMakeCurrent (dpy, win, cx);
}
G4OpenGLXView::G4OpenGLXView (G4OpenGLScene& scene):
G4VView (scene, -1),
G4OpenGLView (scene), //ajw
G4OpenGLXViewer::G4OpenGLXViewer (G4OpenGLSceneHandler& scene):
G4VViewer (scene, -1),
G4OpenGLViewer (scene), //ajw
vi_immediate (0),
vi_stored (0),
print_colour (true),
@@ -250,7 +261,7 @@ vectored_ps (true)
}
G4OpenGLXView::~G4OpenGLXView () {
G4OpenGLXViewer::~G4OpenGLXViewer () {
if (fViewId >= 0) {
//Close a window from here
glXDestroyContext (dpy, cx);
@@ -260,7 +271,7 @@ G4OpenGLXView::~G4OpenGLXView () {
}
}
void G4OpenGLXView::print() {
void G4OpenGLXViewer::print() {
//cout << "print_col_callback requested with file name: " << print_string << endl;
@@ -341,7 +352,7 @@ void G4OpenGLXView::print() {
}
void G4OpenGLXView::print3DcolorVertex(GLint size, GLint * count, GLfloat * buffer)
void G4OpenGLXViewer::print3DcolorVertex(GLint size, GLint * count, GLfloat * buffer)
{
G4int i;
@@ -353,7 +364,7 @@ void G4OpenGLXView::print3DcolorVertex(GLint size, GLint * count, GLfloat * buff
printf("\n");
}
void G4OpenGLXView::spewWireframeEPS (FILE* file, GLint size, GLfloat* buffer, char* cr) {
void G4OpenGLXViewer::spewWireframeEPS (FILE* file, GLint size, GLfloat* buffer, char* cr) {
GLfloat EPS_GOURAUD_THRESHOLD=0.1;
@@ -367,7 +378,7 @@ void G4OpenGLXView::spewWireframeEPS (FILE* file, GLint size, GLfloat* buffer, c
glGetFloatv (GL_POINT_SIZE, &pointSize);
fputs ("%!PS-Adobe-2.0 EPSF-2.0\n", file);
fprintf (file, "%%%%Creator: %s (using OpenGL feedback)\n", file, cr);
fprintf (file, "%%%%Creator: %s (using OpenGL feedback)\n", cr);
fprintf (file, "%%%%BoundingBox: %g %g %g %g\n", viewport[0], viewport[1], viewport[2], viewport[3]);
fputs ("%%EndComments\n", file);
fputs ("\n", file);
@@ -394,7 +405,7 @@ void G4OpenGLXView::spewWireframeEPS (FILE* file, GLint size, GLfloat* buffer, c
fclose(file);
}
void G4OpenGLXView::printBuffer (GLint size, GLfloat* buffer) {
void G4OpenGLXViewer::printBuffer (GLint size, GLfloat* buffer) {
GLint count;
G4int token, nvertices;
@@ -439,7 +450,7 @@ void G4OpenGLXView::printBuffer (GLint size, GLfloat* buffer) {
}
}
G4float* G4OpenGLXView::spewPrimitiveEPS (FILE* file, GLfloat* loc) {
G4float* G4OpenGLXViewer::spewPrimitiveEPS (FILE* file, GLfloat* loc) {
G4int token;
G4int nvertices, i;
@@ -656,7 +667,7 @@ compare(const void *a, const void *b)
}
}
void G4OpenGLXView::spewSortedFeedback(FILE * file, GLint size, GLfloat * buffer)
void G4OpenGLXViewer::spewSortedFeedback(FILE * file, GLint size, GLfloat * buffer)
{
int token;
GLfloat *loc, *end;
@@ -762,7 +773,7 @@ void G4OpenGLXView::spewSortedFeedback(FILE * file, GLint size, GLfloat * buffer
free(prims);
}
GLXContext G4OpenGLXView::create_GL_print_context(XVisualInfo*& pvi, G4bool& db) {
GLXContext G4OpenGLXViewer::create_GL_print_context(XVisualInfo*& pvi, G4bool& db) {
pvi = glXChooseVisual (dpy,
XDefaultScreen (dpy),
@@ -785,7 +796,7 @@ GLXContext G4OpenGLXView::create_GL_print_context(XVisualInfo*& pvi, G4bool& db)
False);
}
int G4OpenGLXView::generateEPS (char* filnam,
int G4OpenGLXViewer::generateEPS (char* filnam,
int inColour,
unsigned int width,
unsigned int height) {
@@ -862,7 +873,7 @@ int G4OpenGLXView::generateEPS (char* filnam,
return 0;
}
GLubyte* G4OpenGLXView::grabPixels (int inColor, unsigned int width, unsigned int height) {
GLubyte* G4OpenGLXViewer::grabPixels (int inColor, unsigned int width, unsigned int height) {
GLubyte* buffer;
GLint swapbytes, lsbfirst, rowlength;
source/visualization/OpenGL/src/G4OpenGLXmBox.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmBox.cc,v 2.1 1998/07/13 17:11:44 urbi Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmBox.cc,v 1.2 1999/01/09 16:23:34 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Box container class
source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc
+15 -15
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmConvenienceRoutines.cc,v 2.2 1998/08/13 16:14:34 barrand Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.2 1999/01/09 16:23:35 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 16th April 1997
@@ -20,9 +20,9 @@
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
//#include "G4OpenGLXmConvenienceRoutines.hh"
#include "G4OpenGLXmView.hh"
#include "G4OpenGLXmViewer.hh"
void G4OpenGLXmView::Add_four_arrow_buttons (G4OpenGLXmView* pView,
void G4OpenGLXmViewer::Add_four_arrow_buttons (G4OpenGLXmViewer* pView,
XtCallbackRec** arrow_callbacks,
Widget* parent_widget) {
@@ -166,14 +166,14 @@ void G4OpenGLXmView::Add_four_arrow_buttons (G4OpenGLXmView* pView,
}
void G4OpenGLXmView::Add_radio_box (char* label_string,
void G4OpenGLXmViewer::Add_radio_box (char* label_string,
Widget* parent_widget,
XtCallbackRec* radio_box_callback,
G4int num_buttons,
G4int default_button,
char* radio_box_name,
char** button_names,
G4OpenGLXmView* pView)
G4OpenGLXmViewer* pView)
{
XmString button_str;
@@ -257,12 +257,12 @@ void G4OpenGLXmView::Add_radio_box (char* label_string,
delete[] args;
}
void G4OpenGLXmView::Add_set_field (char* w_name,
void G4OpenGLXmViewer::Add_set_field (char* w_name,
char* w_text,
Widget* row_col_box,
Widget* wid,
G4double* val,
G4OpenGLXmView* pView)
G4OpenGLXmViewer* pView)
{
char local_w_text[50];
@@ -305,7 +305,7 @@ void G4OpenGLXmView::Add_set_field (char* w_name,
XtAddCallback (*wid,
XmNvalueChangedCallback,
G4OpenGLXmView::get_double_value_callback,
G4OpenGLXmViewer::get_double_value_callback,
val);
Widget sep = XtVaCreateManagedWidget ("sep",
@@ -333,10 +333,10 @@ void G4OpenGLXmView::Add_set_field (char* w_name,
NULL);
}
void G4OpenGLXmView::Add_slider_box (char* label_string,
void G4OpenGLXmViewer::Add_slider_box (char* label_string,
G4int num_sliders,
char** slider_names,
G4OpenGLXmView* pView,
G4OpenGLXmViewer* pView,
G4double* min_array,
G4double* max_array,
G4double* value_array,
@@ -449,7 +449,7 @@ void G4OpenGLXmView::Add_slider_box (char* label_string,
}
void G4OpenGLXmView::get_double_value_callback (Widget w,
void G4OpenGLXmViewer::get_double_value_callback (Widget w,
XtPointer clientData,
XtPointer)
{
@@ -464,7 +464,7 @@ void G4OpenGLXmView::get_double_value_callback (Widget w,
}
void G4OpenGLXmView::get_text_callback (Widget w,
void G4OpenGLXmViewer::get_text_callback (Widget w,
XtPointer clientData,
XtPointer)
{
@@ -478,14 +478,14 @@ void G4OpenGLXmView::get_text_callback (Widget w,
sscanf (string, "%s", txt);
}
G4bool G4OpenGLXmView::get_boolean_userData (Widget w)
G4bool G4OpenGLXmViewer::get_boolean_userData (Widget w)
{
XtPointer userData;
XtVaGetValues (w,XmNuserData,&userData,NULL);
return (G4bool)(unsigned long)userData;
}
G4int G4OpenGLXmView::get_int_userData (Widget w)
G4int G4OpenGLXmViewer::get_int_userData (Widget w)
{
XtPointer userData;
XtVaGetValues (w,XmNuserData,&userData,NULL);
source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmFourArrowButtons.cc,v 2.0 1998/07/02 16:46:37 gunter Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmFourArrowButtons.cc,v 1.2 1999/01/09 16:23:36 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent
source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmFramedBox.cc,v 2.1 1998/07/13 17:11:45 urbi Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmFramedBox.cc,v 1.2 1999/01/09 16:23:37 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Framed box container class
source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc
+37 -37
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 2.4 1998/10/04 11:34:00 ajw Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.3 1999/01/11 00:47:49 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 16th April 1997
@@ -22,7 +22,7 @@
#include "G4Xt.hh"
#include "G4OpenGLXmView.hh"
#include "G4OpenGLXmViewer.hh"
#include "G4OpenGLXmRadioButton.hh"
#include "G4OpenGLXmSliderBar.hh"
@@ -40,12 +40,12 @@
#include <strstream.h>
#endif
void G4OpenGLXmView::actions_callback (Widget w,
void G4OpenGLXmViewer::actions_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4OpenGLXmView* pView;
G4OpenGLXmViewer* pView;
G4long choice = (G4long)clientData;
@@ -73,7 +73,7 @@ void G4OpenGLXmView::actions_callback (Widget w,
pView->fprotation_top->AddChild (pView->fprotation_button_box);
XtCallbackRec* rot_cb_list = new XtCallbackRec[2];
rot_cb_list[0].callback = G4OpenGLXmView::set_rot_subject_callback;
rot_cb_list[0].callback = G4OpenGLXmViewer::set_rot_subject_callback;
rot_cb_list[0].closure = pView;
rot_cb_list[1].callback = NULL;
@@ -94,7 +94,7 @@ void G4OpenGLXmView::actions_callback (Widget w,
pView->fprotation_top->AddChild (pView->fprotation_slider_box);
XtCallbackRec* rot_slider_list = new XtCallbackRec[2];
rot_slider_list[0].callback = G4OpenGLXmView::set_rot_sens_callback;
rot_slider_list[0].callback = G4OpenGLXmViewer::set_rot_sens_callback;
rot_slider_list[0].closure = pView;
rot_slider_list[1].callback = NULL;
@@ -114,19 +114,19 @@ void G4OpenGLXmView::actions_callback (Widget w,
for (G4int i = 0; i < 4; i++) {
rotation_callbacks[i] = new XtCallbackRec[2];
}
rotation_callbacks[0][0].callback = G4OpenGLXmView::phi_rotation_callback;
rotation_callbacks[0][0].callback = G4OpenGLXmViewer::phi_rotation_callback;
rotation_callbacks[0][0].closure = pView;
rotation_callbacks[0][1].callback = NULL;
rotation_callbacks[1][0].callback = G4OpenGLXmView::phi_rotation_callback;
rotation_callbacks[1][0].callback = G4OpenGLXmViewer::phi_rotation_callback;
rotation_callbacks[1][0].closure = pView;
rotation_callbacks[1][1].callback = NULL;
rotation_callbacks[2][0].callback = G4OpenGLXmView::theta_rotation_callback;
rotation_callbacks[2][0].callback = G4OpenGLXmViewer::theta_rotation_callback;
rotation_callbacks[2][0].closure = pView;
rotation_callbacks[2][1].callback = NULL;
rotation_callbacks[3][0].callback = G4OpenGLXmView::theta_rotation_callback;
rotation_callbacks[3][0].callback = G4OpenGLXmViewer::theta_rotation_callback;
rotation_callbacks[3][0].closure = pView;
rotation_callbacks[3][1].callback = NULL;
@@ -163,19 +163,19 @@ void G4OpenGLXmView::actions_callback (Widget w,
for (G4int i = 0; i < 4; i++) {
pan_callbacks[i] = new XtCallbackRec[2];
}
pan_callbacks[0][0].callback = G4OpenGLXmView::pan_up_down_callback;
pan_callbacks[0][0].callback = G4OpenGLXmViewer::pan_up_down_callback;
pan_callbacks[0][0].closure = pView;
pan_callbacks[0][1].callback = NULL;
pan_callbacks[1][0].callback = G4OpenGLXmView::pan_up_down_callback;
pan_callbacks[1][0].callback = G4OpenGLXmViewer::pan_up_down_callback;
pan_callbacks[1][0].closure = pView;
pan_callbacks[1][1].callback = NULL;
pan_callbacks[2][0].callback = G4OpenGLXmView::pan_left_right_callback;
pan_callbacks[2][0].callback = G4OpenGLXmViewer::pan_left_right_callback;
pan_callbacks[2][0].closure = pView;
pan_callbacks[2][1].callback = NULL;
pan_callbacks[3][0].callback = G4OpenGLXmView::pan_left_right_callback;
pan_callbacks[3][0].callback = G4OpenGLXmViewer::pan_left_right_callback;
pan_callbacks[3][0].closure = pView;
pan_callbacks[3][1].callback = NULL;
@@ -184,7 +184,7 @@ void G4OpenGLXmView::actions_callback (Widget w,
pView->fppanning_box->AddChild (pView->fppanning_arrows);
XtCallbackRec* pan_slider_list = new XtCallbackRec[2];
pan_slider_list[0].callback = G4OpenGLXmView::set_pan_sens_callback;
pan_slider_list[0].callback = G4OpenGLXmViewer::set_pan_sens_callback;
pan_slider_list[0].closure = pView;
pan_slider_list[1].callback = NULL;
@@ -192,8 +192,8 @@ void G4OpenGLXmView::actions_callback (Widget w,
pan_slider_list,
True,
2,
pView->pan_sens = pView->GetScene()->GetSceneData().GetExtent().GetExtentRadius() / 10.0,
pView->pan_sens_limit = pView->GetScene()->GetSceneData().GetExtent().GetExtentRadius(),
pView->pan_sens = pView->GetScene()->GetScene()->GetExtent().GetExtentRadius() / 10.0,
pView->pan_sens_limit = pView->GetScene()->GetScene()->GetExtent().GetExtentRadius(),
0);
pView->fppanning_box->AddChild (pView->fppanning_slider);
@@ -202,7 +202,7 @@ void G4OpenGLXmView::actions_callback (Widget w,
pView->fppanning_top->AddChild (pView->fpzoom_box);
XtCallbackRec* zoom_slider_list = new XtCallbackRec[2];
zoom_slider_list[0].callback = G4OpenGLXmView::zoom_callback;
zoom_slider_list[0].callback = G4OpenGLXmViewer::zoom_callback;
zoom_slider_list[0].closure = pView;
zoom_slider_list[1].callback = NULL;
@@ -220,7 +220,7 @@ void G4OpenGLXmView::actions_callback (Widget w,
pView->fppanning_top->AddChild (pView->fpdolly_box);
XtCallbackRec* dolly_slider_list = new XtCallbackRec[2];
dolly_slider_list[0].callback = G4OpenGLXmView::dolly_callback;
dolly_slider_list[0].callback = G4OpenGLXmViewer::dolly_callback;
dolly_slider_list[0].closure = pView;
dolly_slider_list[1].callback = NULL;
@@ -229,8 +229,8 @@ void G4OpenGLXmView::actions_callback (Widget w,
True,
2,
pView->fVP.GetDolly(),
pView->dolly_high = pView->GetScene()->GetSceneData().GetExtent().GetExtentRadius(),
pView->dolly_low = -(pView->GetScene()->GetSceneData().GetExtent().GetExtentRadius()));
pView->dolly_high = pView->GetScene()->GetScene()->GetExtent().GetExtentRadius(),
pView->dolly_low = -(pView->GetScene()->GetScene()->GetExtent().GetExtentRadius()));
// pView->dolly_high,
// pView->dolly_low);
pView->fpdolly_box->AddChild (pView->fpdolly_slider);
@@ -277,7 +277,7 @@ void G4OpenGLXmView::actions_callback (Widget w,
&(pView->dolly_low));
XtCallbackRec* ok_list = new XtCallbackRec[2];
ok_list[0].callback = G4OpenGLXmView::update_panels_callback;
ok_list[0].callback = G4OpenGLXmViewer::update_panels_callback;
ok_list[0].closure = pView;
ok_list[1].callback = NULL;
@@ -309,11 +309,11 @@ void G4OpenGLXmView::actions_callback (Widget w,
void G4OpenGLXmView::misc_callback (Widget w,
void G4OpenGLXmViewer::misc_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4OpenGLXmView* pView;
G4OpenGLXmViewer* pView;
G4long choice = (G4long)clientData;
XtVaGetValues (XtParent(w),
XmNuserData, &pView,
@@ -339,7 +339,7 @@ void G4OpenGLXmView::misc_callback (Widget w,
pView->fpmiscellany_top->AddChild (pView->fpwobble_box);
XtCallbackRec* wob_cb_list = new XtCallbackRec[2];
wob_cb_list[0].callback = G4OpenGLXmView::wobble_callback;
wob_cb_list[0].callback = G4OpenGLXmViewer::wobble_callback;
wob_cb_list[0].closure = pView;
wob_cb_list[1].callback = NULL;
@@ -348,7 +348,7 @@ void G4OpenGLXmView::misc_callback (Widget w,
wob_cb_list);
XtCallbackRec* wobble_slider_list = new XtCallbackRec[2];
wobble_slider_list[0].callback = G4OpenGLXmView::set_wob_sens_callback;
wobble_slider_list[0].callback = G4OpenGLXmViewer::set_wob_sens_callback;
wobble_slider_list[0].closure = pView;
wobble_slider_list[1].callback = NULL;
@@ -367,9 +367,9 @@ void G4OpenGLXmView::misc_callback (Widget w,
pView->fpmiscellany_top->AddChild (pView->fpreset_box);
XtCallbackRec* rst_cb_list = new XtCallbackRec[3];
rst_cb_list[0].callback = G4OpenGLXmView::reset_callback;
rst_cb_list[0].callback = G4OpenGLXmViewer::reset_callback;
rst_cb_list[0].closure = pView;
rst_cb_list[1].callback = G4OpenGLXmView::update_panels_callback;
rst_cb_list[1].callback = G4OpenGLXmViewer::update_panels_callback;
rst_cb_list[1].closure = pView;
rst_cb_list[2].callback = NULL;
@@ -383,7 +383,7 @@ void G4OpenGLXmView::misc_callback (Widget w,
pView->fpmiscellany_top->AddChild (pView->fpproj_style_box);
XtCallbackRec* proj_cb_list = new XtCallbackRec[2];
proj_cb_list[0].callback = G4OpenGLXmView::projection_callback;
proj_cb_list[0].callback = G4OpenGLXmViewer::projection_callback;
proj_cb_list[0].closure = pView;
proj_cb_list[1].callback = NULL;
@@ -440,7 +440,7 @@ void G4OpenGLXmView::misc_callback (Widget w,
pView->fpprint_top->AddChild (pView->fpprint_col_box);
XtCallbackRec* prcol_cb_list = new XtCallbackRec[2];
prcol_cb_list[0].callback = G4OpenGLXmView::set_print_colour_callback;
prcol_cb_list[0].callback = G4OpenGLXmViewer::set_print_colour_callback;
prcol_cb_list[0].closure = pView;
prcol_cb_list[1].callback = NULL;
@@ -462,7 +462,7 @@ void G4OpenGLXmView::misc_callback (Widget w,
pView->fpprint_top->AddChild (pView->fpprint_style_box);
XtCallbackRec* prsty_cb_list = new XtCallbackRec[2];
prsty_cb_list[0].callback = G4OpenGLXmView::set_print_style_callback;
prsty_cb_list[0].callback = G4OpenGLXmViewer::set_print_style_callback;
prsty_cb_list[0].closure = pView;
prsty_cb_list[1].callback = NULL;
@@ -487,7 +487,7 @@ void G4OpenGLXmView::misc_callback (Widget w,
pView->fpprint_box->AddChild (pView->fpprint_line);
XtCallbackRec* pri_cb_list = new XtCallbackRec[2];
pri_cb_list[0].callback = G4OpenGLXmView::print_callback;
pri_cb_list[0].callback = G4OpenGLXmViewer::print_callback;
pri_cb_list[0].closure = pView;
pri_cb_list[1].callback = NULL;
@@ -512,12 +512,12 @@ void G4OpenGLXmView::misc_callback (Widget w,
}
void G4OpenGLXmView::set_wob_sens_callback (Widget w,
void G4OpenGLXmViewer::set_wob_sens_callback (Widget w,
XtPointer clientData,
XtPointer callData)
{
XmScaleCallbackStruct *cbs = (XmScaleCallbackStruct*) callData;
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
short dp = -1;
G4float ten_to_the_dp = 10.;
@@ -538,11 +538,11 @@ void G4OpenGLXmView::set_wob_sens_callback (Widget w,
pView->wob_sens = (G4float)(cbs->value) / ten_to_the_dp;
}
void G4OpenGLXmView::update_panels_callback (Widget,
void G4OpenGLXmViewer::update_panels_callback (Widget,
XtPointer clientData,
XtPointer)
{
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
if (pView->fppanning_slider) {
pView->fppanning_slider->SetMaxValue (pView->pan_sens_limit);
source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
+19 -19
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmPanningCallbacks.cc,v 2.3 1998/08/24 13:35:09 barrand Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmPanningCallbacks.cc,v 1.2 1999/01/09 16:23:39 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 16th April 1997
@@ -19,14 +19,14 @@
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#include "G4OpenGLXmView.hh"
#include "G4OpenGLXmViewer.hh"
void G4OpenGLXmView::zoom_callback (Widget w,
void G4OpenGLXmViewer::zoom_callback (Widget w,
XtPointer clientData,
XtPointer callData)
{
XmScaleCallbackStruct *cbs = (XmScaleCallbackStruct*) callData;
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
short dp = -1;
G4float ten_to_the_dp = 10.;
@@ -57,12 +57,12 @@ void G4OpenGLXmView::zoom_callback (Widget w,
pView -> DrawView ();
}
void G4OpenGLXmView::dolly_callback (Widget w,
void G4OpenGLXmViewer::dolly_callback (Widget w,
XtPointer clientData,
XtPointer callData)
{
XmScaleCallbackStruct *cbs = (XmScaleCallbackStruct*) callData;
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
short dp = -1;
G4float ten_to_the_dp = 10.;
@@ -90,14 +90,14 @@ void G4OpenGLXmView::dolly_callback (Widget w,
}
void G4OpenGLXmView::pan_left_right_callback (Widget w,
void G4OpenGLXmViewer::pan_left_right_callback (Widget w,
XtPointer clientData,
XtPointer callData)
{
XmArrowButtonCallbackStruct *cbs = (XmArrowButtonCallbackStruct*) callData;
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
pView->pan_right = G4OpenGLXmView::get_boolean_userData (w);
pView->pan_right = G4OpenGLXmViewer::get_boolean_userData (w);
if (cbs->reason == XmCR_ARM) {
left_right_pan_callback (pView,NULL);
@@ -106,11 +106,11 @@ void G4OpenGLXmView::pan_left_right_callback (Widget w,
}
}
void G4OpenGLXmView::left_right_pan_callback (XtPointer clientData,
void G4OpenGLXmViewer::left_right_pan_callback (XtPointer clientData,
XtIntervalId* timer_id)
{
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
G4double delta;
if (pView->pan_right) {
@@ -141,14 +141,14 @@ void G4OpenGLXmView::left_right_pan_callback (XtPointer clientData,
pView);
}
void G4OpenGLXmView::pan_up_down_callback (Widget w,
void G4OpenGLXmViewer::pan_up_down_callback (Widget w,
XtPointer clientData,
XtPointer callData)
{
XmArrowButtonCallbackStruct *cbs = (XmArrowButtonCallbackStruct*) callData;
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
pView->pan_up = G4OpenGLXmView::get_boolean_userData (w);
pView->pan_up = G4OpenGLXmViewer::get_boolean_userData (w);
if (cbs->reason == XmCR_ARM) {
up_down_pan_callback (pView,NULL);
@@ -157,10 +157,10 @@ void G4OpenGLXmView::pan_up_down_callback (Widget w,
}
}
void G4OpenGLXmView::up_down_pan_callback (XtPointer clientData,
void G4OpenGLXmViewer::up_down_pan_callback (XtPointer clientData,
XtIntervalId* timer_id)
{
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
G4double delta;
if (pView->pan_up) {
@@ -189,12 +189,12 @@ void G4OpenGLXmView::up_down_pan_callback (XtPointer clientData,
pView);
}
void G4OpenGLXmView::set_pan_sens_callback (Widget w,
void G4OpenGLXmViewer::set_pan_sens_callback (Widget w,
XtPointer clientData,
XtPointer callData)
{
XmScaleCallbackStruct *cbs = (XmScaleCallbackStruct*) callData;
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
short dp = -1;
G4float ten_to_the_dp = 10.;
source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmPushButton.cc,v 2.0 1998/07/02 16:46:47 gunter Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmPushButton.cc,v 1.2 1999/01/09 16:23:40 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Push button class. Inherits from G4OpenGLXmVWidgetComponent
source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmRadioButton.cc,v 2.0 1998/07/02 16:46:49 gunter Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmRadioButton.cc,v 1.2 1999/01/09 16:23:40 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Radio button class. Inherits from G4OpenGLXmVWidgetComponent
source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc
+39 -37
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmRotationCallbacks.cc,v 2.4 1998/08/24 13:35:10 barrand Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmRotationCallbacks.cc,v 1.4 1999/02/07 17:09:35 johna Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 16th April 1997
@@ -17,32 +17,32 @@
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#include "G4OpenGLXmView.hh"
#include "G4OpenGLXmViewer.hh"
#include "G4UImanager.hh"
#include "G4ios.hh"
void G4OpenGLXmView::theta_rotation_callback (Widget w,
void G4OpenGLXmViewer::theta_rotation_callback (Widget w,
XtPointer clientData,
XtPointer callData)
{
XmArrowButtonCallbackStruct *cbs = (XmArrowButtonCallbackStruct*) callData;
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
pView->rotate_right = G4OpenGLXmView::get_boolean_userData (w);
pView->rotate_right = G4OpenGLXmViewer::get_boolean_userData (w);
if (cbs->reason == XmCR_ARM) {
G4OpenGLXmView::rotate_in_theta (pView, NULL);
G4OpenGLXmViewer::rotate_in_theta (pView, NULL);
} else if (cbs->reason == XmCR_DISARM) {
XtRemoveTimeOut (pView->rotation_timer);
}
}
void G4OpenGLXmView::rotate_in_theta (XtPointer clientData,
void G4OpenGLXmViewer::rotate_in_theta (XtPointer clientData,
XtIntervalId* timer_id)
{
//theta spin stuff here
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
G4double delta_theta;
if (pView->fVP.GetLightsMoveWithCamera()) {
@@ -88,32 +88,32 @@ void G4OpenGLXmView::rotate_in_theta (XtPointer clientData,
pView->rotation_timer = XtAppAddTimeOut
(pView->app,
timer_id == NULL ? 500 : 1,
G4OpenGLXmView::rotate_in_theta,
G4OpenGLXmViewer::rotate_in_theta,
pView);
}
void G4OpenGLXmView::phi_rotation_callback (Widget w,
void G4OpenGLXmViewer::phi_rotation_callback (Widget w,
XtPointer clientData,
XtPointer callData)
{
XmArrowButtonCallbackStruct *cbs = (XmArrowButtonCallbackStruct*) callData;
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
pView->rotate_up = G4OpenGLXmView::get_boolean_userData (w);
pView->rotate_up = G4OpenGLXmViewer::get_boolean_userData (w);
if (cbs->reason == XmCR_ARM) {
G4OpenGLXmView::rotate_in_phi (pView, NULL);
G4OpenGLXmViewer::rotate_in_phi (pView, NULL);
} else if (cbs->reason == XmCR_DISARM) {
XtRemoveTimeOut (pView->rotation_timer);
}
}
void G4OpenGLXmView::rotate_in_phi (XtPointer clientData,
void G4OpenGLXmViewer::rotate_in_phi (XtPointer clientData,
XtIntervalId* timer_id)
{
//phi spin stuff here
G4double delta_alpha;
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
if (pView->fVP.GetLightsMoveWithCamera()) {
if (pView -> rotate_up) {
@@ -149,16 +149,16 @@ void G4OpenGLXmView::rotate_in_phi (XtPointer clientData,
pView->rotation_timer = XtAppAddTimeOut
(pView->app,
timer_id == NULL ? 500 : 1,
G4OpenGLXmView::rotate_in_phi,
G4OpenGLXmViewer::rotate_in_phi,
pView);
}
void G4OpenGLXmView::set_rot_sens_callback (Widget w,
void G4OpenGLXmViewer::set_rot_sens_callback (Widget w,
XtPointer clientData,
XtPointer callData)
{
XmScaleCallbackStruct *cbs = (XmScaleCallbackStruct*) callData;
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
short dp = -1;
G4float ten_to_the_dp = 10.;
@@ -179,13 +179,13 @@ void G4OpenGLXmView::set_rot_sens_callback (Widget w,
pView->rot_sens = (G4float)(cbs->value) / ten_to_the_dp;
}
void G4OpenGLXmView::set_rot_subject_callback (Widget w,
void G4OpenGLXmViewer::set_rot_subject_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4OpenGLXmView* pView = (G4OpenGLXmView*)clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*)clientData;
G4int choice = G4OpenGLXmView::get_int_userData (w);
G4int choice = G4OpenGLXmViewer::get_int_userData (w);
switch (choice) {
case 0:
@@ -205,27 +205,28 @@ void G4OpenGLXmView::set_rot_subject_callback (Widget w,
}
}
void G4OpenGLXmView::wobble_callback (Widget w,
void G4OpenGLXmViewer::wobble_callback (Widget w,
XtPointer,
XtPointer)
{
G4OpenGLXmView* pView;
G4OpenGLXmViewer* pView;
XtVaGetValues (w,
XmNuserData, &pView,
NULL);
pView->original_vp = pView->fVP.GetViewpointDirection();
pView->wobble_timer = XtAppAddTimeOut (pView->app,
1000. * (1. / pView->wob_sens),
G4OpenGLXmView::wobble_timer_callback,
pView);
pView->wobble_timer = XtAppAddTimeOut
(pView->app,
(long unsigned int) (1000. * (1. / pView->wob_sens)),
G4OpenGLXmViewer::wobble_timer_callback,
pView);
}
void G4OpenGLXmView::wobble_timer_callback (XtPointer clientData,
void G4OpenGLXmViewer::wobble_timer_callback (XtPointer clientData,
XtIntervalId*)
{
G4OpenGLXmView* pView = (G4OpenGLXmView*)clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*)clientData;
G4Vector3D up = pView->fVP.GetUpVector();
G4Vector3D vp = pView->fVP.GetViewpointDirection();
G4Vector3D third_axis = up.cross(pView->original_vp);
@@ -249,25 +250,26 @@ void G4OpenGLXmView::wobble_timer_callback (XtPointer clientData,
pView->DrawView ();
}
} else {
pView->wobble_timer = XtAppAddTimeOut (pView->app,
1000. * (1. / pView->wob_sens),
G4OpenGLXmView::wobble_timer_callback,
pView);
pView->wobble_timer = XtAppAddTimeOut
(pView->app,
(long unsigned int) (1000. * (1. / pView->wob_sens)),
G4OpenGLXmViewer::wobble_timer_callback,
pView);
}
}
void G4OpenGLXmView::reset_callback (Widget w,
void G4OpenGLXmViewer::reset_callback (Widget w,
XtPointer,
XtPointer)
{
G4OpenGLXmView* pView;
G4OpenGLXmViewer* pView;
XtVaGetValues (w,
XmNuserData, &pView,
NULL);
pView->fVP.SetCurrentTargetPoint(pView->fScene.GetSceneData().GetStandardTargetPoint());
pView->fVP.SetCurrentTargetPoint(pView->fSceneHandler.GetScene()->GetStandardTargetPoint());
pView->fVP.SetZoomFactor(1.0);
pView->fVP.SetDolly(0.0);
pView->SetView ();
source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmSeparator.cc,v 2.0 1998/07/02 16:46:53 gunter Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmSeparator.cc,v 1.2 1999/01/09 16:23:42 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Separator class. Inherits from G4OpenGLXmVWidgetComponent
source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmSliderBar.cc,v 2.0 1998/07/02 16:46:55 gunter Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmSliderBar.cc,v 1.2 1999/01/09 16:23:43 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
+18 -18
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmStyleCallbacks.cc,v 2.3 1998/10/11 15:58:24 ajw Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmStyleCallbacks.cc,v 1.2 1999/01/09 16:23:43 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 16th April 1997
@@ -17,14 +17,14 @@
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#include "G4OpenGLXmView.hh"
#include "G4OpenGLXmViewer.hh"
void G4OpenGLXmView::drawing_style_callback (Widget w,
void G4OpenGLXmViewer::drawing_style_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4long choice = (G4long)clientData;
G4OpenGLXmView* pView;
G4OpenGLXmViewer* pView;
XtVaGetValues (XtParent(w),
XmNuserData, &pView,
NULL);
@@ -59,12 +59,12 @@ void G4OpenGLXmView::drawing_style_callback (Widget w,
pView->DrawView ();
}
void G4OpenGLXmView::rep_style_callback (Widget w,
void G4OpenGLXmViewer::rep_style_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4long choice = (G4long)clientData;
G4OpenGLXmView* pView;
G4OpenGLXmViewer* pView;
XtVaGetValues (XtParent(w),
XmNuserData, &pView,
NULL);
@@ -91,12 +91,12 @@ void G4OpenGLXmView::rep_style_callback (Widget w,
pView->DrawView ();
}
void G4OpenGLXmView::background_color_callback (Widget w,
void G4OpenGLXmViewer::background_color_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4long choice = (G4long)clientData;
G4OpenGLXmView* pView;
G4OpenGLXmViewer* pView;
XtVaGetValues (XtParent(w),
XmNuserData, &pView,
NULL);
@@ -134,12 +134,12 @@ void G4OpenGLXmView::background_color_callback (Widget w,
pView->DrawView ();
}
void G4OpenGLXmView::transparency_callback (Widget w,
void G4OpenGLXmViewer::transparency_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4long choice = (G4long)clientData;
G4OpenGLXmView* pView;
G4OpenGLXmViewer* pView;
XtVaGetValues (XtParent(w),
XmNuserData, &pView,
NULL);
@@ -167,12 +167,12 @@ void G4OpenGLXmView::transparency_callback (Widget w,
pView->DrawView ();
}
void G4OpenGLXmView::antialias_callback (Widget w,
void G4OpenGLXmViewer::antialias_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4long choice = (G4long)clientData;
G4OpenGLXmView* pView;
G4OpenGLXmViewer* pView;
XtVaGetValues (XtParent(w),
XmNuserData, &pView,
NULL);
@@ -202,12 +202,12 @@ void G4OpenGLXmView::antialias_callback (Widget w,
pView->DrawView ();
}
void G4OpenGLXmView::haloing_callback (Widget w,
void G4OpenGLXmViewer::haloing_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4long choice = (G4long)clientData;
G4OpenGLXmView* pView;
G4OpenGLXmViewer* pView;
XtVaGetValues (XtParent(w),
XmNuserData, &pView,
NULL);
@@ -231,13 +231,13 @@ void G4OpenGLXmView::haloing_callback (Widget w,
pView->DrawView ();
}
void G4OpenGLXmView::projection_callback (Widget w,
void G4OpenGLXmViewer::projection_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4OpenGLXmView* pView = (G4OpenGLXmView*)clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*)clientData;
G4int choice = G4OpenGLXmView::get_int_userData (w);
G4int choice = G4OpenGLXmViewer::get_int_userData (w);
switch (choice) {
case 0:
source/visualization/OpenGL/src/G4OpenGLXmTextField.cc
+4 -4
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmTextField.cc,v 2.1 1998/08/04 14:32:39 ajw Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmTextField.cc,v 1.2 1999/01/09 16:23:44 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Text field class. Inherits from G4OpenGLXmVWidgetComponent
@@ -136,12 +136,12 @@ void G4OpenGLXmTextField::AddYourselfTo (G4OpenGLXmVWidgetContainer* container)
if (!text) {
XtAddCallback (text_field,
XmNvalueChangedCallback,
G4OpenGLXmView::get_double_value_callback,
G4OpenGLXmViewer::get_double_value_callback,
value);
} else {
XtAddCallback (text_field,
XmNvalueChangedCallback,
G4OpenGLXmView::get_text_callback,
G4OpenGLXmViewer::get_text_callback,
value);
}
}
source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmTopLevelShell.cc,v 2.1 1998/07/13 17:11:50 urbi Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmTopLevelShell.cc,v 1.2 1999/01/09 16:23:45 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Top level shell class
@@ -15,7 +15,7 @@
#include "G4OpenGLXmTopLevelShell.hh"
#include "G4OpenGLXmVWidgetContainer.hh"
G4OpenGLXmTopLevelShell::G4OpenGLXmTopLevelShell (G4OpenGLXmView* v,
G4OpenGLXmTopLevelShell::G4OpenGLXmTopLevelShell (G4OpenGLXmViewer* v,
char* n)
{
pView = v;
source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmVWidgetComponent.cc,v 2.0 1998/07/02 16:47:02 gunter Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmVWidgetComponent.cc,v 1.2 1999/01/09 16:23:46 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Base class for all Motif component widgets
source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmVWidgetContainer.cc,v 2.0 1998/07/02 16:47:03 gunter Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmVWidgetContainer.cc,v 1.2 1999/01/09 16:23:46 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Base class for all Motif container widgets
source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmVWidgetObject.cc,v 2.0 1998/07/02 16:47:05 gunter Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmVWidgetObject.cc,v 1.2 1999/01/09 16:23:47 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Virtual base class for all Motif widgets.
@@ -20,7 +20,7 @@ G4OpenGLXmVWidgetObject::G4OpenGLXmVWidgetObject ()
G4OpenGLXmVWidgetObject::~G4OpenGLXmVWidgetObject ()
{}
G4OpenGLXmView* G4OpenGLXmVWidgetObject::GetView ()
G4OpenGLXmViewer* G4OpenGLXmVWidgetObject::GetView ()
{
return pView;
}
source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmVWidgetShell.cc,v 2.0 1998/07/02 16:47:06 gunter Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmVWidgetShell.cc,v 1.2 1999/01/09 16:23:48 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//Base class for all Motif shell widgets
source/visualization/OpenGL/src/G4OpenGLXmView.cc → source/visualization/OpenGL/src/G4OpenGLXmViewer.cc
+34 -34
View File
@@ -5,19 +5,19 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmView.cc,v 2.6 1998/10/29 09:40:48 barrand Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmViewer.cc,v 1.2 1999/01/11 00:47:51 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 10th February 1997
// G4OpenGLXmView : Class derived from G4OpenGLXView, to provide
// G4OpenGLXmViewer : Class derived from G4OpenGLXViewer, to provide
// (Motif) widget OpenGL functionality for GEANT4.
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#include "globals.hh"
#include "G4OpenGLXmView.hh"
#include "G4OpenGLXmViewer.hh"
#include <GL/gl.h>
#include <GL/glx.h>
@@ -41,16 +41,16 @@
#include <X11/Shell.h>
static G4ViewParameters viewingParameters;
static void SecondaryLoopPostAction ();
void G4OpenGLXmViewerSecondaryLoopPostAction ();
void G4OpenGLXmView::ShowView () {
void G4OpenGLXmViewer::ShowView () {
viewingParameters = fVP;
G4Xt::getInstance () -> SecondaryLoop ();
}
static void SecondaryLoopPostAction ()
void G4OpenGLXmViewerSecondaryLoopPostAction ()
{
if(G4Xt::getInstance () -> GetExitSecondaryLoopCode ()==OGL_EXIT_CODE)
{
@@ -59,7 +59,7 @@ static void SecondaryLoopPostAction ()
}
void G4OpenGLXmView::GetXmConnection () {
void G4OpenGLXmViewer::GetXmConnection () {
G4Xt* interactorManager = G4Xt::getInstance ();
toplevel = (Widget)interactorManager->GetMainInteractor();
@@ -67,7 +67,7 @@ void G4OpenGLXmView::GetXmConnection () {
if (!toplevel) {
fViewId = -1; // This flags an error.
G4cerr << "G4OpenGLXmView::GetXmConnection unable to Initialize"
G4cerr << "G4OpenGLXmViewer::GetXmConnection unable to Initialize"
" application context." << endl;
return;
}
@@ -93,7 +93,7 @@ void G4OpenGLXmView::GetXmConnection () {
*toplevel*primaryColorSetId: 3\n\
*toplevel*secondaryColorSetId: 3\n\
");
interactorManager->AddSecondaryLoopPostAction ((G4SecondaryLoopAction)SecondaryLoopPostAction);
interactorManager->AddSecondaryLoopPostAction ((G4SecondaryLoopAction)G4OpenGLXmViewerSecondaryLoopPostAction);
shell = XtAppCreateShell ((String)fName.data(),(String)fName.data(),topLevelShellWidgetClass,XtDisplay(toplevel),NULL,0);
interactorManager->AddShell (shell);
@@ -102,20 +102,20 @@ void G4OpenGLXmView::GetXmConnection () {
if (!dpy) {
fViewId = -1; // This flags an error.
G4cerr << "G4OpenGLXmView::GetXmConnection unable to connect to display."
G4cerr << "G4OpenGLXmViewer::GetXmConnection unable to connect to display."
<< endl;
return;
}
if (!glXQueryExtension (dpy, &errorBase, &eventBase)) {
fViewId = -1; // This flags an error.
G4cerr << "G4OpenGLXmView::GetXmConnection. X Server has no GLX extension."
G4cerr << "G4OpenGLXmViewer::GetXmConnection. X Server has no GLX extension."
<< endl;;
return;
}
}
void G4OpenGLXmView::CreateMainWindow () {
void G4OpenGLXmViewer::CreateMainWindow () {
bgnd = XWhitePixelOfScreen (XtScreen(shell));
borcol = XBlackPixelOfScreen (XtScreen(shell));
@@ -200,7 +200,7 @@ void G4OpenGLXmView::CreateMainWindow () {
(style_cascade,
"rep_style",
0,
G4OpenGLXmView::rep_style_callback,
G4OpenGLXmViewer::rep_style_callback,
XmVaRADIOBUTTON, polyhedron_str, 'P', NULL, NULL,
XmVaRADIOBUTTON, nurbs_str, 'N', NULL, NULL,
XmNradioBehavior, True,
@@ -227,7 +227,7 @@ void G4OpenGLXmView::CreateMainWindow () {
XtVaSetValues (special_widget, XmNset, True, NULL);
}
} else {
G4Exception("Invalid Representation style in G4OpenGLXmView::CreateContext");
G4Exception("Invalid Representation style in G4OpenGLXmViewer::CreateContext");
}
XmStringFree (polyhedron_str);
XmStringFree (nurbs_str);
@@ -244,7 +244,7 @@ void G4OpenGLXmView::CreateMainWindow () {
(style_cascade,
"drawing_style",
1,
G4OpenGLXmView::drawing_style_callback,
G4OpenGLXmViewer::drawing_style_callback,
XmVaRADIOBUTTON, wireframe_str, 'W', NULL, NULL,
XmVaRADIOBUTTON, hlr_str, 'L', NULL, NULL,
XmVaRADIOBUTTON, hsr_str, 'S', NULL, NULL,
@@ -279,7 +279,7 @@ void G4OpenGLXmView::CreateMainWindow () {
XtVaSetValues (special_widget, XmNset, True, NULL);
}
} else {
G4Exception("Invalid Drawing style in G4OpenGLXmView::CreateContext");
G4Exception("Invalid Drawing style in G4OpenGLXmViewer::CreateContext");
}
XmStringFree (wireframe_str);
@@ -297,7 +297,7 @@ void G4OpenGLXmView::CreateMainWindow () {
(style_cascade,
"background_color",
2,
G4OpenGLXmView::background_color_callback,
G4OpenGLXmViewer::background_color_callback,
XmVaRADIOBUTTON, white_str, 'W', NULL, NULL,
XmVaRADIOBUTTON, black_str, 'B', NULL, NULL,
XmNradioBehavior, True,
@@ -321,7 +321,7 @@ void G4OpenGLXmView::CreateMainWindow () {
XtVaSetValues (special_widget, XmNset, True, NULL);
}
} else {
G4Exception("white_background in G4OpenGLXmView is neither true nor false!!");
G4Exception("white_background in G4OpenGLXmViewer is neither true nor false!!");
}
XmStringFree (white_str);
@@ -338,7 +338,7 @@ void G4OpenGLXmView::CreateMainWindow () {
(menubar,
"actions",
1,
G4OpenGLXmView::actions_callback,
G4OpenGLXmViewer::actions_callback,
XmVaPUSHBUTTON, rot_str, 'R', NULL, NULL,
XmVaPUSHBUTTON, pan_str, 'P', NULL, NULL,
XmVaPUSHBUTTON, set_str, 'S', NULL, NULL,
@@ -364,7 +364,7 @@ void G4OpenGLXmView::CreateMainWindow () {
(menubar,
"miscellany",
2,
G4OpenGLXmView::misc_callback,
G4OpenGLXmViewer::misc_callback,
XmVaPUSHBUTTON, misc_str, 'M', NULL, NULL,
XmVaPUSHBUTTON, exit_str, 'E', NULL, NULL,
XmVaPUSHBUTTON, print_str, 'P', NULL, NULL,
@@ -415,7 +415,7 @@ void G4OpenGLXmView::CreateMainWindow () {
(spec_cascade,
"transparency",
0,
G4OpenGLXmView::transparency_callback,
G4OpenGLXmViewer::transparency_callback,
XmVaRADIOBUTTON, off_str, 'f', NULL, NULL,
XmVaRADIOBUTTON, on_str, 'n', NULL, NULL,
XmNradioBehavior, True,
@@ -439,7 +439,7 @@ void G4OpenGLXmView::CreateMainWindow () {
XtVaSetValues (special_widget, XmNset, True, NULL);
}
} else {
G4Exception("transparency_enabled in G4OpenGLXmView is neither true nor false!!");
G4Exception("transparency_enabled in G4OpenGLXmViewer is neither true nor false!!");
}
//Add antialias pullright menu to special cascade...
@@ -447,7 +447,7 @@ void G4OpenGLXmView::CreateMainWindow () {
(spec_cascade,
"antialias",
1,
G4OpenGLXmView::antialias_callback,
G4OpenGLXmViewer::antialias_callback,
XmVaRADIOBUTTON, off_str, 'f', NULL, NULL,
XmVaRADIOBUTTON, on_str, 'n', NULL, NULL,
XmNradioBehavior, True,
@@ -471,7 +471,7 @@ void G4OpenGLXmView::CreateMainWindow () {
XtVaSetValues (special_widget, XmNset, True, NULL);
}
} else {
G4Exception("antialiasing_enabled in G4OpenGLXmView is neither true nor false!!");
G4Exception("antialiasing_enabled in G4OpenGLXmViewer is neither true nor false!!");
}
//Add Haloing pullright menu to special cascade...
@@ -479,7 +479,7 @@ void G4OpenGLXmView::CreateMainWindow () {
(spec_cascade,
"haloing",
2,
G4OpenGLXmView::haloing_callback,
G4OpenGLXmViewer::haloing_callback,
XmVaRADIOBUTTON, off_str, 'f', NULL, NULL,
XmVaRADIOBUTTON, on_str, 'n', NULL, NULL,
XmNradioBehavior, True,
@@ -503,7 +503,7 @@ void G4OpenGLXmView::CreateMainWindow () {
XtVaSetValues (special_widget, XmNset, True, NULL);
}
} else {
G4Exception("haloing_enabled in G4OpenGLXmView is neither true nor false!!");
G4Exception("haloing_enabled in G4OpenGLXmViewer is neither true nor false!!");
}
XtManageChild (menubar);
@@ -527,12 +527,12 @@ void G4OpenGLXmView::CreateMainWindow () {
XtAddCallback (glxarea,
XmNexposeCallback,
G4OpenGLXmView::expose_callback,
G4OpenGLXmViewer::expose_callback,
this);
XtAddCallback (glxarea,
XmNresizeCallback,
G4OpenGLXmView::resize_callback,
G4OpenGLXmViewer::resize_callback,
this);
XmMainWindowSetAreas (main_win, // main widget, children are specified
@@ -559,10 +559,10 @@ void G4OpenGLXmView::CreateMainWindow () {
}
G4OpenGLXmView::G4OpenGLXmView (G4OpenGLScene& scene):
G4VView (scene, -1),
G4OpenGLView (scene),
G4OpenGLXView (scene),
G4OpenGLXmViewer::G4OpenGLXmViewer (G4OpenGLSceneHandler& scene):
G4VViewer (scene, -1),
G4OpenGLViewer (scene),
G4OpenGLXViewer (scene),
zoom_low (fVP.GetZoomFactor() / 10.0),
zoom_high (fVP.GetZoomFactor() * 10.0),
dolly_low (fVP.GetDolly() - 1000.0),
@@ -618,7 +618,7 @@ fpdolly_slider (NULL)
}
}
G4OpenGLXmView::~G4OpenGLXmView ()
G4OpenGLXmViewer::~G4OpenGLXmViewer ()
{
XtDestroyWidget (shell);
G4Xt::getInstance () ->RemoveShell (shell);
source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
+15 -15
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 2.4 1998/10/29 09:41:11 barrand Exp $
// GEANT4 tag $Name: geant4-00 $
// $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.2 1999/01/09 16:23:50 allison Exp $
// GEANT4 tag $Name: geant4-00-01 $
//
//
// Andrew Walkden 16th June 1997
@@ -16,14 +16,14 @@
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#include "G4OpenGLXmView.hh"
#include "G4OpenGLXmViewer.hh"
void G4OpenGLXmView::resize_callback (Widget w,
void G4OpenGLXmViewer::resize_callback (Widget w,
XtPointer clientData,
XtPointer)
{
Dimension width, height;
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
XtVaGetValues (w,
XmNwidth, &width,
@@ -36,11 +36,11 @@ void G4OpenGLXmView::resize_callback (Widget w,
void G4OpenGLXmView::expose_callback (Widget w,
void G4OpenGLXmViewer::expose_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4OpenGLXmView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
Dimension width, height;
XtVaGetValues (w,
@@ -58,34 +58,34 @@ void G4OpenGLXmView::expose_callback (Widget w,
pView->DrawView ();
}
void G4OpenGLXmView::print_callback (Widget,
void G4OpenGLXmViewer::print_callback (Widget,
XtPointer clientData,
XtPointer)
{
G4OpenGLXView* pView = (G4OpenGLXmView*) clientData;
G4OpenGLXViewer* pView = (G4OpenGLXmViewer*) clientData;
pView->print();
}
void G4OpenGLXmView::set_print_colour_callback (Widget w,
void G4OpenGLXmViewer::set_print_colour_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4OpenGLXmView* pView = (G4OpenGLXmView*)clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*)clientData;
G4int choice = G4OpenGLXmView::get_int_userData (w);
G4int choice = G4OpenGLXmViewer::get_int_userData (w);
pView->print_colour=(G4bool)choice;
G4cout << "Print colour set to " << pView->print_colour;
}
void G4OpenGLXmView::set_print_style_callback (Widget w,
void G4OpenGLXmViewer::set_print_style_callback (Widget w,
XtPointer clientData,
XtPointer)
{
G4OpenGLXmView* pView = (G4OpenGLXmView*)clientData;
G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*)clientData;
G4int choice = G4OpenGLXmView::get_int_userData (w);
G4int choice = G4OpenGLXmViewer::get_int_userData (w);
pView->vectored_ps=(G4bool)choice;
G4cout << "`Produce vectored PostScript ?' set to : " << pView->print_colour;