ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/FastOpenGlDisplayer/soft/main.h
(Generate patch)

Comparing UserCode/FastOpenGlDisplayer/soft/main.h (file contents):
Revision 1.23 by roberfro, Tue Jun 24 15:17:21 2008 UTC vs.
Revision 1.27 by querten, Thu Jun 26 15:12:42 2008 UTC

# Line 39 | Line 39 | time_t end;
39   #include <stdio.h>
40   #include <math.h>
41  
42 + #include "Includes/FROG/FROG_Objects.h"
43   #include "Includes/FROG/FROG_Events.h"
44   #include "Includes/FROG/FROG_Geometry.h"
45   #include "Includes/FROG/FROG_DetId.h"
# Line 47 | Line 48 | time_t end;
48  
49   #include "Includes/FROG/Logo.h"
50   #include "Includes/FROG/Texture.h"
51 < #include "Includes/FROG/ReadCards.h"
51 > #include "Includes/FROG/FROG_ReadCards.h"
52   #include "Includes/FROG/FROG_Struct.h"
53   #include "Includes/FROG/FROG_Camera.h"
54   #include "Includes/FROG/ObjectInfo.h"
# Line 82 | Line 83 | bool MouseStates[3];
83  
84   std::vector<GLuint> theSimTracks;
85  
85 – GLuint theGeomMuonInEvent;
86 – GLuint theGeomTrackerInEvent;
87 – GLuint theGeomEcalInEvent;
88 – GLuint theGeomHcalInEvent;
89 – GLuint theGeomFwdInEvent;
86   GLuint LogoTexture;
87   GLuint MarkerTexture;
88  
# Line 96 | Line 92 | std::string inputVisFile;
92   std::vector<std::string> inputGeom;
93  
94   FROG_Events* events;
95 < FROG_Event* event;
95 > FROG_Element_Event* event;
96  
97 < Geometry* geom;
97 > FROG_Geometry* geom;
98  
99   char gSim       = 0;
100   char gReco      = 15;
# Line 140 | Line 136 | std::vector<IdAndWidthAndColor*> WaC_Rec
136   void reshape (int w, int h);
137   void display();
138  
143 – void initGeomTrackerInEvent();
144 – void initGeomMuonInEvent();
145 – void initGeomEcalInEvent();
146 – void initGeomHcalInEvent();
147 – void initGeomFwdInEvent();
139   void defineColorForSimTrack(int i);
140  
150 – void initSimTrack();
141   void init();
152 – void menu_callback(int value);
153 – void menu_create();
142   void LoadCard(const char* inputCard );
143   void gl_select(int x, int y);
144   void list_hits(GLint hits, GLuint *names);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines