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.44 by querten, Wed Jul 23 15:31:02 2008 UTC vs.
Revision 1.52 by roberfro, Wed Aug 27 15:07:48 2008 UTC

# Line 6 | Line 6
6   #ifndef _MAIN_H__
7   #define _MAIN_H__
8  
9 < #define FROG_VERSION 1.05
10 < #define FROG_AUTHORLIST "Loic.Quertenmont@uclouvain.be\nVincent.Roberfroid@uclouvain.be"
9 > #define FROG_VERSION 1.081
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 39 | Line 42 | time_t end;
42   #include "Includes/FROG/FROG_Events.h"
43   #include "Includes/FROG/FROG_Geometry.h"
44  
45 < #include "Includes/FROG/FROG_Font.h"
45 > #include "Includes/FROG/FROG_Fonts.h"
46   #include "Includes/FROG/FROG_Element_Tools.h"
47  
45 – #include "Includes/FROG/FROG_Logo.h"
48   #include "Includes/FROG/FROG_Texture.h"
49   #include "Includes/FROG/FROG_ReadCards.h"
48 – #include "Includes/FROG/FROG_Camera.h"
49 – #include "Includes/FROG/FROG_Net.h"
50   #include "Includes/FROG/FROG_Net_Tools.h"
51   #include "Includes/FROG/FROG_View_Tools.h"
52  
53 < FROG_Font* frog_Font;
54 < FROG_Font* frog_Font_10;
53 > FROG_Fonts* Fonts;
54   FROG_ReadCards* Card;
55   FROG_Objects_Extended* frogObjects_;
56  
# Line 68 | Line 67 | int SAVE_WINDOW_X = 10;
67   int SAVE_WINDOW_Y = 10;
68  
69  
71 –
72 –
70   bool  FULLSCREEN        = false;
71   int   WINDOW_WIDTH      = 800;
72   int   WINDOW_HEIGHT     = 600;
73   int   SCREENSHOT        = 0;
74 < char SCREENSHOT_FORMAT[255] = {"png"};
74 > char  SCREENSHOT_FORMAT[255] = {"png"};
75 >
76 >
77  
78   int TEMP_I = 0;
79   bool MouseStates[3];
# Line 113 | Line 112 | bool mLoading   = true;
112   int  mLoading_I = 0;
113  
114   int eventNumber = 0;
115 + int eventTime   = 5;
116  
117   bool  mHelpScreen= false;
118  
# Line 127 | Line 127 | float Framework_Thickness =  1.0;
127   float ZAxis_Color[4]      = {1.0 , 0.5 , 1.0 , 0.3};
128   float ZAxis_Thickness     =  3;
129  
130 –
131 –
130   void reshape (int w, int h);
131   void display();
132   void display2();
# Line 138 | Line 136 | void LoadCard(const char* inputCard );
136   void gl_select(int x, int y);
137   void list_hits(GLint hits, GLuint *names);
138  
139 + void AutomaticEventChanging (int Extra);
140 +
141  
142   void updateEventsFile();
143  

Diff Legend

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