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.14 by roberfro, Mon Apr 28 11:47:49 2008 UTC vs.
Revision 1.18 by querten, Fri May 2 10:05:54 2008 UTC

# Line 48 | Line 48 | time_t end;
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;
66 < float CAM_tx = 0.0;
67 < float CAM_ty = 0.0;
68 > FROG_Camera Cam;
69  
70   int CMS_TRACKER_RADIUS = 129;
71   int CMS_TRACKER_LENGTH = 300;
# Line 119 | 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 136 | 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 161 | Line 168 | void LoadCard(const char* inputCard );
168   void gl_select(int x, int y);
169   void list_hits(GLint hits, GLuint *names);
170  
164 –
171   #endif
172  

Diff Legend

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