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.67 by querten, Sat Nov 15 08:03:13 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 + std::string inputConfig = "config.txt";
92   std::string inputVisFile;
93   std::string inputVisFileFromCard;
94   std::vector<std::string> inputGeom;
# Line 88 | Line 96 | std::vector<std::string> inputGeom;
96   // MultiThreading Variables
97   #ifdef linux
98     pthread_t Thread_H;
99 + #elif macos
100 +   pthread_t Thread_H;
101   #else
102     HANDLE Thread_H   = NULL;
103     DWORD  Thread_Id  = 0;
104   #endif
105   bool   Thread_Run = false;
106  
107 + float SelectedObject_color[4] = {1,1,1,1};
108 + int   SelectedObject_Counter  = 0;
109 + //bool  SelectedObject_DrawFlag = true;
110  
111 + bool Geometry_WireFrame = false;
112  
113   int updateVisFileTime = -1;
114  
# Line 106 | Line 120 | FROG_Geometry* geom;
120   char gSim       = 0;
121   char gReco      = 15;
122  
123 < unsigned int mCLicked_DetId = (unsigned int) -1;
123 > //unsigned int mCLicked_DetId = (unsigned int) -1;
124   bool mDisplayMother  = false;
125   bool mLoading   = true;
126   int  mLoading_I = 0;
127 + bool mEventChanging = true;
128 +
129 + unsigned int mAutomaticShooter_LastEvent = 0;
130 + bool mAutomaticShooter = false;
131 +
132  
133   int eventNumber = 0;
134   int eventTime   = 5;
# Line 130 | Line 149 | float ZAxis_Thickness     =  3;
149   void reshape (int w, int h);
150   void display();
151   void display2();
152 + void displayForScreenShot();
153   void displaytext();
154  
155   void LoadCard(const char* inputCard );

Diff Legend

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