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.45 by querten, Fri Jul 25 11:47:23 2008 UTC vs.
Revision 1.55 by querten, Sat Oct 4 13:17:17 2008 UTC

# Line 6 | Line 6
6   #ifndef _MAIN_H__
7   #define _MAIN_H__
8  
9 < #define FROG_VERSION 1.05
9 > #define FROG_VERSION 1.10
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")
# Line 54 | Line 57 | FROG_Objects_Extended* frogObjects_;
57   std::vector<FROG_View*> ActiveViews;
58   FROG_View_Screen* ViewScreen;
59   FROG_View* ViewMain;
60 + FROG_View_Menu* ViewMenu;
61  
62   unsigned int shadowMapTexture;
63  
# Line 68 | Line 72 | bool  FULLSCREEN        = false;
72   int   WINDOW_WIDTH      = 800;
73   int   WINDOW_HEIGHT     = 600;
74   int   SCREENSHOT        = 0;
75 < char SCREENSHOT_FORMAT[255] = {"png"};
75 > char  SCREENSHOT_FORMAT[255] = {"png"};
76 >
77 >
78  
79   int TEMP_I = 0;
80   bool MouseStates[3];
# Line 105 | Line 111 | unsigned int mCLicked_DetId = (unsigned
111   bool mDisplayMother  = false;
112   bool mLoading   = true;
113   int  mLoading_I = 0;
114 + bool mMenu = true;
115  
116   int eventNumber = 0;
117 + int eventTime   = 5;
118  
119   bool  mHelpScreen= false;
120  
# Line 130 | Line 138 | void LoadCard(const char* inputCard );
138   void gl_select(int x, int y);
139   void list_hits(GLint hits, GLuint *names);
140  
141 + void AutomaticEventChanging (int Extra);
142 +
143  
144   void updateEventsFile();
145  

Diff Legend

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