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.14 by roberfro, Mon Apr 28 11:47:49 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 "ObjectInfo.h"
52  
53   int SAVE_WINDOW_W = 800;
54   int SAVE_WINDOW_H = 600;
# Line 94 | Line 107 | char gTracker   = 0;
107   char gEcal      = 0;
108   char gHcal      = 0;
109   char gMuon      = 0;
110 < char gSim       = 2;
110 > char gSim       = 0;
111   char gReco      = 15;
112  
113 < int   mTrackI   = -1;
113 > int  mObj_I     = -1;
114 > int  mColl_I    = -1;
115   bool mLoading   = true;
116   int  mLoading_I = 0;
117  
# Line 124 | Line 138 | WidthAndColor WaC_LHC_Axis          = {3
138   WidthAndColor WaC_Default_SimTrack  = {2.0 , 0.0 , 1.0 , 1.0 , 1.0};
139   WidthAndColor WaC_Selected_SimTrack = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
140  
141 + std::vector<IdAndWidthAndColor*> WaC_SimTracks;
142 +
143   void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
144   void reshape (int w, int h);
145   void display();
# Line 135 | Line 151 | void initGeomEcal();
151   void initGeomEcalInEvent();
152   void initGeomHcal();
153   void initGeomHcalInEvent();
154 + void defineColorForSimTrack(int i);
155  
156   void initSimTrack();
157   void init();
158   void menu_callback(int value);
159   void menu_create();
160   void LoadCard(const char* inputCard );
161 + void gl_select(int x, int y);
162 + void list_hits(GLint hits, GLuint *names);
163 +
164  
165   #endif
166  

Diff Legend

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