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.7 by querten, Sun Apr 20 07:58:58 2008 UTC vs.
Revision 1.18 by querten, Fri May 2 10:05:54 2008 UTC

# Line 11 | Line 11
11   #include <GL/gl.h>
12   #include <GL/glu.h>
13   #include "../interface/glut.h"
14 + #include <ext/hash_map>
15 + using namespace __gnu_cxx;
16 + typedef hash_map<unsigned int, char*, hash<unsigned int>, equal_to<unsigned int> > HASH_Map;
17   #else
18   #define _CRT_SECURE_NO_DEPRECATE 1
19   #include <windows.h>
# Line 22 | Line 25
25   #pragma comment (lib,"opengl32.lib")
26   #pragma comment (lib,"glut.lib")
27   #pragma comment (lib,"glut32.lib")
28 + #include <hash_map>
29 + using namespace stdext;
30 + typedef hash_map<unsigned int, char*, hash_compare<unsigned int, std::less<unsigned int> > > HASH_Map;
31   #endif
32  
33 + HASH_Map test;
34 +
35 + #include <time.h>
36 + time_t start;
37 + time_t end;
38 +
39   #include <stdio.h>
40   #include <math.h>
41  
# Line 36 | Line 48
48   #include "Texture.h"
49   #include "ReadCards.h"
50   #include "FROG_Struct.h"
51 + #include "FROG_Camera.h"
52 + #include "ObjectInfo.h"
53 + #include "Includes/GL2PS/gl2ps.h"
54 +
55  
56   int SAVE_WINDOW_W = 800;
57   int SAVE_WINDOW_H = 600;
58   int SAVE_WINDOW_X = 10;
59   int SAVE_WINDOW_Y = 10;
60  
61 < bool FULLSCREEN = false;
62 < int WINDOW_WIDTH = 800;
61 > bool FULLSCREEN   = false;
62 > int WINDOW_WIDTH  = 800;
63   int WINDOW_HEIGHT = 600;
64   int SCREENSHOT = 0;
65  
66   int TEMP_I = 0;
67  
68 < float CAM_R  = 700;
53 < float CAM_tx = 0.0;
54 < float CAM_ty = 0.0;
68 > FROG_Camera Cam;
69  
70   int CMS_TRACKER_RADIUS = 129;
71   int CMS_TRACKER_LENGTH = 300;
# Line 94 | Line 108 | char gTracker   = 0;
108   char gEcal      = 0;
109   char gHcal      = 0;
110   char gMuon      = 0;
111 < char gSim       = 2;
111 > char gSim       = 0;
112   char gReco      = 15;
113  
114 < int   mTrackI   = -1;
114 > int  mObj_I     = -1;
115 > int  mColl_I    = -1;
116   bool mLoading   = true;
117   int  mLoading_I = 0;
118  
# Line 105 | Line 120 | int eventNumber = 0;
120  
121   bool  mHelpScreen= false;
122   bool  mRotate    = true;
123 +
124 +
125 + bool stateChanged = false;
126   float mDt                = 0.005f;
127  
128 + bool print_FrameWork = false;
129 +
130  
131   GLint Menu_Geom_Tracker = 0;
132   GLint Menu_Geom_Ecal    = 0;
# Line 122 | Line 142 | WidthAndColor WaC_Txt               = {1
142   WidthAndColor WaC_CMS_Framework     = {1.0 , 1.0 , 0.5 , 1.0 , 0.3};
143   WidthAndColor WaC_LHC_Axis          = {3.0 , 1.0 , 0.5 , 1.0 , 0.3};
144   WidthAndColor WaC_Default_SimTrack  = {2.0 , 0.0 , 1.0 , 1.0 , 1.0};
145 < WidthAndColor WaC_Selected_SimTrack = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
145 > WidthAndColor WaC_Selected_Object   = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
146 >
147 > std::vector<IdAndWidthAndColor*> WaC_SimTracks;
148 > std::vector<IdAndWidthAndColor*> WaC_RecoTracks;
149  
150   void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
151   void reshape (int w, int h);
# Line 135 | Line 158 | void initGeomEcal();
158   void initGeomEcalInEvent();
159   void initGeomHcal();
160   void initGeomHcalInEvent();
161 + void defineColorForSimTrack(int i);
162  
163   void initSimTrack();
164   void init();
165   void menu_callback(int value);
166   void menu_create();
167   void LoadCard(const char* inputCard );
168 + void gl_select(int x, int y);
169 + void list_hits(GLint hits, GLuint *names);
170  
171   #endif
172  

Diff Legend

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