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.55 by querten, Sat Oct 4 13:17:17 2008 UTC vs.
Revision 1.64 by querten, Thu Oct 23 13:46:51 2008 UTC

# Line 6 | Line 6
6   #ifndef _MAIN_H__
7   #define _MAIN_H__
8  
9 < #define FROG_VERSION 1.10
9 > #define FROG_VERSION 1.104
10   #define FROG_AUTHORLIST "Loic.Quertenmont@cern.ch\nVincent.Roberfroid@cern.ch"
11  
12   #include "Includes/GL/glew.h"
# Line 17 | Line 17
17   #include "Includes/GLUT/glut.h"  
18   #else
19   #include <windows.h>
20 + #include <atlconv.h>
21   #include "Includes/GL/wglew.h"
22   #include <gl/gl.h>
23   #include <gl/glu.h>
# Line 27 | Line 28
28   #pragma comment (lib,"glut.lib")
29   #pragma comment (lib,"glut32.lib")
30   #pragma comment (lib,"Includes/CURL/Lib/libcurl.lib")
31 + #pragma comment (lib,"Includes/ZLIB/Lib/zdll.lib")
32 +
33   #endif
34  
35   bool SCREENSAVER = false;
# Line 59 | Line 62 | FROG_View_Screen* ViewScreen;
62   FROG_View* ViewMain;
63   FROG_View_Menu* ViewMenu;
64  
62 – unsigned int shadowMapTexture;
63 –
64 –
65   int SAVE_WINDOW_W = 800;
66   int SAVE_WINDOW_H = 600;
67   int SAVE_WINDOW_X = 10;
# Line 95 | Line 95 | std::vector<std::string> inputGeom;
95   #endif
96   bool   Thread_Run = false;
97  
98 + float SelectedObject_color[4] = {1,1,1,1};
99 + int   SelectedObject_Counter  = 0;
100 + bool  SelectedObject_DrawFlag = true;
101  
102  
103   int updateVisFileTime = -1;
# Line 111 | Line 114 | unsigned int mCLicked_DetId = (unsigned
114   bool mDisplayMother  = false;
115   bool mLoading   = true;
116   int  mLoading_I = 0;
117 < bool mMenu = true;
117 > bool mEventChanging = true;
118 >
119 > unsigned int mAutomaticShooter_LastEvent = 0;
120 > bool mAutomaticShooter = false;
121 >
122  
123   int eventNumber = 0;
124   int eventTime   = 5;
# Line 132 | Line 139 | float ZAxis_Thickness     =  3;
139   void reshape (int w, int h);
140   void display();
141   void display2();
142 + void displayForScreenShot();
143   void displaytext();
144  
145   void LoadCard(const char* inputCard );

Diff Legend

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