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.24 by querten, Wed Jun 25 10:46:53 2008 UTC vs.
Revision 1.33 by roberfro, Mon Jun 30 14:25:14 2008 UTC

# Line 23 | Line 23
23   #pragma comment (lib,"opengl32.lib")
24   #pragma comment (lib,"glut.lib")
25   #pragma comment (lib,"glut32.lib")
26 + #pragma comment (lib,"Includes/CURL/libcurl.lib")
27  
28   #include <hash_map>
29   using namespace stdext;
# Line 39 | Line 40 | time_t end;
40   #include <stdio.h>
41   #include <math.h>
42  
43 + #include "Includes/FROG/FROG_Objects.h"
44   #include "Includes/FROG/FROG_Events.h"
45   #include "Includes/FROG/FROG_Geometry.h"
44 – #include "Includes/FROG/FROG_DetId.h"
46  
47   #include "Includes/FROG/FROG_Element_Tools.h"
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"
54 > #include "Includes/FROG/FROG_Net.h"
55  
56  
56 – FROG_Element_Base *prim2;
57 –
57   int SAVE_WINDOW_W = 800;
58   int SAVE_WINDOW_H = 600;
59   int SAVE_WINDOW_X = 10;
# Line 71 | Line 70 | int TEMP_I = 0;
70  
71   FROG_Camera Cam;
72  
74 – int CMS_TRACKER_RADIUS = 129;
75 – int CMS_TRACKER_LENGTH = 300;
76 –
77 – float PT_CUTOFF = 1.0;
78 – double EECAL_CUTOFF[3] = {0.2,0.6,0.0001};
79 – double EHCAL_CUTOFF[4] = {1.5,1.5,0.5,5.0};
80 –
73   bool MouseStates[3];
74  
83 – std::vector<GLuint> theSimTracks;
84 –
75   GLuint LogoTexture;
86 – GLuint MarkerTexture;
76  
77   double t = 0;
78  
# Line 91 | Line 80 | std::string inputVisFile;
80   std::vector<std::string> inputGeom;
81  
82   FROG_Events* events;
83 < FROG_Event* event;
83 > FROG_Element_Event* event;
84  
85 < Geometry* geom;
85 > FROG_Geometry* geom;
86  
87   char gSim       = 0;
88   char gReco      = 15;
89  
90 < unsigned int mCLicked_DetId = 0;
90 > unsigned int mCLicked_DetId = (unsigned int) -1;
91   bool mDisplayMother  = false;
103 – int  mObj_I     = -1;
104 – int  mColl_I    = -1;
92   bool mLoading   = true;
93   int  mLoading_I = 0;
94  
# Line 116 | Line 103 | float mDt               = 0.005f;
103  
104   bool print_FrameWork = false;
105  
119 – GLint Menu_Geom         = 0;
120 – GLint Menu_SimEvent     = 0;
121 – GLint Menu_RecoEvent    = 0;
122 – GLint Menu_Main         = 0;
123 –
106   WidthAndColor WaC_BackGround        = {1.0 , 0.0 , 1.0 , 0.0 , 1.0};
107   WidthAndColor WaC_Txt               = {1.0 , 0.0 , 1.0 , 1.0 , 1.0};
108   WidthAndColor WaC_CMS_Framework     = {1.0 , 1.0 , 0.5 , 1.0 , 0.3};
109   WidthAndColor WaC_LHC_Axis          = {3.0 , 1.0 , 0.5 , 1.0 , 0.3};
128 – WidthAndColor WaC_Default_SimTrack  = {2.0 , 0.0 , 1.0 , 1.0 , 1.0};
110   WidthAndColor WaC_Selected_Object   = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
111  
112 < std::vector<IdAndWidthAndColor*> WaC_SimTracks;
132 < std::vector<IdAndWidthAndColor*> WaC_RecoTracks;
112 > FROG_ReadCards* Card;
113  
134 – //void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
114   void reshape (int w, int h);
115   void display();
116  
138 – void defineColorForSimTrack(int i);
139 –
140 – void init();
117   void LoadCard(const char* inputCard );
118   void gl_select(int x, int y);
119   void list_hits(GLint hits, GLuint *names);

Diff Legend

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