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.37 by querten, Thu Jul 10 13:56:39 2008 UTC vs.
Revision 1.46 by querten, Sun Jul 27 11:14:08 2008 UTC

# Line 1 | Line 1
1  
2 < // SimEvent.h: interface for the SimEvent class.
2 > // main.h
3   //
4   //////////////////////////////////////////////////////////////////////
5  
6   #ifndef _MAIN_H__
7   #define _MAIN_H__
8  
9 + #define FROG_VERSION 1.06
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"
13 < #include <ext/hash_map>
14 < using namespace __gnu_cxx;
15 < typedef hash_map<unsigned int, char*, hash<unsigned int>, equal_to<unsigned int> > HASH_Map;
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")
27   #pragma comment (lib,"glut.lib")
28   #pragma comment (lib,"glut32.lib")
29   #pragma comment (lib,"Includes/CURL/Lib/libcurl.lib")
27
28 #include <hash_map>
29 using namespace stdext;
30 typedef hash_map<unsigned int, char*, hash_compare<unsigned int, std::less<unsigned int> > > HASH_Map;
30   #endif
31  
32   bool SCREENSAVER = false;
33  
35 HASH_Map test;
36
34   #include <time.h>
35   time_t start;
36   time_t end;
# Line 45 | 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_Fonts.h"
46   #include "Includes/FROG/FROG_Element_Tools.h"
47  
48 < #include "Includes/FROG/Logo.h"
51 < #include "Includes/FROG/Texture.h"
48 > #include "Includes/FROG/FROG_Texture.h"
49   #include "Includes/FROG/FROG_ReadCards.h"
50 < #include "Includes/FROG/FROG_Struct.h"
51 < #include "Includes/FROG/FROG_Camera.h"
52 < #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_Fonts* Fonts;
54 > FROG_ReadCards* Card;
55 > FROG_Objects_Extended* frogObjects_;
56 >
57 > std::vector<FROG_View*> ActiveViews;
58 > FROG_View_Screen* ViewScreen;
59 > FROG_View* ViewMain;
60 >
61 > unsigned int shadowMapTexture;
62  
63  
64   int SAVE_WINDOW_W = 800;
# Line 65 | Line 71 | bool  FULLSCREEN        = false;
71   int   WINDOW_WIDTH      = 800;
72   int   WINDOW_HEIGHT     = 600;
73   int   SCREENSHOT        = 0;
74 < char* SCREENSHOT_FORMAT = new char[255];
74 > char SCREENSHOT_FORMAT[255] = {"png"};
75  
76   int TEMP_I = 0;
71
72 FROG_Camera Cam;
73
77   bool MouseStates[3];
78  
79   GLuint LogoTexture;
80   GLuint LogoTxtTexture;
81  
79 double t = 0;
80
82   std::string inputVisFile;
83   std::string inputVisFileFromCard;
84   std::vector<std::string> inputGeom;
85  
86 + // MultiThreading Variables
87 + #ifdef linux
88 +   pthread_t Thread_H;
89 + #else
90 +   HANDLE Thread_H   = NULL;
91 +   DWORD  Thread_Id  = 0;
92 + #endif
93 + bool   Thread_Run = false;
94 +
95 +
96 +
97   int updateVisFileTime = -1;
98  
99   FROG_Events* events;
# Line 100 | Line 112 | int  mLoading_I = 0;
112   int eventNumber = 0;
113  
114   bool  mHelpScreen= false;
103 bool  mRotate    = true;
104
115  
116   bool stateChanged = false;
107 float mDt                = 0.005f;
117  
118   bool print_FrameWork = false;
119  
120 < WidthAndColor WaC_BackGround        = {1.0 , 0.0 , 1.0 , 0.0 , 1.0};
121 < WidthAndColor WaC_Txt               = {1.0 , 0.0 , 1.0 , 1.0 , 1.0};
122 < WidthAndColor WaC_CMS_Framework     = {1.0 , 1.0 , 0.5 , 1.0 , 0.3};
123 < WidthAndColor WaC_LHC_Axis          = {3.0 , 1.0 , 0.5 , 1.0 , 0.3};
124 < WidthAndColor WaC_Selected_Object   = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
125 <
117 < FROG_ReadCards* Card;
120 > float BackGround_Color[4] = {0.0 , 0.0 , 0.0 , 1.0};
121 > float Txt_Color[4]        = {0.0 , 1.0 , 1.0 , 1.0};
122 > float Framework_Color[4]  = {1.0 , 0.5 , 1.0 , 0.3};
123 > float Framework_Thickness =  1.0;
124 > float ZAxis_Color[4]      = {1.0 , 0.5 , 1.0 , 0.3};
125 > float ZAxis_Thickness     =  3;
126  
127   void reshape (int w, int h);
128   void display();
129 + void display2();
130 + void displaytext();
131  
132   void LoadCard(const char* inputCard );
133   void gl_select(int x, int y);
134   void list_hits(GLint hits, GLuint *names);
135  
136 < char* get_char_ptr(const std::string& str);
127 < void* DownLoadFile(void* inputFile);
136 >
137   void updateEventsFile();
138  
139  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines