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.29 by querten, Sun Jun 29 11:36:17 2008 UTC vs.
Revision 1.45 by querten, Fri Jul 25 11:47:23 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.05
10 + #define FROG_AUTHORLIST "Loic.Quertenmont@cern.ch\nVincent.Roberfroid@cern.ch"
11 +
12   #ifdef linux
13   #include <GL/gl.h>
14   #include <GL/glu.h>
15 < #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;
15 > #include "Includes/GLUT/glut.h"
16   #else
17   #include <windows.h>
18   #include <gl/gl.h>
# Line 23 | Line 23
23   #pragma comment (lib,"opengl32.lib")
24   #pragma comment (lib,"glut.lib")
25   #pragma comment (lib,"glut32.lib")
26 <
27 < #include <hash_map>
28 < using namespace stdext;
29 < typedef hash_map<unsigned int, char*, hash_compare<unsigned int, std::less<unsigned int> > > HASH_Map;
26 > #pragma comment (lib,"Includes/CURL/Lib/libcurl.lib")
27   #endif
31
28  
29 < HASH_Map test;
29 > bool SCREENSAVER = false;
30  
31   #include <time.h>
32   time_t start;
# Line 43 | Line 39 | time_t end;
39   #include "Includes/FROG/FROG_Events.h"
40   #include "Includes/FROG/FROG_Geometry.h"
41  
42 + #include "Includes/FROG/FROG_Fonts.h"
43   #include "Includes/FROG/FROG_Element_Tools.h"
44  
45 < #include "Includes/FROG/Logo.h"
49 < #include "Includes/FROG/Texture.h"
45 > #include "Includes/FROG/FROG_Texture.h"
46   #include "Includes/FROG/FROG_ReadCards.h"
47 < #include "Includes/FROG/FROG_Struct.h"
48 < #include "Includes/FROG/FROG_Camera.h"
47 > #include "Includes/FROG/FROG_Net_Tools.h"
48 > #include "Includes/FROG/FROG_View_Tools.h"
49 >
50 > FROG_Fonts* Fonts;
51 > FROG_ReadCards* Card;
52 > FROG_Objects_Extended* frogObjects_;
53 >
54 > std::vector<FROG_View*> ActiveViews;
55 > FROG_View_Screen* ViewScreen;
56 > FROG_View* ViewMain;
57 >
58 > unsigned int shadowMapTexture;
59  
60  
61   int SAVE_WINDOW_W = 800;
# Line 62 | Line 68 | bool  FULLSCREEN        = false;
68   int   WINDOW_WIDTH      = 800;
69   int   WINDOW_HEIGHT     = 600;
70   int   SCREENSHOT        = 0;
71 < char* SCREENSHOT_FORMAT = new char[255];
71 > char SCREENSHOT_FORMAT[255] = {"png"};
72  
73   int TEMP_I = 0;
68
69 FROG_Camera Cam;
70
74   bool MouseStates[3];
75  
76   GLuint LogoTexture;
77 <
75 < double t = 0;
77 > GLuint LogoTxtTexture;
78  
79   std::string inputVisFile;
80 + std::string inputVisFileFromCard;
81   std::vector<std::string> inputGeom;
82  
83 + // MultiThreading Variables
84 + #ifdef linux
85 +   pthread_t Thread_H;
86 + #else
87 +   HANDLE Thread_H   = NULL;
88 +   DWORD  Thread_Id  = 0;
89 + #endif
90 + bool   Thread_Run = false;
91 +
92 +
93 +
94 + int updateVisFileTime = -1;
95 +
96   FROG_Events* events;
97   FROG_Element_Event* event;
98  
# Line 85 | Line 101 | FROG_Geometry* geom;
101   char gSim       = 0;
102   char gReco      = 15;
103  
104 < unsigned int mCLicked_DetId = 0;
104 > unsigned int mCLicked_DetId = (unsigned int) -1;
105   bool mDisplayMother  = false;
90 int  mObj_I     = -1;
91 int  mColl_I    = -1;
106   bool mLoading   = true;
107   int  mLoading_I = 0;
108  
109   int eventNumber = 0;
110  
111   bool  mHelpScreen= false;
98 bool  mRotate    = true;
99
112  
113   bool stateChanged = false;
102 float mDt                = 0.005f;
114  
115   bool print_FrameWork = false;
116  
117 < WidthAndColor WaC_BackGround        = {1.0 , 0.0 , 1.0 , 0.0 , 1.0};
118 < WidthAndColor WaC_Txt               = {1.0 , 0.0 , 1.0 , 1.0 , 1.0};
119 < WidthAndColor WaC_CMS_Framework     = {1.0 , 1.0 , 0.5 , 1.0 , 0.3};
120 < WidthAndColor WaC_LHC_Axis          = {3.0 , 1.0 , 0.5 , 1.0 , 0.3};
121 < WidthAndColor WaC_Selected_Object   = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
122 <
112 < FROG_ReadCards* Card;
117 > float BackGround_Color[4] = {0.0 , 0.0 , 0.0 , 1.0};
118 > float Txt_Color[4]        = {0.0 , 1.0 , 1.0 , 1.0};
119 > float Framework_Color[4]  = {1.0 , 0.5 , 1.0 , 0.3};
120 > float Framework_Thickness =  1.0;
121 > float ZAxis_Color[4]      = {1.0 , 0.5 , 1.0 , 0.3};
122 > float ZAxis_Thickness     =  3;
123  
124   void reshape (int w, int h);
125   void display();
126 + void display2();
127 + void displaytext();
128  
129   void LoadCard(const char* inputCard );
130   void gl_select(int x, int y);
131   void list_hits(GLint hits, GLuint *names);
132  
133 +
134 + void updateEventsFile();
135 +
136 +
137   #endif
138  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines