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.70 by querten, Mon Nov 24 07:29:57 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.106
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 82 | Line 88 | bool MouseStates[3];
88   GLuint LogoTexture;
89   GLuint LogoTxtTexture;
90  
91 + char ScreenShotName[1024] = {"screenshot"};
92 + std::string AbsolutePath;
93 + std::string inputConfig = "config.txt";
94   std::string inputVisFile;
95   std::string inputVisFileFromCard;
96 + std::vector<string> inputVisFileFromCommand;
97   std::vector<std::string> inputGeom;
98  
99   // MultiThreading Variables
100   #ifdef linux
101     pthread_t Thread_H;
102 + #elif macos
103 +   pthread_t Thread_H;
104   #else
105     HANDLE Thread_H   = NULL;
106     DWORD  Thread_Id  = 0;
107   #endif
108   bool   Thread_Run = false;
109  
110 + float SelectedObject_color[4] = {1,1,1,1};
111 + int   SelectedObject_Counter  = 0;
112 + //bool  SelectedObject_DrawFlag = true;
113  
114 + bool Geometry_WireFrame = false;
115  
116   int updateVisFileTime = -1;
117  
# Line 107 | Line 123 | FROG_Geometry* geom;
123   char gSim       = 0;
124   char gReco      = 15;
125  
126 < unsigned int mCLicked_DetId = (unsigned int) -1;
126 > //unsigned int mCLicked_DetId = (unsigned int) -1;
127   bool mDisplayMother  = false;
128   bool mLoading   = true;
129   int  mLoading_I = 0;
130 < bool mMenu = true;
130 > bool mEventChanging = true;
131 >
132 > unsigned int mAutomaticShooter_LastEvent = 0;
133 > bool mAutomaticShooter = false;
134 >
135  
136   int eventNumber = 0;
137   int eventTime   = 5;
# Line 132 | Line 152 | float ZAxis_Thickness     =  3;
152   void reshape (int w, int h);
153   void display();
154   void display2();
155 + void displayForScreenShot();
156   void displaytext();
157 + void processNormalKeys(unsigned char key, int x, int y);
158 + void processSpecialKeys(int key, int x, int y) ;
159 + void processMouse(int button, int state, int x, int y);
160 + void processMotion(int x, int y);
161 + void processPassiveMotion(int x, int y);
162  
163   void LoadCard(const char* inputCard );
164   void gl_select(int x, int y);
# Line 143 | Line 169 | void AutomaticEventChanging (int Extra);
169  
170   void updateEventsFile();
171  
146 –
172   #endif
173  

Diff Legend

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