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.41 by querten, Mon Jul 21 11:14:31 2008 UTC vs.
Revision 1.62 by querten, Thu Oct 16 07:14:47 2008 UTC

# Line 6 | Line 6
6   #ifndef _MAIN_H__
7   #define _MAIN_H__
8  
9 + #define FROG_VERSION 1.103
10 + #define FROG_AUTHORLIST "Loic.Quertenmont@cern.ch\nVincent.Roberfroid@cern.ch"
11 +
12 + #include "Includes/GL/glew.h"
13   #ifdef linux
14 + #include "Includes/GL/glxew.h"
15   #include <GL/gl.h>
16   #include <GL/glu.h>
17 < #include "Includes/GLUT/glut.h"
17 > #include "Includes/GLUT/glut.h"  
18   #else
19 < #include <windows.h>
19 > #include <windows.h>
20 > #include "Includes/GL/wglew.h"
21   #include <gl/gl.h>
22   #include <gl/glu.h>
23 < #include <gl/glut.h>
23 > #include <gl/glut.h>
24   #pragma comment (lib,"glaux.lib")
25   #pragma comment (lib,"glu32.lib")
26   #pragma comment (lib,"opengl32.lib")
27   #pragma comment (lib,"glut.lib")
28   #pragma comment (lib,"glut32.lib")
29   #pragma comment (lib,"Includes/CURL/Lib/libcurl.lib")
30 + #pragma comment (lib,"Includes/ZLIB/Lib/zdll.lib")
31   #endif
32  
33   bool SCREENSAVER = false;
# Line 36 | Line 43 | time_t end;
43   #include "Includes/FROG/FROG_Events.h"
44   #include "Includes/FROG/FROG_Geometry.h"
45  
46 + #include "Includes/FROG/FROG_Fonts.h"
47   #include "Includes/FROG/FROG_Element_Tools.h"
48  
41 – #include "Includes/FROG/FROG_Logo.h"
49   #include "Includes/FROG/FROG_Texture.h"
50   #include "Includes/FROG/FROG_ReadCards.h"
44 – #include "Includes/FROG/FROG_Camera.h"
45 – #include "Includes/FROG/FROG_Net.h"
51   #include "Includes/FROG/FROG_Net_Tools.h"
52   #include "Includes/FROG/FROG_View_Tools.h"
53  
54 + FROG_Fonts* Fonts;
55   FROG_ReadCards* Card;
56   FROG_Objects_Extended* frogObjects_;
57  
58   std::vector<FROG_View*> ActiveViews;
59 < FROG_View* ViewScreen;
59 > FROG_View_Screen* ViewScreen;
60   FROG_View* ViewMain;
61 <
56 <
61 > FROG_View_Menu* ViewMenu;
62  
63   int SAVE_WINDOW_W = 800;
64   int SAVE_WINDOW_H = 600;
# Line 61 | Line 66 | int SAVE_WINDOW_X = 10;
66   int SAVE_WINDOW_Y = 10;
67  
68  
64 –
65 –
69   bool  FULLSCREEN        = false;
70   int   WINDOW_WIDTH      = 800;
71   int   WINDOW_HEIGHT     = 600;
72   int   SCREENSHOT        = 0;
73 < char SCREENSHOT_FORMAT[255] = {"png"};
73 > char  SCREENSHOT_FORMAT[255] = {"png"};
74 >
75 >
76  
77   int TEMP_I = 0;
78   bool MouseStates[3];
# Line 88 | Line 93 | std::vector<std::string> inputGeom;
93   #endif
94   bool   Thread_Run = false;
95  
96 + float SelectedObject_color[4] = {1,1,1,1};
97 + int   SelectedObject_Counter  = 0;
98 + bool  SelectedObject_DrawFlag = true;
99  
100  
101   int updateVisFileTime = -1;
# Line 104 | Line 112 | unsigned int mCLicked_DetId = (unsigned
112   bool mDisplayMother  = false;
113   bool mLoading   = true;
114   int  mLoading_I = 0;
115 + bool mEventChanging = true;
116 +
117 + unsigned int mAutomaticShooter_LastEvent = 0;
118 + bool mAutomaticShooter = false;
119 +
120  
121   int eventNumber = 0;
122 + int eventTime   = 5;
123  
124   bool  mHelpScreen= false;
125  
# Line 120 | Line 134 | float Framework_Thickness =  1.0;
134   float ZAxis_Color[4]      = {1.0 , 0.5 , 1.0 , 0.3};
135   float ZAxis_Thickness     =  3;
136  
123 –
124 –
137   void reshape (int w, int h);
138   void display();
139 + void display2();
140 + void displayForScreenShot();
141 + void displaytext();
142  
143   void LoadCard(const char* inputCard );
144   void gl_select(int x, int y);
145   void list_hits(GLint hits, GLuint *names);
146  
147 + void AutomaticEventChanging (int Extra);
148 +
149  
150   void updateEventsFile();
151  

Diff Legend

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