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.49 by querten, Fri Aug 22 03:14:31 2008 UTC vs.
Revision 1.68 by querten, Wed Nov 19 08:39:30 2008 UTC

# Line 6 | Line 6
6   #ifndef _MAIN_H__
7   #define _MAIN_H__
8  
9 < #define FROG_VERSION 1.077
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 57 | Line 66 | FROG_Objects_Extended* frogObjects_;
66   std::vector<FROG_View*> ActiveViews;
67   FROG_View_Screen* ViewScreen;
68   FROG_View* ViewMain;
69 <
61 < unsigned int shadowMapTexture;
62 <
69 > FROG_View_Menu* ViewMenu;
70  
71   int SAVE_WINDOW_W = 800;
72   int SAVE_WINDOW_H = 600;
# Line 81 | 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<std::string> inputGeom;
# Line 88 | Line 98 | std::vector<std::string> inputGeom;
98   // MultiThreading Variables
99   #ifdef linux
100     pthread_t Thread_H;
101 + #elif macos
102 +   pthread_t Thread_H;
103   #else
104     HANDLE Thread_H   = NULL;
105     DWORD  Thread_Id  = 0;
106   #endif
107   bool   Thread_Run = false;
108  
109 + float SelectedObject_color[4] = {1,1,1,1};
110 + int   SelectedObject_Counter  = 0;
111 + //bool  SelectedObject_DrawFlag = true;
112  
113 + bool Geometry_WireFrame = false;
114  
115   int updateVisFileTime = -1;
116  
# Line 106 | Line 122 | FROG_Geometry* geom;
122   char gSim       = 0;
123   char gReco      = 15;
124  
125 < unsigned int mCLicked_DetId = (unsigned int) -1;
125 > //unsigned int mCLicked_DetId = (unsigned int) -1;
126   bool mDisplayMother  = false;
127   bool mLoading   = true;
128   int  mLoading_I = 0;
129 + bool mEventChanging = true;
130 +
131 + unsigned int mAutomaticShooter_LastEvent = 0;
132 + bool mAutomaticShooter = false;
133 +
134  
135   int eventNumber = 0;
136   int eventTime   = 5;
# Line 130 | Line 151 | float ZAxis_Thickness     =  3;
151   void reshape (int w, int h);
152   void display();
153   void display2();
154 + void displayForScreenShot();
155   void displaytext();
156  
157   void LoadCard(const char* inputCard );
# Line 142 | Line 164 | void AutomaticEventChanging (int Extra);
164   void updateEventsFile();
165  
166  
167 + namespace PATH{
168 +        bool GlobalPath(const char* LocalPath, const char* AbsolutePath, char* ResultPath){
169 +                FILE* FileExist = fopen(LocalPath,"r");
170 +                if(FileExist){
171 +                        fclose(FileExist);
172 +                        sprintf(ResultPath,"%s",LocalPath);
173 +                }else{  
174 +                        sprintf(ResultPath,"%s%s",AbsolutePath,LocalPath);
175 +                        FILE* FileExist = fopen(ResultPath,"r");
176 +                        if(FileExist){                  
177 +                                fclose(FileExist);
178 +                        }else{
179 +                                return false;
180 +                        }
181 +                }
182 +                printf("GLOBALPATH = %s\n",ResultPath);
183 +                return true;            
184 +        }
185 + }
186 +
187 +
188   #endif
189  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines