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.65 by querten, Sun Nov 9 17:18:02 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.105
10   #define FROG_AUTHORLIST "Loic.Quertenmont@cern.ch\nVincent.Roberfroid@cern.ch"
11  
12   #include "Includes/GL/glew.h"
# Line 15 | Line 15
15   #include <GL/gl.h>
16   #include <GL/glu.h>
17   #include "Includes/GLUT/glut.h"  
18 + #elif macos
19 + #include "Includes/GL/glxew.h"
20 + #include <OpenGL/gl.h>
21 + #include <OpenGL/glu.h>
22 + #include <GLUT/glut.h>
23   #else
24   #include <windows.h>
25 + #include <atlconv.h>
26   #include "Includes/GL/wglew.h"
27   #include <gl/gl.h>
28   #include <gl/glu.h>
# Line 27 | Line 33
33   #pragma comment (lib,"glut.lib")
34   #pragma comment (lib,"glut32.lib")
35   #pragma comment (lib,"Includes/CURL/Lib/libcurl.lib")
36 + #pragma comment (lib,"Includes/ZLIB/Lib/zdll.lib")
37 +
38   #endif
39  
40   bool SCREENSAVER = false;
41 + bool SHOOTER     = false;
42  
43   #include <time.h>
44   time_t start;
# Line 59 | Line 68 | FROG_View_Screen* ViewScreen;
68   FROG_View* ViewMain;
69   FROG_View_Menu* ViewMenu;
70  
62 – unsigned int shadowMapTexture;
63 –
64 –
71   int SAVE_WINDOW_W = 800;
72   int SAVE_WINDOW_H = 600;
73   int SAVE_WINDOW_X = 10;
# Line 89 | Line 95 | std::vector<std::string> inputGeom;
95   // MultiThreading Variables
96   #ifdef linux
97     pthread_t Thread_H;
98 + #elif macos
99 +   pthread_t Thread_H;
100   #else
101     HANDLE Thread_H   = NULL;
102     DWORD  Thread_Id  = 0;
103   #endif
104   bool   Thread_Run = false;
105  
106 + float SelectedObject_color[4] = {1,1,1,1};
107 + int   SelectedObject_Counter  = 0;
108 + //bool  SelectedObject_DrawFlag = true;
109  
110  
111   int updateVisFileTime = -1;
# Line 107 | Line 118 | FROG_Geometry* geom;
118   char gSim       = 0;
119   char gReco      = 15;
120  
121 < unsigned int mCLicked_DetId = (unsigned int) -1;
121 > //unsigned int mCLicked_DetId = (unsigned int) -1;
122   bool mDisplayMother  = false;
123   bool mLoading   = true;
124   int  mLoading_I = 0;
125 < bool mMenu = true;
125 > bool mEventChanging = true;
126 >
127 > unsigned int mAutomaticShooter_LastEvent = 0;
128 > bool mAutomaticShooter = false;
129 >
130  
131   int eventNumber = 0;
132   int eventTime   = 5;
# Line 132 | Line 147 | float ZAxis_Thickness     =  3;
147   void reshape (int w, int h);
148   void display();
149   void display2();
150 + void displayForScreenShot();
151   void displaytext();
152  
153   void LoadCard(const char* inputCard );

Diff Legend

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